commit acd27f4b419907052d0677933fe5068a5c25953f Merge: 570d1367e ed57a04a6 Author: teor teor@torproject.org Date: Fri Oct 25 09:41:48 2019 +1000

Merge remote-tracking branch 'tor-github/pr/1464' into maint-0.4.2

changes/ticket28970 | 6 ++++++ src/feature/hs/hs_client.c | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-)