[tor-commits] [tor/master] Merge remote-tracking branch 'neel/b25886c'

[nickm at torproject.org]

commit d7301a456ab15ab84030b6e0fcf5a6fbd9e43fa9
Merge: e9c93a341 9d7f14888
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 20 08:32:34 2018 -0400

    Merge remote-tracking branch 'neel/b25886c'

 changes/bug25886    |  7 +++++++
 src/or/nodelist.c   | 16 +++++++++++-----
 src/or/routerlist.c | 13 +++++++++----
 src/or/routerlist.h |  3 ++-
 4 files changed, 29 insertions(+), 10 deletions(-)