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

[nickm at torproject.org]

commit bcc96c77de52ae7a8e73a6b139756e17f25e148d
Merge: d0c5fe257 c38157be9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 21 10:27:39 2017 -0500

    Merge branch 'maint-0.3.2'

 src/or/scheduler_kist.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)