From: Roger Dingledine <arma@torproject.org>
Date: Thu, 24 Feb 2005 11:00:06 +0000 (+0000)
Subject: man page entry for httpsproxy
X-Git-Tag: tor-0.1.0.1-rc~207
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ecd3ff709e6f3ee70ab82f892d6dd3bfb63c1df;p=thirdparty%2Ftor.git

man page entry for httpsproxy


svn:r3683
---

diff --git a/doc/TODO b/doc/TODO
index d16b9852ec..a24f168b02 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -10,7 +10,7 @@ ARMA    - arma claims
         D Deferred
         X Abandoned
 
-For 0.0.9.5:
+For 0.0.9.6:
    - Server instructions for OSX and Windows operators.
    - Audit all changes to bandwidth buckets for integer over/underflow.
 
@@ -38,7 +38,7 @@ R  - Reset uptime when IP/ORPort/... changes.
 
  Functionality
 N - Implement pending controller features.
-R - HTTPS proxy for OR CONNECT stuff. (For outgoing SSL connections to
+R . HTTPS proxy for OR CONNECT stuff. (For outgoing SSL connections to
     other ORs.)
   - Changes for forward compatibility
 N   - If a version is later than the last in its series, but a version
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.)