[tor-commits] [tor/master] Merge branch 'ticket23220'

[nickm at torproject.org]

commit 5ec91a3d7f767ec593fcd4dc9c646010dbd9f215
Merge: a368cadf9 efbd4a33f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 11 14:08:26 2017 -0400

    Merge branch 'ticket23220'

 changes/bug23220    | 7 +++++++
 src/or/routerlist.c | 5 +++--
 2 files changed, 10 insertions(+), 2 deletions(-)