diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-11-04 13:26:37 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-11-04 13:26:37 -0400 |
| commit | c35c43d7d9df793c890deb14800e24327fbca452 (patch) | |
| tree | 3f6f3623c301b1900fbf58bb84ec86657baebce0 /src/test/test.c | |
| parent | bd6aa4f3d19a571adeaa956728f7e842d847c4ee (diff) | |
| parent | c189cb5cc29e92e55f8e94b5531d2626eff71d63 (diff) | |
| download | tor-c35c43d7d9df793c890deb14800e24327fbca452.tar.gz tor-c35c43d7d9df793c890deb14800e24327fbca452.zip | |
Merge branch 'ticket17238_029_02-resquash'
Conflicts:
src/or/rendclient.c
src/or/rendcommon.c
src/or/routerparse.c
src/test/test_dir.c
src/trunnel/ed25519_cert.h
Diffstat (limited to 'src/test/test.c')
| -rw-r--r-- | src/test/test.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/test/test.c b/src/test/test.c index 9a41b976b8..b02ecb922d 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1205,6 +1205,8 @@ struct testgroup_t testgroups[] = { { "guardfraction/", guardfraction_tests }, { "extorport/", extorport_tests }, { "hs/", hs_tests }, + { "hs_cache/", hs_cache }, + { "hs_descriptor/", hs_descriptor }, { "introduce/", introduce_tests }, { "keypin/", keypin_tests }, { "link-handshake/", link_handshake_tests }, |