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

[nickm at torproject.org]

commit 6a8c1667df7114711a387c3f60989a02d594dcc0
Merge: 57deb20f3 aa1d90b40
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 9 08:17:46 2017 -0500

    Merge branch 'maint-0.3.2' into release-0.3.2

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