[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

[nickm at torproject.org]

commit 4fc402496eb21fc46edfe162c911da9679fd5d28
Merge: 68ec14dc1 057139d38
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 11 16:02:10 2017 -0500

    Merge branch 'maint-0.3.2' into release-0.3.2

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