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

[nickm at torproject.org]

commit cb42c62c9e87d4699add69087ba25d1454758bb0
Merge: 27ea6fcd3 6dc591a02
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 2 10:30:42 2017 -0400

    Merge branch 'dgoulet_ticket23753_032_02_squashed' into maint-0.3.2

 changes/bug23753        |  4 ++++
 src/or/scheduler.c      | 42 +++++++++++++++++++++++++++++++++++++++++-
 src/or/scheduler.h      |  8 ++++++++
 src/or/scheduler_kist.c | 10 +++++-----
 4 files changed, 58 insertions(+), 6 deletions(-)