commit 46a321fbdde353d0c0b37556d7e3e81cd2b42979 Merge: 1eb3719a6 967efc0d2 Author: Nick Mathewson nickm@torproject.org Date: Wed Dec 5 10:25:12 2018 -0500

Merge branch 'maint-0.3.5'

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