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

[nickm at torproject.org]

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

    Merge branch 'maint-0.3.3' into maint-0.3.4

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