[tor-commits] [tor/maint-0.3.1] Merge branch 'bug23318-redux_029' into maint-0.2.9

[nickm at torproject.org]

commit e91bae66d88a863970658174f8734b303042a161
Merge: 84c13336c 6e4ebd41b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Feb 12 08:33:03 2018 -0500

    Merge branch 'bug23318-redux_029' into maint-0.2.9

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