[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

[nickm at torproject.org]

commit 04714df9cc2a20f7daae498baee99c5dbf3c4432
Merge: e50da3327 02f05f2de
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Nov 8 11:02:51 2017 -0500

    Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug23318        | 11 +++++++++++
 changes/bug23751        |  6 ++++++
 changes/bug24170        |  3 +++
 src/or/routerlist.c     | 48 +++++++++++++++++++++++++++++++-----------------
 src/or/scheduler_kist.c |  9 +++++++++
 5 files changed, 60 insertions(+), 17 deletions(-)