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

[dgoulet at torproject.org]

commit d7f3d1196c7bf962125fdc165492623c12359679
Merge: e4bfa734a 562957e0d
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu Jul 9 07:25:26 2020 -0400

    Merge branch 'maint-0.4.4'

 changes/ticket33873           | 4 ++++
 src/core/or/connection_edge.c | 5 ++++-
 src/test/test_hs_common.c     | 8 +++++++-
 3 files changed, 15 insertions(+), 2 deletions(-)