commit a9913435bc66e5f0ec539c9ce6f72a3e52aa4f08 Merge: bc106b9e16 44e105c27f Author: David Goulet dgoulet@torproject.org Date: Tue Oct 19 10:24:24 2021 -0400

Merge branch 'maint-0.3.5' into release-0.3.5

changes/ticket40476 | 8 ++ src/core/or/connection_edge.c | 3 - src/feature/control/control.c | 40 ++++---- src/feature/dircache/dircache.c | 58 +----------- src/feature/hs/hs_common.h | 2 +- src/feature/hs/hs_config.c | 10 +- src/feature/hs/hs_intropoint.c | 3 +- src/test/include.am | 11 +-- src/test/test_dir_handle_get.c | 74 +-------------- src/test/test_entryconn.c | 41 --------- src/test/test_hs_common.c | 9 +- src/test/test_hs_config.c | 199 +++++----------------------------------- src/test/test_hs_intropoint.c | 64 ------------- src/test/test_hs_service.c | 5 +- 14 files changed, 72 insertions(+), 455 deletions(-)