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

[nickm at torproject.org]

commit 332d6bf9010fff1c0bc912830f0641c1f21f42a6
Merge: d56b4e598 5bee5fbac
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 30 11:07:44 2017 -0400

    Merge branch 'maint-0.3.2'

 changes/bug23774        | 4 ++++
 src/or/scheduler_kist.c | 1 +
 2 files changed, 5 insertions(+)