commit 94dce246ee97884a546113827404a45d0f16c648 Merge: cfacd4424 b98614f1a Author: Nick Mathewson <nickm@torproject.org> Date: Fri Nov 17 09:26:11 2017 -0500 Merge branch 'maint-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(-)