From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 5 Jun 2019 13:04:09 +0000 (-0400)
Subject: Merge remote-tracking branch 'tor-github/pr/1053'
X-Git-Tag: tor-0.4.1.2-alpha~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b39a8d315dcbfae002c6ced7434b6afd5a5670d1;p=thirdparty%2Ftor.git

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

b39a8d315dcbfae002c6ced7434b6afd5a5670d1
diff --cc src/test/test.c
index cac98dd839,70c5558150..d7682b6619
--- 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 167fd090ac,8a5c675bc3..b108d795ea
--- 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[];