commit d4c697b2f7342eea8b750428c28a222be5bcd411 Merge: 816c45606b d949a2f924 Author: David Goulet dgoulet@torproject.org Date: Tue Oct 19 10:29:20 2021 -0400
Merge branch 'maint-0.4.5' into release-0.4.5
changes/ticket40476 | 8 ++ src/core/or/connection_edge.c | 17 +--- src/feature/control/control_cmd.c | 32 +++--- src/feature/dircache/dircache.c | 61 +----------- src/feature/hs/hs_common.h | 2 +- src/feature/hs/hs_config.c | 8 +- src/feature/hs/hs_intropoint.c | 3 +- src/test/include.am | 13 ++- src/test/test_dir_handle_get.c | 75 +------------- src/test/test_entryconn.c | 41 -------- src/test/test_hs_common.c | 15 ++- src/test/test_hs_config.c | 201 +++++--------------------------------- src/test/test_hs_intropoint.c | 64 ------------ src/test/test_hs_service.c | 5 +- 14 files changed, 75 insertions(+), 470 deletions(-)