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

[asn at torproject.org]

commit 72e799d28e9a035805ad03b12ccf275418f56df5
Merge: de01c0629 cd264e145
Author: George Kadianakis <desnacked at riseup.net>
Date:   Wed May 15 13:46:19 2019 +0300

    Merge branch 'maint-0.4.0' into release-0.4.0

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