aboutsummaryrefslogtreecommitdiff
path: root/doc/tor.1.txt
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2017-04-25 09:11:49 -0400
committerNick Mathewson <nickm@torproject.org>2017-06-19 14:14:17 -0400
commit3f807ec05866d0438d81c252ac43946cabd23233 (patch)
treef0fd8a23442f92a7d2c0775d0db4a1024da2bd6f /doc/tor.1.txt
parent91dd4a00f7d4891e24187a849933547128aeeb9f (diff)
downloadtor-3f807ec05866d0438d81c252ac43946cabd23233.tar.gz
tor-3f807ec05866d0438d81c252ac43946cabd23233.zip
config: Deprecate HTTPProxy option
Move the HTTPProxy option to the deprecated list so for now it will only warn users but feature is still in the code which will be removed in a future stable version. Fixes #20575 Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'doc/tor.1.txt')
-rw-r--r--doc/tor.1.txt7
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 568d037d98..c0fc861914 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -522,13 +522,14 @@ GENERAL OPTIONS
[[HTTPProxy]] **HTTPProxy** __host__[:__port__]::
Tor will make all its directory requests through this host:port (or host:80
if port is not specified), rather than connecting directly to any directory
- servers.
+ servers. (DEPRECATED: As of 0.3.1.0-alpha you should use HTTPSProxy.)
[[HTTPProxyAuthenticator]] **HTTPProxyAuthenticator** __username:password__::
If defined, Tor will use this username:password for Basic HTTP proxy
authentication, as in RFC 2617. This is currently the only form of HTTP
proxy authentication that Tor supports; feel free to submit a patch if you
- want it to support others.
+ want it to support others. (DEPRECATED: As of 0.3.1.0-alpha you should use
+ HTTPSProxyAuthenticator.)
[[HTTPSProxy]] **HTTPSProxy** __host__[:__port__]::
Tor will make all its OR (SSL) connections through this host:port (or
@@ -646,7 +647,7 @@ GENERAL OPTIONS
(127.0.0.0/8 and ::1).
[[OutboundBindAddressOR]] **OutboundBindAddressOR** __IP__::
- Make all outbound non-exit (=relay and other) connections originate from the IP
+ Make all outbound non-exit (=relay and other) connections originate from the IP
address specified. This option overrides **OutboundBindAddress** for the same
IP version. This option may be used twice, once with an IPv4 address and once
with an IPv6 address. This setting will be ignored for connections to the