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

[nickm at torproject.org]

commit 252db6ad26900235f8904fa6b8d510551b9176cf
Merge: ea929e845 057139d38
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 11 16:02:10 2017 -0500

    Merge branch 'maint-0.3.2'

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