commit 908f1b8eb29f25758d4b3b0ff263e2d71725ce2d Merge: cd2ddf2e4 936e2aa0d Author: Nick Mathewson <nickm@torproject.org> Date: Thu Aug 16 08:37:11 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug26932 | 3 +++ src/or/hs_service.c | 1 + 2 files changed, 4 insertions(+)