diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-06-19 14:16:21 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-06-19 14:16:21 -0400 |
| commit | e01e4e0146a4618678b5ec8003e0f8a798b592e7 (patch) | |
| tree | 85f8ff8b0bfc8ddeb034a269471ffeffe4a97ae9 /doc | |
| parent | bf95d678e86598c5200417e96d4d4069ace8b851 (diff) | |
| parent | 0379439fe89f7951415659b5fe2136e2a7fdc6ee (diff) | |
| download | tor-e01e4e0146a4618678b5ec8003e0f8a798b592e7.tar.gz tor-e01e4e0146a4618678b5ec8003e0f8a798b592e7.zip | |
Merge branch 'ticket20575_031_01_squashed'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index ff9fba726b..a5cbb40cbf 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -521,13 +521,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 |