commit 0e4c42a912d020888e811b748925362e1b3dc67b Merge: a1b028304 03ef4ec46 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Sep 21 09:40:16 2018 -0400 Merge remote-tracking branch 'ahf-github/asn/bugs4700_2' changes/bug4700 | 5 +++ doc/tor.1.txt | 27 ++++++++++++ src/app/config/config.c | 1 + src/core/or/connection_edge.c | 49 ++++++++++++++++++++++ src/core/or/connection_edge.h | 6 +++ src/core/or/or.h | 1 + src/feature/hs/hs_common.c | 5 +++ src/feature/hs/hs_config.c | 48 +++++++++++++++++++++- src/feature/hs/hs_ident.h | 4 ++ src/feature/hs/hs_service.c | 13 ++++++ src/feature/hs/hs_service.h | 15 +++++++ src/test/test_extorport.c | 17 +------- src/test/test_helpers.c | 19 +++++++++ src/test/test_helpers.h | 3 ++ src/test/test_hs_service.c | 96 +++++++++++++++++++++++++++++++++++++++++++ 15 files changed, 292 insertions(+), 17 deletions(-)