commit a546e07600151be275e6134407c2bcb833a3dd97 Merge: 281854bab 0971b3ce4 Author: Nick Mathewson nickm@torproject.org Date: Fri Sep 14 12:56:30 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

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