commit 993238aa2d6e8d038a0e0a101518cb57d42b87c4 Merge: 432695a61e a42e58a284 Author: David Goulet dgoulet@torproject.org Date: Fri May 7 09:05:21 2021 -0400

Merge branch 'maint-0.4.6' into release-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(-)