commit e7ac8fabcc36e8b63f4967f5efc9447b60cb2204 Merge: 2ed0d240e cb81a69f9 Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 20 16:22:16 2018 -0400

Merge remote-tracking branch 'dgoulet/ticket27410_035_01'

src/feature/hs/hs_client.c | 2 +- src/feature/hs/hs_client.h | 2 + src/test/test_hs_client.c | 117 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 120 insertions(+), 1 deletion(-)