r11715@Kushana: nickm | 2006-12-24 22:53:06 -0500

 Document a couple more options in the man page.


svn:r9192

2 files changed, 17 insertions, 0 deletions

diff --git a/doc/TODO b/doc/TODO
index 5b63e0d74b..0d705f8fad 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -183,6 +183,7 @@ NR  D Get some kind of "meta signing key" to be used solely to sign
       - unrecommend IE because of ftp:// bug.
     - torrc.complete.in needs attention?
     - we should add a preamble to tor-design saying it's out of date.
+    - Document transport and natdport
 
   - Improvements to bandwidth counting
 R   - look into "uncounting" bytes spent on local connections, so
diff --git a/doc/tor.1.in b/doc/tor.1.in
index 83ac89f83d..6ac3c1f735 100644
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -493,6 +493,22 @@ leaking DNS requests.
 When a controller asks for a virtual (unused) address with the
 'MAPADDRESS' command, Tor picks an unassigned address from this range.
 (Default: 127.192.0.0/10)
+.LP
+.TP
+\fBAllowNonRFC953Hostnames \fR\fB0\fR|\fB1\fR\fP
+When this option is enabled, Tor blocks hostnames containing illegal
+characters (like @ and :) rather than sending them to an exit node to be
+resolved.  This helps trap accidental attempts to resolve URLs and so on.
+(Default: 1)
+.LP
+.TP
+\fBFastFirstHopPK \fR\fB0\fR|fB1\fR\fP
+When this option is enabled and we aren't running as a server, Tor
+skips the public key step for the first hop of creating circuits.  This is
+safe since we have already used TLS to authenticate the server and to
+establish forward-secure keys.  Turning this option off makes circuit
+building slower.
+(Default: 1)
 
 .SH SERVER OPTIONS
 .PP