commit b39a8d315dcbfae002c6ced7434b6afd5a5670d1 Merge: 0c16ec4c0 41b94722e Author: Nick Mathewson nickm@torproject.org Date: Wed Jun 5 09:04:09 2019 -0400

Merge remote-tracking branch 'tor-github/pr/1053'

changes/bug29034 | 5 ++++ src/core/or/circuituse.c | 6 ++++ src/feature/hs/hs_circuit.c | 31 +++++++++++++++++++ src/feature/hs/hs_circuit.h | 1 + src/feature/rend/rendcommon.c | 11 +++++++ src/feature/rend/rendcommon.h | 2 ++ src/test/include.am | 1 + src/test/test.c | 1 + src/test/test.h | 1 + src/test/test_hs_circ.c | 70 +++++++++++++++++++++++++++++++++++++++++++ 10 files changed, 129 insertions(+)

diff --cc src/test/test.c index cac98dd83,70c555815..d7682b661 --- a/src/test/test.c +++ b/src/test/test.c @@@ -866,12 -871,13 +866,13 @@@ struct testgroup_t testgroups[] = { "dos/", dos_tests }, { "entryconn/", entryconn_tests }, { "entrynodes/", entrynodes_tests }, - { "guardfraction/", guardfraction_tests }, { "extorport/", extorport_tests }, { "geoip/", geoip_tests }, - { "legacy_hs/", hs_tests }, + { "guardfraction/", guardfraction_tests }, { "hs_cache/", hs_cache }, { "hs_cell/", hs_cell_tests }, + { "hs_circ/", hs_circ_tests }, + { "hs_client/", hs_client_tests }, { "hs_common/", hs_common_tests }, { "hs_config/", hs_config_tests }, { "hs_control/", hs_control_tests }, diff --cc src/test/test.h index 167fd090a,8a5c675bc..b108d795e --- a/src/test/test.h +++ b/src/test/test.h @@@ -215,13 -210,13 +215,14 @@@ extern struct testcase_t dns_tests[] extern struct testcase_t dos_tests[]; extern struct testcase_t entryconn_tests[]; extern struct testcase_t entrynodes_tests[]; -extern struct testcase_t guardfraction_tests[]; extern struct testcase_t extorport_tests[]; extern struct testcase_t geoip_tests[]; -extern struct testcase_t hs_tests[]; +extern struct testcase_t guardfraction_tests[]; +extern struct testcase_t handle_tests[]; extern struct testcase_t hs_cache[]; extern struct testcase_t hs_cell_tests[]; + extern struct testcase_t hs_circ_tests[]; +extern struct testcase_t hs_client_tests[]; extern struct testcase_t hs_common_tests[]; extern struct testcase_t hs_config_tests[]; extern struct testcase_t hs_control_tests[];