[tor-commits] [torspec/master] Distribute what's left over from 4.1 to 3.*.

[nickm at torproject.org]

commit 9c555dd4ed36ffa0862fe5ef15909cea59fbfae2
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Tue Jan 14 13:54:28 2014 +0100

    Distribute what's left over from 4.1 to 3.*.
    
    Section 4.1 "Voting" describes much more than just the voting operation.
    Move these operation fragments to the subsections they belong in.
---
 dir-spec.txt |   57 ++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 32 insertions(+), 25 deletions(-)

diff --git a/dir-spec.txt b/dir-spec.txt
index 11392b6..144af92 100644
--- a/dir-spec.txt
+++ b/dir-spec.txt
@@ -1946,8 +1946,13 @@
 
 3.8. Computing a consensus from a set of votes
 
-   Given a set of votes, authorities compute the contents of the consensus
-   document as follows:
+   Given a set of votes, authorities compute the contents of the consensus.
+
+   The consensus status, along with as many signatures as the server
+   currently knows (see section 3.10 below), should be available at
+      http://<hostname>/tor/status-vote/next/consensus.z
+
+   The contents of the consensus document are as follows:
 
      The "valid-after", "valid-until", and "fresh-until" times are taken as
      the median of the respective values from all the votes.
@@ -2395,6 +2400,17 @@
 
 3.10. Exchanging detached signatures
 
+   Once an authority has computed and signed a consensus network status, it
+   should send its detached signature to each other authority in an HTTP POST
+   request to the URL:
+      http://<hostname>/tor/post/consensus-signature
+
+   [XXX Note why we support push-and-then-pull.]
+
+   All of the detached signatures it knows for consensus status should be
+   available at:
+      http://<hostname>/tor/status-vote/next/consensus-signatures.z
+
    Assuming full connectivity, every authority should compute and sign the
    same consensus including any flavors in each period.  Therefore, it
    isn't necessary to download the consensus or any flavors of it computed
@@ -2454,19 +2470,7 @@
         [As in the consensus; the signature object is the same as in the
         consensus document.]
 
-4. Directory server operation
-
-   All directory authorities and directory caches ("directory servers")
-   implement this section, except as noted.
-
-4.1. Voting (authorities only)
-
-   The consensus status, along with as many signatures as the server
-   currently knows, should be available at
-      http://<hostname>/tor/status-vote/next/consensus.z
-   All of the detached signatures it knows for consensus status should be
-   available at:
-      http://<hostname>/tor/status-vote/next/consensus-signatures.z
+3.11. Publishing the signed consensus
 
    Once there are enough signatures, or once the voting period starts,
    these documents are available at
@@ -2475,6 +2479,12 @@
       http://<hostname>/tor/status-vote/current/consensus-signatures.z
    [XXX current/consensus-signatures is not currently implemented, as it
     is not used in the voting protocol.]
+   [XXX It's actually false that the first document is available as soon
+    as there are enough signatures. It's only available as soon as the
+    voting period starts. -KL]
+
+   [XXX possible future features include support for downloading old
+    consensuses.]
 
    The other vote documents are analogously made available under
      http://<hostname>/tor/status-vote/current/authority.z
@@ -2482,21 +2492,18 @@
      http://<hostname>/tor/status-vote/current/d/<d>.z
    once the consensus is complete.
 
-   Once an authority has computed and signed a consensus network status, it
-   should send its detached signature to each other authority in an HTTP POST
-   request to the URL:
-      http://<hostname>/tor/post/consensus-signature
-
-   [XXX Note why we support push-and-then-pull.]
-
-   [XXX possible future features include support for downloading old
-    consensuses.]
-
    The authorities serve another consensus of each flavor "F" from the
    locations
       /tor/status-vote/(current|next)/consensus-F.z. and
       /tor/status-vote/(current|next)/consensus-F/<FP1>+....z.
 
+4. Directory server operation
+
+   All directory authorities and directory caches ("directory servers")
+   implement this section, except as noted.
+
+4.1. Voting (authorities only)
+
 4.2. Downloading consensus status documents (caches only)
 
    All directory servers (authorities and caches) try to keep a recent