[tor-commits] [tor/master] Merge branch 'maint-0.3.2'

[nickm at torproject.org]

commit 2b8a06a2ef23350616df755a32b0e5b87d463314
Merge: 2f0d57db5 6cd567d79
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 21 11:16:00 2017 -0500

    Merge branch 'maint-0.3.2'

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