commit 6945f2b3efb65f9812885e91179203621d37dd7a Merge: 231036a11 ff5584034 Author: Nick Mathewson nickm@torproject.org Date: Wed May 15 07:41:34 2019 -0400

Merge branch 'bug30475_035' into maint-0.3.5

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