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

[nickm at torproject.org]

commit 8970058af6822b14bc06e7a98230b8b13c0084a9
Merge: d662d4470 c8b087d90
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Feb 16 08:47:41 2018 -0500

    Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug24898-029 | 6 ++++++
 1 file changed, 6 insertions(+)