commit 739cd6ec209742390b612ad881ed0e22e8d5e96b Merge: 97dfe87be 92b4996b2 Author: Nick Mathewson nickm@torproject.org Date: Fri Jun 29 13:07:13 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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(-)