[tor-commits] [tor/release-0.3.5] Merge branch 'tor-github/pr/415' into maint-0.3.5

[dgoulet at torproject.org]

commit 95559279e15393347c606eaaa323e0b6490782c2
Merge: 6c9d678ff 56f713b8a
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Oct 30 11:36:36 2018 -0400

    Merge branch 'tor-github/pr/415' into maint-0.3.5

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