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

[nickm@xxxxxxxxxxxxxx]

commit 70b19894aef65f570840d6ed37e3398e7cb748e6
Merge: f50d64b62 ff6c8cf86
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Dec 4 13:23:52 2017 -0500

    Merge branch 'maint-0.3.2'

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

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits