[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/bug24502_032_01'

[nickm at torproject.org]

commit aa6212a85810937b2aa43fa1021e0118a5fb3f2a
Merge: 9fa38bd99 1a55a5ff0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Dec 6 14:31:33 2017 -0500

    Merge remote-tracking branch 'dgoulet/bug24502_032_01'

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