commit 2a7cad957263f5faed3a0b9de8b15d9794a5541c Merge: c2b64ad09 885ba513f Author: Nick Mathewson <nickm@torproject.org> Date: Thu Dec 21 10:20:35 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24665 | 6 ++++++ src/or/scheduler_kist.c | 22 +++++++++++----------- 2 files changed, 17 insertions(+), 11 deletions(-)