commit e0ea7407a4370c977ebbf0b70712c9e5ff7937fa Merge: 0e00d9369 88489cd29 Author: teor teor@torproject.org Date: Wed Feb 12 14:14:11 2020 +1000

Merge remote-tracking branch 'tor-github/pr/1725' into maint-0.4.3

changes/ticket28992 | 3 +++ src/feature/hs/hs_client.c | 11 ++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-)