commit 98dd3757bfa2111707f6fe9cde7e1ece88825821 Merge: 0dc1595d0 3d937043c Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 31 14:32:24 2018 -0500

Merge branch 'bug25008'

changes/bug25008 | 9 ++++ changes/bug25105 | 5 +++ src/or/nodelist.c | 103 +++++++++++++++--------------------------- src/or/or.h | 73 +++++++++++++++++------------- src/or/routerlist.c | 4 +- src/or/routerparse.c | 110 ++++++++++++++++++++++++++++----------------- src/or/routerparse.h | 4 ++ src/test/test_hs_common.c | 2 +- src/test/test_hs_service.c | 3 ++ 9 files changed, 173 insertions(+), 140 deletions(-)