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 /changes | |
| 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 'changes')
| -rw-r--r-- | changes/ticket31518 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/changes/ticket31518 b/changes/ticket31518 new file mode 100644 index 0000000000..8deac56b98 --- /dev/null +++ b/changes/ticket31518 @@ -0,0 +1,6 @@ + o Major features (proxy): + - In addition to HTTP CONNECT, SOCKS4, and SOCKS5, Tor can make all OR + connections through the HAProxy server. A new torrc option was added to + specify the address/port of the server: TCPProxy <protocol> + <host>:<port>. Currently the only supported protocol in the option is + haproxy. Close ticket 31518. Patch done by Suphanat Chunhapanya (haxxpop). |