[tor-commits] [tor/main] Merge branch 'ticket40476_045_01' into ticket40476_046_01

[dgoulet at torproject.org]

commit f748a497c7735cd7adb7982aca4fec8775196e23
Merge: ce5b240c19 db297a177e
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Oct 19 09:48:13 2021 -0400

    Merge branch 'ticket40476_045_01' into ticket40476_046_01

 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(-)