commit d76f8457f305fd7445dc09131b418b1bfbd99988 Merge: 2b968446d9 9316ca9f06 Author: Nick Mathewson nickm@torproject.org Date: Tue Aug 11 12:40:02 2020 -0400

Merge remote-tracking branch 'tor-gitlab/mr/119' into maint-0.4.4

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