commit d0c5fe257be0b127681c31ac85853d747465fd09 Merge: 5db94adac 885ba513f Author: Nick Mathewson nickm@torproject.org Date: Thu Dec 21 10:20:35 2017 -0500

Merge branch 'maint-0.3.2'

changes/bug24665 | 6 ++++++ src/or/scheduler_kist.c | 22 +++++++++++----------- 2 files changed, 17 insertions(+), 11 deletions(-)