commit e4f02f6c18dfac31ccdb684558a98ea570187491 Merge: 78222831a 1a6814c09 Author: Nick Mathewson nickm@torproject.org Date: Thu Oct 26 09:09:14 2017 -0400

Merge remote-tracking branch 'asn/bug23862_v2'

changes/bug23682 | 5 +++ src/or/directory.c | 4 +- src/or/directory.h | 3 ++ src/or/entrynodes.c | 6 +-- src/or/entrynodes.h | 4 ++ src/or/networkstatus.c | 2 +- src/test/test_routerlist.c | 109 +++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 126 insertions(+), 7 deletions(-)