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

[asn at torproject.org]

commit 1de11dc47a81913cf32e7c40834869631c18ba3d
Merge: 43d411945 cd264e145
Author: George Kadianakis <desnacked at riseup.net>
Date:   Wed May 15 13:46:20 2019 +0300

    Merge branch 'maint-0.4.0'

 changes/bug30475            | 4 ++++
 src/feature/hs/hs_service.c | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)