[tor-commits] [tor/master] Merge branch 'tor-github/pr/1855'

[asn at torproject.org]

commit 0b0b8a5b6db5d5609d0c2530c18fb67e0950f9d1
Merge: 1720a2191 6fbf624b5
Author: George Kadianakis <desnacked at riseup.net>
Date:   Wed Apr 8 16:31:37 2020 +0300

    Merge branch 'tor-github/pr/1855'

 changes/ticket33779         | 3 +++
 src/feature/hs/hs_service.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)