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

[nickm at torproject.org]

commit 0c7a540ba27f08de800f3fbd1f21332e7519ec53
Merge: 92d45086f d4ca18573
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Dec 6 14:38:06 2017 -0500

    Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug24502          |  4 ++++
 src/or/scheduler_kist.c   |  5 ++++-
 src/test/test_scheduler.c | 28 +++++++++++++++++++++++++---
 3 files changed, 33 insertions(+), 4 deletions(-)