commit 32a0bc2a84b0e73ab94e9428f9f8864bdc458444 Merge: d7f3d1196 1af7f40da Author: David Goulet dgoulet@torproject.org Date: Thu Jul 9 07:27:25 2020 -0400

Merge branch 'maint-0.4.4'

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