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

[nickm at torproject.org]

commit d7ce4a9d7daa6dfc4ca9bb075554f293d6efa2c0
Merge: e80db7943 a546e0760
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 14 12:56:30 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug27335    | 4 ++++
 src/or/hs_service.c | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)