commit 872d369ce7de08304f7eab841c5307173f891ec5 Merge: e3b501c576 d76f8457f3 Author: Nick Mathewson nickm@torproject.org Date: Tue Aug 11 12:40:09 2020 -0400

Merge branch 'maint-0.4.4' into release-0.4.4

changes/bug34086 | 3 +++ src/feature/hs/hs_client.c | 14 ++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-)