commit fe3331b84554c6d6e2e633d77de02453b9a73f88 Merge: d47c9276d bf8bb9c52 Author: Nick Mathewson nickm@torproject.org Date: Fri Jan 4 14:57:06 2019 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4

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