[tor-commits] [tor/master] Merge branch 'maint-0.4.6'

[dgoulet at torproject.org]

commit 93af8b1ad859a7dc4195d4a049e35bd3e197cffe
Merge: 9334e7c775 a42e58a284
Author: David Goulet <dgoulet at torproject.org>
Date:   Fri May 7 09:05:21 2021 -0400

    Merge branch '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(-)