commit 2a5e641cfe8f798c0cdb10f1a9d25b80f089dcce Merge: 6c749bf38 08f31e405 Author: George Kadianakis desnacked@riseup.net Date: Tue Feb 4 13:09:41 2020 +0100

Merge branch 'tor-github/pr/1704'

changes/ticket33139 | 3 ++ src/feature/hs/hs_client.c | 22 ++++++++++ src/feature/hs/hs_client.h | 2 + src/test/test_hs_client.c | 100 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 127 insertions(+)