commit d3ecb3a8d6d55575d4ab3f80fed5e2b2fdcc561a Merge: f6b30a97a 92b4996b2 Author: Nick Mathewson nickm@torproject.org Date: Fri Jun 29 13:07:13 2018 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

src/or/hs_client.c | 6 +++--- src/test/test_hs_common.c | 7 ++++++- src/test/test_hs_intropoint.c | 7 +++++++ 3 files changed, 16 insertions(+), 4 deletions(-)