commit 990ae1b027e01575d7085eb3980bef6e43f6da04 Merge: d97360498 562957e0d Author: David Goulet <dgoulet@torproject.org> Date: Thu Jul 9 07:25:26 2020 -0400 Merge branch 'maint-0.4.4' into release-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(-)