commit a42e58a284f2b1d8f975175c97eb044b57ce5905 Merge: b1b4c05fb3 5e836eb80c Author: David Goulet dgoulet@torproject.org Date: Fri May 7 09:05:16 2021 -0400

Merge branch 'tor-gitlab/mr/375' into maint-0.4.6

changes/ticket40373 | 3 +++ src/core/or/connection_edge.c | 43 +++++++++++++++++++++++++++++++++++++++++-- src/core/or/connection_edge.h | 1 + src/test/test_hs_common.c | 10 ++++++++++ 4 files changed, 55 insertions(+), 2 deletions(-)