commit 65d22dc2f2262dfb0066bff12a0df2db97ca560b Merge: f86599365 cb42c62c9 Author: Nick Mathewson nickm@torproject.org Date: Thu Nov 2 10:32:18 2017 -0400

Merge branch 'maint-0.3.2'

changes/bug23753 | 4 ++++ src/or/scheduler.c | 42 +++++++++++++++++++++++++++++++++++++++++- src/or/scheduler.h | 8 ++++++++ src/or/scheduler_kist.c | 10 +++++----- 4 files changed, 58 insertions(+), 6 deletions(-)