commit 9e48338a12fd1fef840dc49c702b4a628af67cc0 Merge: 0fd91772b 4ceae7c6b Author: Nick Mathewson nickm@torproject.org Date: Fri Feb 2 12:03:54 2018 -0500

Merge branch 'maint-0.3.2'

src/or/scheduler.c | 26 +++++++++++++++----------- src/test/test_scheduler.c | 12 ++++++++++++ 2 files changed, 27 insertions(+), 11 deletions(-)