commit d1a1d95c4104e00fb29f172d37dec65a8cbb836c Merge: c2c1fa6b9 02f05f2de Author: Nick Mathewson nickm@torproject.org Date: Wed Nov 8 11:02:51 2017 -0500

Merge branch 'maint-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(-)