r12983@Kushana: nickm | 2007-05-18 16:46:15 -0400

 Note that we do not permit you to exit to port 0, no matter what.  Closes bug 409.


svn:r10211

3 files changed, 5 insertions, 4 deletions

diff --git a/doc/TODO b/doc/TODO
index cf5e85934..f63af3f41 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -93,7 +93,7 @@ Things we'd like to do in 0.2.0.x:
         o Implement, but make it option-controlled.
         o Make it always-on once it seems to work.
       o Implement option to download and cache extra-info documents.
-      - Improve the 'retry' logic on extra-info documents.
+      o Improve the 'retry' logic on extra-info documents.
       - Drop bandwidth history from router-descriptors
     - 105: Version negotiation for the Tor protocol (finalize by Jun 1)
     - 108: Base "Stable" Flag on Mean Time Between Failures
diff --git a/doc/spec/dir-spec.txt b/doc/spec/dir-spec.txt
index 4ad547219..5fab87c00 100644
--- a/doc/spec/dir-spec.txt
+++ b/doc/spec/dir-spec.txt
@@ -417,7 +417,7 @@ $Id$
 
        [Any number]
 
-       These lines describe the rules that an OR follows when
+       These lines describe an "exit policy": the rules that an OR follows when
        deciding whether to allow a new stream to a given address.  The
        'exitpattern' syntax is described below.  The rules are considered in
        order; if no rule matches, the address will be accepted.  For clarity,
@@ -570,7 +570,8 @@ $Id$
    port ::= an integer between 1 and 65535, inclusive.
 
       [Some implementations incorrectly generate ports with value 0.
-       Implementations SHOULD accept this, and SHOULD NOT generate it.]
+       Implementations SHOULD accept this, and SHOULD NOT generate it.
+       Connections to port 0 are never permitted.]
 
    addrspec ::= "*" | ip4spec | ip6spec
    ipv4spec ::= ip4 | ip4 "/" num_ip4_bits | ip4 "/" ip4mask
diff --git a/doc/spec/tor-spec.txt b/doc/spec/tor-spec.txt
index 9f1da4fd3..49745ff5b 100644
--- a/doc/spec/tor-spec.txt
+++ b/doc/spec/tor-spec.txt
@@ -611,7 +611,7 @@ see tor-design.pdf.
 
    where  ADDRESS can be a DNS hostname, or an IPv4 address in
    dotted-quad format, or an IPv6 address surrounded by square brackets;
-   and where PORT is encoded in decimal.
+   and where PORT is a decimal integer between 1 and 65535, inclusive.
 
    [What is the [00] for? -NM]
    [It's so the payload is easy to parse out with string funcs -RD]