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

[nickm at torproject.org]

commit 2f4ed3e57821d194d1265be2aae1c739f11a7444
Merge: bedfacc6c d3ecb3a8d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jun 29 13:07:13 2018 -0400

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