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

[nickm at torproject.org]

commit aa1d90b40c5f6e65b7b95cfb7e192e27e6530c52
Merge: 40c64f45f 0dc55fb24
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 9 08:15:46 2017 -0500

    Merge branch 'bug23985_029' into maint-0.3.2

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