commit 0d1a2e366acd98fcece78c8b4734c5507059c366 Merge: 29e23e62c 6cd567d79 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Dec 21 11:16:00 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24671 | 6 ++++++ src/or/scheduler_kist.c | 22 ++++++++++++++++------ 2 files changed, 22 insertions(+), 6 deletions(-)