[tor-commits] [tor/master] Merge branch 'ticket25996'

[nickm at torproject.org]

commit f26d6ead21015b7ba6f7d72ebfc2ebf29da0863b
Merge: da8996d61 a2b53c1d0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 2 08:45:35 2018 -0400

    Merge branch 'ticket25996'

 changes/ticket25996       |  5 +++++
 src/test/test_hs_client.c | 18 +++++++++++-------
 2 files changed, 16 insertions(+), 7 deletions(-)