man page entries for TunnelDirConns and PreferTunneledDirConns

and add a todo item for nick in case he gets bored :)


svn:r9260

2 files changed, 15 insertions, 15 deletions

diff --git a/doc/TODO b/doc/TODO
index 7aa67bd39e..affa262b7d 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -59,18 +59,13 @@ R     - handle connect-dir streams that don't have a chosen_exit_name set.
         o Implement
 R       - Hunt for places that change networkstatus info that I might have
           missed.
-R     . option to dl directory info via tor
-        o Make an option like __AllDirActionsPrivate that falls back to
-          non-Tor DL when not enough info present.  (TunnelDirConns).
-        - Set default to 0 before release candidate.
-        o Think harder about whether TunnelDirConns should be on
-          by default. No, they shouldn't, until we have much more of
-          blocking.pdf implemented.
-        o Handle case where we have no descriptors and so don't know who can
-          handle BEGIN_DIR.
-        - actually cause the directory.c functions to know about or_port
-          and use it when we're supposed to.
-        - man page items for TunnelDirConns and PreferTunneledDirConns
+
+  . option to dl directory info via tor:
+    TunnelDirConns and PreferTunneledDirConns
+R   - actually cause the directory.c functions to know about or_port
+      and use it when we're supposed to.
+N   - for tunneled edge conns, stop reading to the bridge connection
+      when the or_conn we're writing to has a full outbuf.
 
 N - DNS improvements
     . Asynchronous DNS
diff --git a/doc/tor.1.in b/doc/tor.1.in
index 65cb8cade4..7efeaac77d 100644
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -242,9 +242,14 @@ a limited number of writes.  (Default: 0)
 .LP
 .TP
 \fBTunnelDirConns \fR\fB0|\fR\fB1\fP
-If non-zero, try to have all directory info downloaded with encrypted
-connections.  (Default: 1)
-
+If non-zero, when a directory server we contact supports it, we will
+build a one-hop circuit and make an encrypted connection via its
+ORPort. (Default: 0)
+.LP
+.TP
+\fBPreferTunneledDirConns \fR\fB0|\fR\fB1\fP
+If non-zero, we will avoid directory servers that don't support tunneled
+directory connections, when possible. (Default: 0)
 
 .SH CLIENT OPTIONS
 .PP