[tor-commits] [tor/master] doc: Add TCPProxy option

[nickm at torproject.org]

commit 1b07a2d7bf8cc868e2d904191e8c30b48b7ac216
Author: Suphanat Chunhapanya <haxx.pop at gmail.com>
Date:   Tue Aug 20 16:18:24 2019 +0800

    doc: Add TCPProxy option
    
    TCPProxy is used for proxying all outgoing OR connections through some
    proxy with the protocol specified in the option.
---
 doc/tor.1.txt | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 06bf022b1..5bcb6ec2b 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -647,6 +647,22 @@ GENERAL OPTIONS
     in accordance to RFC 1929. Both username and password must be between 1 and
     255 characters.
 
+[[TCPProxy]] **TCPProxy** __protocol__ __host__:__port__::
+	Tor will use the given protocol to make all its OR (SSL) connections through
+	a TCP proxy on host:port, rather than connecting directly to servers. You may
+	want to set **FascistFirewall** to restrict the set of ports you might try to
+	connect to, if your proxy only allows connecting to certain ports. There is no
+	equivalent option for directory connections, because all Tor client versions
+	that support this option download directory documents via OR connections. +
++
+	The only protocol supported right now 'haproxy'. This option is only for
+	clients. (Default: none) +
++
+	The HAProxy version 1 proxy protocol is described in detail at
+	https://www.haproxy.org/download/1.8/doc/proxy-protocol.txt +
++
+	Both source IP address and source port will be set to zero.
+
 [[UnixSocksGroupWritable]] **UnixSocksGroupWritable** **0**|**1**::
     If this option is set to 0, don't allow the filesystem group to read and
     write unix sockets (e.g. SocksPort unix:). If the option is set to 1, make