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

[dgoulet at torproject.org]

commit 124c43704c99a181001d471b8cb2071e66b42597
Merge: 1c5c3f353 95559279e
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Oct 30 11:37:44 2018 -0400

    Merge branch 'maint-0.3.5'

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