[tor-commits] [tor/release-0.4.2] Merge remote-tracking branch 'tor-github/pr/1464' into maint-0.3.5

[teor at torproject.org]

commit 501b5174d84a121fe5932433e54b2929a5c2876d
Merge: 400cee261 ed57a04a6
Author: teor <teor at torproject.org>
Date:   Mon Nov 25 12:35:11 2019 +1000

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

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