[tor-commits] [tor/master] Merge branch 'maint-0.4.2'

[teor at torproject.org]

commit c00602cc34548655a6f89ee10f23329a0131805d
Merge: 68e1ced60 acd27f4b4
Author: teor <teor at torproject.org>
Date:   Fri Oct 25 09:42:14 2019 +1000

    Merge branch 'maint-0.4.2'

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