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

[nickm at torproject.org]

commit acc462c965acb90c2631797e10bb630eb2789e4e
Merge: 418d8bbe9 ae608408e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 11 16:43:48 2017 -0500

    Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/bug23682 | 5 +++++
 1 file changed, 5 insertions(+)