[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug23318_029' into maint-0.3.2

[nickm at torproject.org]

commit c80293706fe16c052efef6653079163fc117029a
Merge: f46cdb3ff 01e984870
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 6 09:48:51 2017 -0500

    Merge remote-tracking branch 'public/bug23318_029' into maint-0.3.2

 changes/bug23318    | 7 +++++++
 src/or/routerlist.c | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)