[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

[nickm at torproject.org]

commit fcfe1619767e0c5e0b97138934807b776fe30bcf
Merge: cf61d437d 6e9d5fc4e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jun 29 13:07:13 2018 -0400

    Merge branch 'maint-0.3.2' into release-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(-)