[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/ticket23310_032_02'

[nickm at torproject.org]

commit a213a32b7cc2ca0701953953a812662c2f0533d3
Merge: 7facfc728 21564c93c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 15 09:01:22 2017 -0400

    Merge remote-tracking branch 'dgoulet/ticket23310_032_02'

 src/or/hs_client.c         |  11 ++-
 src/or/hs_client.h         |   8 +-
 src/test/hs_indexes.py     |  70 ++++++++++++++++++
 src/test/hs_test_helpers.c |  31 ++++----
 src/test/include.am        |   2 +
 src/test/test_hs_client.c  | 180 +++++++++++++++++++++++++++++++++++++++++++++
 src/test/test_hs_common.c  | 166 ++++++++++++++++++++++++++++++++++-------
 7 files changed, 422 insertions(+), 46 deletions(-)