commit 6e9d5fc4ec40136d173be680a85a9bfb9b99fea4 Merge: 68dfbd5ef a2e623f63 Author: Nick Mathewson nickm@torproject.org Date: Fri Jun 29 13:07:07 2018 -0400

Merge remote-tracking branch 'ahf-github/maint-0.3.2' into maint-0.3.2

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