commit 19e01f0cbcdf09ddcbf9a54ce3a3d601f42ea7a9 Merge: fe12c9756 ff6c8cf86 Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 4 13:23:52 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

changes/bug23696 | 5 +++++ src/or/scheduler_kist.c | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-)