commit bd2fe0d8f1076b8146538026cd23b1cef7b184b7 Merge: bf35c6ae7 6945f2b3e Author: Nick Mathewson nickm@torproject.org Date: Wed May 15 07:41:42 2019 -0400

Merge branch 'maint-0.3.5' into release-0.3.5

changes/bug30475 | 4 ++++ src/feature/hs/hs_service.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)