commit 82b581f3fc8ed3c84034bbb0c723ccd6b092fbe9 Merge: 2549b3e92 e07b677bd Author: Nick Mathewson nickm@torproject.org Date: Fri Aug 25 11:31:53 2017 -0400

Merge remote-tracking branch 'asn/bug23309_v2'

src/or/hs_service.c | 230 ++++++++++++++++++++++++++------------------- src/or/hs_service.h | 3 + src/test/test_hs_common.c | 7 +- src/test/test_hs_service.c | 13 +++ 4 files changed, 154 insertions(+), 99 deletions(-)