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

diff --cc src/core/or/circuituse.c
Simple merge

diff --cc src/feature/hs/hs_circuit.c
Simple merge

diff --cc src/feature/rend/rendcommon.c
Simple merge

diff --cc src/test/include.am
Simple merge

diff --cc src/test/test.c
index cac98dd839cd37b8aef84a9b599910b992794c69,70c5558150ac3a918e8fbe818129cbfb417471c0..d7682b6619eb49cb9792f10bb2add1d7bd4e30ff
--- 1/src/test/test.c
--- 2/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 167fd090ac4b303efaf3ba58b907143cfc8e5429,8a5c675bc3e5ee2297d913b26d03e36df142ecc5..b108d795eac8638189d42c482c114ca4dc183639
--- 1/src/test/test.h
--- 2/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[];