commit 330ccb699ed445f661fe04cad7917d7346ad1615 Merge: b2e191001 b98614f1a Author: Nick Mathewson nickm@torproject.org Date: Fri Nov 17 09:26:11 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

changes/ticket24158 | 3 +++ changes/ticket24254 | 3 +++ doc/tor.1.txt | 34 +++++++++++++++++++++------------- src/or/scheduler.c | 24 ++++++++++++++++++++++-- 4 files changed, 49 insertions(+), 15 deletions(-)