[tor-commits] [tor/master] Merge branch 'bug25125_032_01_squashed' into maint-0.3.2

[nickm at torproject.org]

commit 4ceae7c6b9742ce6b14f8bed34725e44522e52f2
Merge: 77634795b 005e228f8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Feb 2 12:03:48 2018 -0500

    Merge branch 'bug25125_032_01_squashed' into maint-0.3.2

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