[tor-commits] [tor/master] Merge branch 'tor-github/pr/1013' into maint-0.4.0

[asn at torproject.org]

commit cd264e145b0b3518f46e471ecd9228921ee46ab6
Merge: 2b54733dc ff5584034
Author: George Kadianakis <desnacked at riseup.net>
Date:   Wed May 15 13:45:39 2019 +0300

    Merge branch 'tor-github/pr/1013' into maint-0.4.0

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