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

[nickm at torproject.org]

commit 59c1016aba63c62e658065475add3cf77f665afa
Merge: ce3d5da0d aa1d90b40
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 9 08:17:46 2017 -0500

    Merge branch 'maint-0.3.2'

 changes/bug23985    | 9 +++++++++
 src/or/routerlist.c | 5 +++++
 2 files changed, 14 insertions(+)