Merge remote-tracking branch 'ahf-github/asn/bugs4700_2'

changes/bug4700

doc/tor.1.txt

src/app/config/config.c

src/core/or/connection_edge.c

src/core/or/connection_edge.h

src/core/or/or.h

src/feature/hs/hs_common.c

src/feature/hs/hs_config.c

src/feature/hs/hs_ident.h

src/feature/hs/hs_service.c

src/feature/hs/hs_service.h

src/test/test_extorport.c

src/test/test_helpers.c

src/test/test_helpers.h

src/test/test_hs_service.c