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

commit c1e0206365bbd0210b149357aec5ec054155539f Merge: 1ab85566d 6f47734ea Author: Nick Mathewson <nickm@torproject.org> Date: Fri Sep 14 12:56:30 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 changes/bug27335 | 4 ++++ src/or/hs_service.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-)