commit 2a705e81a33879aad658ad2c824aeaa8e7f03eed Merge: 9ac1ed525f 326f954f10 Author: David Goulet dgoulet@torproject.org Date: Tue Oct 19 10:35:40 2021 -0400

Merge branch 'maint-0.4.6'

changes/ticket40476 | 8 ++++++++ src/core/or/connection_edge.c | 28 +--------------------------- src/feature/dircache/dircache.c | 2 ++ src/feature/hs/hs_config.c | 8 ++++++-- src/test/test_hs_common.c | 10 ++++------ src/test/test_hs_config.c | 2 +- 6 files changed, 22 insertions(+), 36 deletions(-)