commit dbef7af12c68965b68cf2157e4fc18fd6fc7acf6 Merge: d6552a7a2 bf8bb9c52 Author: Nick Mathewson nickm@torproject.org Date: Fri Jan 4 14:57:06 2019 -0500

Merge branch 'maint-0.3.3' into release-0.3.3

changes/bug28619 | 6 ++++++ src/or/hs_service.c | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-)