commit 61d5ce83a1ecc459798b530730316bfebe3bb192 Merge: 9df20f607 abde29824 Author: Nick Mathewson nickm@torproject.org Date: Wed May 9 11:53:18 2018 -0400

Merge branch 'maint-0.3.3'

changes/bug25761 | 3 +++ src/or/hs_service.c | 5 ----- src/or/rendservice.c | 5 +++-- 3 files changed, 6 insertions(+), 7 deletions(-)