commit 668809192873f546767b8a431b7cfdf59c1abc1a Merge: 33652fce6 cb42c62c9 Author: Nick Mathewson nickm@torproject.org Date: Thu Nov 2 10:32:18 2017 -0400

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