[tor-commits] [tor/master] Merge branch 'maint-0.3.4'

[nickm at torproject.org]

commit 1f389dadd02e9a234ee1d1c316cdb6dcc2b25489
Merge: 7a47379f2 d3ecb3a8d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jun 29 13:07:13 2018 -0400

    Merge branch '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(-)