commit e8a6a6635b26c327beca4f2a91c7ec2b2ff03cd8 Merge: 1969d5736 5d4fc193f Author: Nick Mathewson nickm@torproject.org Date: Tue Dec 5 19:43:23 2017 -0500

Merge branch 'dgoulet_ticket20699_033_01'

changes/ticket20699 | 14 ++ src/or/control.c | 539 +++++++++++++++++++++++++++++++++------------ src/or/control.h | 65 ++++-- src/or/directory.c | 46 +++- src/or/hs_cache.c | 18 ++ src/or/hs_cache.h | 2 + src/or/hs_client.c | 5 + src/or/hs_common.h | 11 + src/or/hs_control.c | 256 +++++++++++++++++++++ src/or/hs_control.h | 52 +++++ src/or/hs_service.c | 245 ++++++++++++++++++--- src/or/hs_service.h | 15 ++ src/or/include.am | 4 +- src/or/rendclient.c | 10 +- src/or/rendservice.c | 8 +- src/or/rendservice.h | 11 +- src/test/include.am | 1 + src/test/test.c | 1 + src/test/test.h | 1 + src/test/test_controller.c | 168 +++++++++++--- src/test/test_hs.c | 15 +- src/test/test_hs_control.c | 199 +++++++++++++++++ 22 files changed, 1426 insertions(+), 260 deletions(-)