commit d4fde97de26ef65d22d84ec2fb3c83a1e0dc29df Merge: 990ae1b02 1af7f40da Author: David Goulet dgoulet@torproject.org Date: Thu Jul 9 07:27:25 2020 -0400

Merge branch 'maint-0.4.4' into release-0.4.4

changes/bug34084 | 3 +++ src/feature/hs/hs_client.c | 36 +++++++++++++++++++++--------------- 2 files changed, 24 insertions(+), 15 deletions(-)