[tor-commits] [torspec/master] Merge remote-tracking branch 'tor-github/pr/43'

[nickm at torproject.org]

commit bab8a89223eebd28445aa3c4c9e41370b891b8c2
Merge: 4421149 2decb3e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 26 16:50:47 2018 -0500

    Merge remote-tracking branch 'tor-github/pr/43'

 dir-spec.txt | 18 ------------------
 1 file changed, 18 deletions(-)

diff --cc dir-spec.txt
index 3058180,7312dd2..a6547ce
--- a/dir-spec.txt
+++ b/dir-spec.txt
@@@ -2105,44 -2105,8 +2105,26 @@@
          If an authority is configured with a V3BandwidthsFile, but parsing
          fails, this line SHOULD appear in its vote, but without any headers.
  
-         Current Keywords:
-         "timestamp" -- the Unix Epoch time in seconds of the most recent
-         generator result.
-         "version" -- the Bandwidth List format document specification version.
-         "software" -- the name of the software that created the document.
-         "software_version" -- the version of the software that created the
-         document.
-         "file_created" -- the date and time timestamp in ISO 8601 format
-         and UTC time zone when the file was created.
-         "generator_started" -- the date and time timestamp in ISO 8601 format
-         and UTC time zone when the generator started.
-         "earliest_bandwidth" -- the date and time timestamp in ISO 8601 format
-         and UTC time zone when the first relay bandwidth was obtained.
-         "latest_bandwidth" -- the date and time timestamp in ISO 8601 format
-         and UTC time zone of the most recent generator result.
-         This time MUST be identical to the initial Timestamp line.
-         This duplicate value is included to make the format easier for people
-         to read.
          First-appeared: Tor 0.3.5.1-alpha.
  
 +    "bandwidth-file-digest" 1*(SP algorithm "=" digest) NL
 +
 +        [At most once for votes; does not occur in consensuses.]
 +
 +        A digest of the bandwidth file used to generate this vote.
 +        "algorithm" is the name of the hash algorithm producing "digest",
 +        which can be "sha256" or another algorithm.  "digest" is the
 +        base64 encoding of the hash of the bandwidth file, with trailing =s
 +        omitted.
 +
 +        If an authority is not configured with a V3BandwidthsFile, this line
 +        SHOULD NOT appear in its vote.
 +
 +        If an authority is configured with a V3BandwidthsFile, but parsing
 +        fails, this line SHOULD appear in its vote, with the digest(s) of the
 +        unparseable file.
 +        First-appeared: Tor 0.4.0.1-alpha
 +
     The authority section of a vote contains the following items, followed
     in turn by the authority's current key certificate: