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

[nickm at torproject.org]

commit d749f6b5f62731d42bdad5d60a413fdd7f120158
Merge: 398bef259 eacfd2911
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 23 17:49:29 2018 -0400

    Merge branch 'maint-0.3.3'

 src/or/hs_service.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)