Merge remote-tracking branch 'teor/ticket21377-squashed'

1 files changed, 28 insertions, 7 deletions

diff --git a/dir-spec.txt b/dir-spec.txt
index f2447c2..f15da95 100644
--- a/dir-spec.txt
+++ b/dir-spec.txt
@@ -2607,6 +2607,28 @@
    IPv4 addresses (two /8 networks) were blocked.  The list is encoded
    as described in section 3.8.2.
 
+3.4.3 Serving bandwidth list files
+
+   If an authority has used a bandwidth list file to generate a vote
+   document it SHOULD make it available at
+
+     http://<hostname>/tor/status-vote/next/bandwidth.z
+
+   at the start of each voting period.
+
+   It MUST NOT attempt to send its bandwidth list file in a HTTP POST to
+   other authorities and it SHOULD NOT make bandwidth list files from other
+   authorities available.
+
+   If an authority makes this file available, it MUST be the bandwidth file
+   used to create the vote document available at
+
+     http://<hostname>/tor/status-vote/next/authority.z
+
+   The bandwidth list format is described in bandwidth-file-spec.txt.
+
+   The standard URLs for bandwidth list files first-appeared in Tor 0.3.5.
+
 3.5. Downloading missing certificates from other directory authorities
 
    XXX when to download certificates.
@@ -3329,16 +3351,14 @@
 
 3.11. Publishing the signed consensus
 
-   Once there are enough signatures, or once the voting period starts,
-   these documents are available at
+   The voting period ends at the valid-after time. If the consensus has
+   been signed by a majority of authorities, these documents are made
+   available at
       http://<hostname>/tor/status-vote/current/consensus.z
    and
       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.]
@@ -3347,13 +3367,15 @@
      http://<hostname>/tor/status-vote/current/authority.z
      http://<hostname>/tor/status-vote/current/<fp>.z
      http://<hostname>/tor/status-vote/current/d/<d>.z
-   once the consensus is complete.
+     http://<hostname>/tor/status-vote/current/bandwidth.z
+   once the voting period ends, regardless of the number of signatures.
 
    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.
 
+   The standard URLs for bandwidth list files first-appeared in Tor 0.3.5.
 
 4. Directory cache operation
 
@@ -4021,4 +4043,3 @@ E. Limited ed diff format
    just a period (".") ends the block (and is not part of the lines
    to add).  Note that it is impossible to insert a line with just
    a single dot.
-