commit 11961f0bc553a5909f2465a06fe5e7ca27fa6da9 Merge: da9684d89a 9316ca9f06 Author: Nick Mathewson nickm@torproject.org Date: Tue Aug 11 12:39:30 2020 -0400

Merge remote-tracking branch 'tor-gitlab/mr/119'

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