Merge branch 'haxxpop/tcp_proxy_squashed' into tcp_proxy_squshed_and_merged

This commit is contained in:
Nick Mathewson
2020-01-06 13:41:20 -05:00
27 changed files with 742 additions and 164 deletions
+6
View File
@@ -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).