commit d4ca18573ccd0164f4d867e41a8f453119ce421f Merge: 779e4b9dc 1a55a5ff0 Author: Nick Mathewson nickm@torproject.org Date: Wed Dec 6 14:37:53 2017 -0500

Merge remote-tracking branch 'dgoulet/bug24502_032_01' into maint-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(-)