[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [torspec/master] Fix section numbers from copying 4.3 after 3.5.



commit 6bc07485c734d00145df115aa69e851b5c328e4a
Author: Karsten Loesing <karsten.loesing@xxxxxxx>
Date:   Tue Jan 14 12:32:42 2014 +0100

    Fix section numbers from copying 4.3 after 3.5.
---
 dir-spec.txt |   36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/dir-spec.txt b/dir-spec.txt
index ad59fcd..4fc8fdd 100644
--- a/dir-spec.txt
+++ b/dir-spec.txt
@@ -482,7 +482,7 @@
 
        [At most once.]
 
-       An exit-policy summary as specified in sections 3.4.1 and 3.6.2,
+       An exit-policy summary as specified in sections 3.4.1 and 3.7.2,
        summarizing
        the router's rules for connecting to IPv6 addresses. A missing
        "ipv6-policy" line is equivalent to "ipv6-policy reject 1-65535".
@@ -1185,7 +1185,7 @@
 
         [At most once]
 
-        The exit-policy summary as specified in sections 3.4.1 and 3.6.2.  A
+        The exit-policy summary as specified in sections 3.4.1 and 3.7.2.  A
         missing "p" line is equivalent to "p reject 1-65535".
 
         [With microdescriptors, clients don't learn exact exit policies:
@@ -1197,7 +1197,7 @@
 
         [At most once]
 
-        The IPv6 exit policy summary as specified in sections 3.4.1 and 3.6.2. A
+        The IPv6 exit policy summary as specified in sections 3.4.1 and 3.7.2. A
         missing "p6" line is equivalent to "p6 reject 1-65535".
 
         (Only included when generating microdescriptors for
@@ -1287,7 +1287,7 @@
         [At most once for votes; does not occur in consensuses.]
 
         A space-separated list of supported methods for generating
-        consensuses from votes.  See section 3.6.1 for details.  If this
+        consensuses from votes.  See section 3.7.1 for details.  If this
         line is present, method "1" MUST be included.  Absence of the
         line means that only method "1" is supported.
 
@@ -1295,7 +1295,7 @@
 
         [At most once for consensuses; does not occur in votes.]
 
-        See section 3.6.1 for details.
+        See section 3.7.1 for details.
 
         (Only included when the vote is generated with consensus-method 2 or
         later.)
@@ -1724,7 +1724,7 @@
          Wbe - Weight for Exit-flagged nodes for BEGIN_DIR requests
          Wbd - Weight for Guard+Exit-flagged nodes for BEGIN_DIR requests
 
-       These values are calculated as specified in section 3.6.3.
+       These values are calculated as specified in section 3.7.3.
 
    The signature contains the following item, which appears Exactly Once
    for a vote, and At Least Once for a consensus.
@@ -1897,13 +1897,13 @@
    accept not for all addresses, ignoring all rejects for private
    netblocks.  "Most" addresses are permitted if no more than 2^25
    IPv4 addresses (two /8 networks) were blocked.  The list is encoded
-   as described in section 3.6.2.
+   as described in section 3.7.2.
 
 3.5. Downloading missing certificates
 
    XXX when to download certificates.
 
-4.3. Downloading and storing router descriptors (authorities and caches)
+3.6. Downloading router descriptors
 
    Periodically (currently, every 10 seconds), directory servers check
    whether there are any specific descriptors that they do not have and that
@@ -1937,7 +1937,7 @@
    Authorities SHOULD NOT download descriptors for routers that they would
    immediately reject for reasons listed in section 3.2.
 
-3.6. Computing a consensus from a set of votes
+3.7. Computing a consensus from a set of votes
 
    Given a set of votes, authorities compute the contents of the consensus
    document as follows:
@@ -2020,7 +2020,7 @@
           for the descriptor we are listing.  (They should all be the
           same.  If they are not, we pick the most commonly listed
           one, breaking ties in favor of the lexicographically larger
-          vote.)  The port list is encoded as specified in section 3.6.2.
+          vote.)  The port list is encoded as specified in section 3.7.2.
 
         * If consensus-method 6 or later is in use and if 3 or more
           authorities provide a Measured= keyword in their votes for
@@ -2064,7 +2064,7 @@
    All ties in computing medians are broken in favor of the smaller or
    earlier item.
 
-3.6.1. Forward compatibility
+3.7.1. Forward compatibility
 
    Future versions of Tor will need to include new information in the
    consensus documents, but it is important that all authorities (or at least
@@ -2102,7 +2102,7 @@
    making changes in the contents of consensus; not for making
    backward-incompatible changes in their format.)
 
-3.6.2. Encoding port lists
+3.7.2. Encoding port lists
 
   Whether the summary shows the list of accepted ports or the list of
   rejected ports depends on which list is shorter (has a shorter string
@@ -2122,7 +2122,7 @@
   use an accept-style summary and list as much of the port list as is
   possible within these 1000 bytes.  [XXXX be more specific.]
 
-3.6.3. Computing Bandwidth Weights
+3.7.3. Computing Bandwidth Weights
 
   Let weight_scale = 10000
 
@@ -2284,7 +2284,7 @@
   Handle bridges and strange exit policies:
      Wgm=Wgg, Wem=Wee, Weg=Wed
 
-3.7. Consensus flavors
+3.8. Consensus flavors
 
    Consensus flavors are variants of the consensus that clients can choose
    to download and use instead of the unflavored consensus.  The purpose
@@ -2300,7 +2300,7 @@
 
    Examples for consensus flavors include:
       - Publishing hashes of microdescriptors instead of hashes of
-        full descriptors (see section 3.7.2).
+        full descriptors (see section 3.8.2).
       - Including different digests of descriptors, instead of the
         perhaps-soon-to-be-totally-broken SHA1.
 
@@ -2321,7 +2321,7 @@
 
       "network-status-version" SP version SP flavor NL
 
-3.7.1. ns consensus
+3.8.1. ns consensus
 
    The ns consensus flavor is equivalent to the unflavored consensus
    except for its first line which states its consensus flavor name:
@@ -2330,7 +2330,7 @@
 
         [At start, exactly once.]
 
-3.7.2. Microdescriptor consensus
+3.8.2. Microdescriptor consensus
 
    The microdescriptor consensus is a consensus flavor that contains
    microdescriptor hashes instead of descriptor hashes and that omits
@@ -2386,7 +2386,7 @@
    Additionally, a microdescriptor consensus MAY use the sha256 digest
    algorithm for its signatures.
 
-3.8. Detached signatures
+3.9. Detached signatures
 
    Assuming full connectivity, every authority should compute and sign the
    same consensus including any flavors in each period.  Therefore, it



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits