summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Palfrader <peter@palfrader.org>2005-05-22 15:04:02 +0000
committerPeter Palfrader <peter@palfrader.org>2005-05-22 15:04:02 +0000
commiteec9107093b34208e933084248c7d09f19414a5d (patch)
treee64f1ec6d53f94df67fbe49de4e3b0c8df8ae42d
parentb86716b839d2ba18c0e977a5d49fef770e26d613 (diff)
downloadtor-eec9107093b34208e933084248c7d09f19414a5d.tar.gz
tor-eec9107093b34208e933084248c7d09f19414a5d.zip
Set FascistFirewall in bold in the description, and move the part about maybe using FascistFirewall from HttpsProxyAuthenticator to HttpsProxy
svn:r4278
-rw-r--r--doc/tor.1.in7
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/tor.1.in b/doc/tor.1.in
index 48981aba98..9ffae8e74f 100644
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -89,14 +89,15 @@ rather than connecting directly to any directory servers.
\fBHttpsProxy\fR \fIhost\fR[:\fIport\fR]\fP
If set, Tor will make all its OR (SSL) connections through this host:port,
via HTTP CONNECT, rather than connecting directly to servers.
+You may want to set \fBFascistFirewall\fR to restrict the set of ports you
+might try to connect to, if your Https proxy only allows connecting to certain
+ports.
.TP
\fBHttpsProxyAuthenticator\fR \fIusername:password\fP
If defined, Tor will use this username:password for Basic Https proxy
authentication, as in RFC 2617. This is currently the only form of
Https proxy authentication that Tor supports; feel free to submit a
-patch if you want it to support others. You may want to set FascistFirewall
-to restrict the set of ports you might try to connect to, if your Https
-proxy only allows connecting to certain ports.
+patch if you want it to support others.
.TP
\fBKeepalivePeriod \fR\fINUM\fP
To keep firewalls from expiring connections, send a padding keepalive