[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2

[teor at torproject.org]

commit 84e9060f4de1889fba8be99cff7e5bc05911a58f
Merge: e73fb5b0e acd27f4b4
Author: teor <teor at torproject.org>
Date:   Fri Oct 25 09:42:10 2019 +1000

    Merge branch 'maint-0.4.2' into release-0.4.2

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