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

[nickm at torproject.org]

commit c74a817e837774a5e488d6c544ea2b45d3e4ddcf
Merge: e5a83062e 6e4ebd41b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Nov 8 10:47:22 2017 -0500

    Merge branch 'bug23318-redux_029' into maint-0.3.2

 changes/bug23318    | 11 +++++++++++
 changes/bug24170    |  3 +++
 src/or/routerlist.c | 48 +++++++++++++++++++++++++++++++-----------------
 3 files changed, 45 insertions(+), 17 deletions(-)