commit 7a82c972efacb5004431ae81326b3a8e55d5fac7 Merge: c1bf819a3 92ae8cea3 Author: George Kadianakis <desnacked@riseup.net> Date: Wed Apr 8 18:15:37 2020 +0300 Merge branch 'tor-github/pr/1857' changes/ticket32542 | 3 ++ doc/tor.1.txt | 15 +++--- src/feature/hs/hs_circuit.c | 18 ++++++++ src/feature/hs/hs_client.c | 110 ++++++++++++++++++++++++++++++++++++++++++++ src/feature/hs/hs_client.h | 1 + src/lib/net/socks5_status.h | 1 + src/test/test_hs_client.c | 72 +++++++++++++++++++++++++++++ 7 files changed, 214 insertions(+), 6 deletions(-)