commit b9d0aa21080014d86a61946e9d09652d8e7fa058 Merge: 85674f59b 967efc0d2 Author: Nick Mathewson nickm@torproject.org Date: Wed Dec 5 10:25:12 2018 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

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