commit f5e37b2eb6b33185a30a2aadd513c7e4dfbc1379 Merge: 90716e3f9 4ceae7c6b Author: Nick Mathewson <nickm@torproject.org> Date: Fri Feb 2 12:03:54 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 src/or/scheduler.c | 26 +++++++++++++++----------- src/test/test_scheduler.c | 12 ++++++++++++ 2 files changed, 27 insertions(+), 11 deletions(-)