diff options
author | Nick Mathewson <nickm@torproject.org> | 2020-01-06 13:41:20 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2020-01-06 13:41:20 -0500 |
commit | 1b63eea66cbb8793a3cff05de8d856ce3b93fc17 (patch) | |
tree | 2cf4f6ff12522ed24a610b3acab0b107f73b1977 /src/test/include.am | |
parent | 9276c07a916e4dc3b159c95c578e43be102f26e6 (diff) | |
parent | 14d781fff6bd88c4e0cd5b741629c3e79c8612d9 (diff) | |
download | tor-1b63eea66cbb8793a3cff05de8d856ce3b93fc17.tar.gz tor-1b63eea66cbb8793a3cff05de8d856ce3b93fc17.zip |
Merge branch 'haxxpop/tcp_proxy_squashed' into tcp_proxy_squshed_and_merged
Diffstat (limited to 'src/test/include.am')
-rw-r--r-- | src/test/include.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/test/include.am b/src/test/include.am index 94352c8644..3433e848ea 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -190,6 +190,7 @@ src_test_test_SOURCES += \ src/test/test_process_descs.c \ src/test/test_prob_distr.c \ src/test/test_procmon.c \ + src/test/test_proto_haproxy.c \ src/test/test_proto_http.c \ src/test/test_proto_misc.c \ src/test/test_protover.c \ |