Merge branch 'ticket40476_045_01' into ticket40476_046_01

diff --cc src/core/or/connection_edge.c
Simple merge

diff --cc src/feature/dircache/dircache.c
Simple merge

diff --cc src/feature/hs/hs_config.c
Simple merge

diff --cc src/test/test_hs_common.c
Simple merge

diff --cc src/test/test_hs_config.c
Simple merge