commit f5f377ecb219d45c01dc24de90f7fc7b180128e0 Merge: 5ee93047c 296e429eb Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 19 05:36:06 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

changes/bug25450 | 8 ++++++++ src/test/test_hs_service.c | 11 ++++++----- 2 files changed, 14 insertions(+), 5 deletions(-)