commit d28b6792cb99f25d42607eb46985ac4553013dd8 Merge: c34fb3413 d60ed5a6a Author: George Kadianakis desnacked@riseup.net Date: Mon Nov 18 19:06:53 2019 +0200

Merge branch 'tor-github/pr/1423'

doc/tor.1.txt | 38 ++++ src/app/config/config.c | 6 +- src/core/mainloop/connection.c | 2 + src/core/or/connection_edge.c | 179 +++++++++++-------- src/core/or/connection_edge.h | 18 +- src/core/or/entry_port_cfg_st.h | 3 + src/core/or/socks_request_st.h | 7 + src/feature/dirclient/dirclient.c | 57 +----- src/feature/hs/hs_cache.c | 101 +++++++++-- src/feature/hs/hs_cache.h | 12 +- src/feature/hs/hs_client.c | 362 +++++++++++++++++++++++++++++--------- src/feature/hs/hs_client.h | 6 +- src/feature/hs/hs_descriptor.c | 77 ++++---- src/feature/hs/hs_descriptor.h | 25 +++ src/lib/net/socks5_status.h | 9 + src/test/hs_test_helpers.c | 49 ++++++ src/test/hs_test_helpers.h | 7 + src/test/test_hs_cache.c | 86 ++++++++- src/test/test_hs_client.c | 154 +++++++++++++++- src/test/test_hs_common.c | 45 +++-- src/test/test_hs_descriptor.c | 30 ++-- 21 files changed, 964 insertions(+), 309 deletions(-)