commit 94605f08fb89ea79409225362d2fa0f8a07435d7 Merge: 810152b20 6c0c08bbb Author: Nick Mathewson nickm@torproject.org Date: Wed Aug 29 15:05:05 2018 -0400

Merge branch 'ticket27246_035_01_squashed'

changes/ticket27246 | 4 +++ src/core/or/circuitbuild.c | 21 ++++++++----- src/feature/dirauth/dirvote.c | 5 ++- src/feature/nodelist/microdesc.c | 2 +- src/feature/nodelist/microdesc_st.h | 10 ++++-- src/feature/nodelist/nodelist.c | 31 +++++++++++++++++++ src/feature/nodelist/nodelist.h | 1 + src/feature/nodelist/routerinfo_st.h | 9 +++++- src/feature/nodelist/routerlist.c | 5 +-- src/feature/nodelist/routerparse.c | 16 +++++++--- src/feature/relay/router.c | 60 +++++++++++++++++++++++++++++++++--- src/feature/relay/router.h | 4 +++ src/test/test_dir.c | 14 ++++++--- src/test/test_hs_service.c | 4 +-- src/test/test_router.c | 8 +++-- 15 files changed, 161 insertions(+), 33 deletions(-)