aboutsummaryrefslogtreecommitdiff
path: root/src/test/test.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-01-06 13:41:20 -0500
committerNick Mathewson <nickm@torproject.org>2020-01-06 13:41:20 -0500
commit1b63eea66cbb8793a3cff05de8d856ce3b93fc17 (patch)
tree2cf4f6ff12522ed24a610b3acab0b107f73b1977 /src/test/test.c
parent9276c07a916e4dc3b159c95c578e43be102f26e6 (diff)
parent14d781fff6bd88c4e0cd5b741629c3e79c8612d9 (diff)
downloadtor-1b63eea66cbb8793a3cff05de8d856ce3b93fc17.tar.gz
tor-1b63eea66cbb8793a3cff05de8d856ce3b93fc17.zip
Merge branch 'haxxpop/tcp_proxy_squashed' into tcp_proxy_squshed_and_merged
Diffstat (limited to 'src/test/test.c')
-rw-r--r--src/test/test.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/test/test.c b/src/test/test.c
index 292082d4fb..f0409f0dce 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -739,6 +739,7 @@ struct testgroup_t testgroups[] = {
{ "prob_distr/", prob_distr_tests },
{ "procmon/", procmon_tests },
{ "process/", process_tests },
+ { "proto/haproxy/", proto_haproxy_tests },
{ "proto/http/", proto_http_tests },
{ "proto/misc/", proto_misc_tests },
{ "protover/", protover_tests },