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/core/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/core/include.am')
| -rw-r--r-- | src/core/include.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/include.am b/src/core/include.am index 911932d46b..50a2e2eeb8 100644 --- a/src/core/include.am +++ b/src/core/include.am @@ -64,6 +64,7 @@ LIBTOR_APP_A_SOURCES = \ src/core/proto/proto_cell.c \ src/core/proto/proto_control0.c \ src/core/proto/proto_ext_or.c \ + src/core/proto/proto_haproxy.c \ src/core/proto/proto_http.c \ src/core/proto/proto_socks.c \ src/feature/api/tor_api.c \ @@ -324,6 +325,7 @@ noinst_HEADERS += \ src/core/proto/proto_cell.h \ src/core/proto/proto_control0.h \ src/core/proto/proto_ext_or.h \ + src/core/proto/proto_haproxy.h \ src/core/proto/proto_http.h \ src/core/proto/proto_socks.h \ src/feature/api/tor_api_internal.h \ |