[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/bug23751_032_01' into maint-0.3.2

[nickm at torproject.org]

commit 02f05f2de2654de3ab24e26ca9f1745389487d32
Merge: c74a817e8 dcabf801e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Nov 8 10:56:33 2017 -0500

    Merge remote-tracking branch 'dgoulet/bug23751_032_01' into maint-0.3.2

 changes/bug23751        | 6 ++++++
 src/or/scheduler_kist.c | 9 +++++++++
 2 files changed, 15 insertions(+)