summaryrefslogtreecommitdiff
path: root/doc/tor.1.in
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2005-02-24 11:00:06 +0000
committerRoger Dingledine <arma@torproject.org>2005-02-24 11:00:06 +0000
commit2ecd3ff709e6f3ee70ab82f892d6dd3bfb63c1df (patch)
tree23100f63fadf59d60a5a6750c1bb1575dfd1d57f /doc/tor.1.in
parent6faaac27064ba6bf0c8e0b1fc819004d3bf585ba (diff)
downloadtor-2ecd3ff709e6f3ee70ab82f892d6dd3bfb63c1df.tar.gz
tor-2ecd3ff709e6f3ee70ab82f892d6dd3bfb63c1df.zip
man page entry for httpsproxy
svn:r3683
Diffstat (limited to 'doc/tor.1.in')
-rw-r--r--doc/tor.1.in4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/tor.1.in b/doc/tor.1.in
index 8c81357e0c..c2532a7ead 100644
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -65,6 +65,10 @@ On startup, setgid to this user.
If set, Tor will make all its directory requests through this host:port,
rather than connecting directly to any directory servers.
.TP
+\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.
+.TP
\fBKeepalivePeriod \fR\fINUM\fP
To keep firewalls from expiring connections, send a padding keepalive
cell on open connections every NUM seconds. (Default: 5 minutes.)