commit ab6453476066fd1bf5c8cb577863c0cdd5079e0f Author: Nick Mathewson nickm@torproject.org Date: Fri Feb 27 11:40:47 2015 -0500

merge prop227 into dir-spec --- dir-spec.txt | 33 ++++++++++++++++++++++++ proposals/000-index.txt | 4 +-- proposals/227-vote-on-package-fingerprints.txt | 3 ++- 3 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/dir-spec.txt b/dir-spec.txt index 85492e9..b844c30 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -1425,6 +1425,30 @@ version-spec.txt. If absent, no opinion is held about server versions.

+ "package" SP PackageName SP Version SP URL SP DIGESTS NL + + [Any number of times.] + + For this element: + + PACKAGENAME = NONSPACE + VERSION = NONSPACE + URL = NONSPACE + DIGESTS = DIGEST | DIGESTS SP DIGEST + DIGEST = DIGESTTYPE "=" DIGESTVAL + NONSPACE = one or more non-space printing characters + DIGESTVAL = DIGESTTYPE = one or more non-=, non-" " characters. + + Indicates that a package called "package" of version VERSION may be + found at URL, and its digest as computed with DIGESTTYPE is equal to + DIGESTVAL. In consensuses, these lines are sorted lexically by + "PACKAGENAME VERSION" pairs, and DIGESTTYPES must appear in ascending + order. A consensus must not contain the same "PACKAGENAME VERSION" + more than once. If a vote contains the same "PACKAGENAME VERSION" + more than once, all but the last is ignored. + + Included in consensuses only for method 19 and later. + "known-flags" SP FlagList NL

[Exactly once.] @@ -2050,6 +2074,13 @@ by more than half of the voting authorities that included a client-versions or server-versions lines in their votes.

+ With consensus method 19 or later, a package line is generated for a + given PACKAGENAME/VERSION pair if at least three authorities list such a + package in their votes. (Call these lines the "input" lines for + PACKAGENAME.) The consensus will contain every "package" line that is + listed verbatim by more than half of the authorities listing a line for + the PACKAGENAME/VERSION pair, and no others. + The authority item groups (dir-source, contact, fingerprint, vote-digest) are taken from the votes of the voting authorities. These groups are sorted by the digests of the @@ -2179,6 +2210,8 @@ "16" -- Adds ntor keys to microdescriptors "17" -- Adds "Unmeasured=1" flags to "w" lines "18" -- Adds 'id' to microdescriptors. + "19" -- Adds "package" lines to consensuses + "20" -- Adds GuardFraction information to microdescriptors.

Before generating a consensus, an authority must decide which consensus method to use. To do this, it looks for the highest version number diff --git a/proposals/000-index.txt b/proposals/000-index.txt index 63317e1..81d52af 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -147,7 +147,7 @@ Proposals by number: 224 Next-Generation Hidden Services in Tor [DRAFT] 225 Strawman proposal: commit-and-reveal shared rng [DRAFT] 226 "Scalability and Stability Improvements to BridgeDB: Switching to a Distributed Database System and RDBMS" [OPEN] -227 Include package fingerprints in consensus documents [FINISHED] +227 Include package fingerprints in consensus documents [CLOSED] 228 Cross-certifying identity keys with onion keys [OPEN] 229 Further SOCKS5 extensions [DRAFT] 230 How to change RSA1024 relay identity keys [DRAFT] @@ -240,7 +240,6 @@ Proposals by status: 162 Publish the consensus in multiple flavors [in 0.2.3.1-alpha] 204 Subdomain support for Hidden Service addresses 217 Tor Extended ORPort Authentication [for 0.2.5.x] - 227 Include package fingerprints in consensus documents 232 Pluggable Transport through SOCKS proxy [in 0.2.6] 235 Stop assigning (and eventually supporting) the Named flag [in 0.2.6, 0.2.7] CLOSED: @@ -299,6 +298,7 @@ Proposals by status: 218 Controller events to better understand connection/circuit usage [in 0.2.5.2-alpha] 221 Stop using CREATE_FAST [for 0.2.5.x] 222 Stop sending client timestamps [in 0.2.4.18] + 227 Include package fingerprints in consensus documents [in 0.2.6.3-alpha] SUPERSEDED: 112 Bring Back Pathlen Coin Weight 113 Simplifying directory authority administration diff --git a/proposals/227-vote-on-package-fingerprints.txt b/proposals/227-vote-on-package-fingerprints.txt index d1f9bf7..8839941 100644 --- a/proposals/227-vote-on-package-fingerprints.txt +++ b/proposals/227-vote-on-package-fingerprints.txt @@ -2,7 +2,8 @@ Filename: 227-vote-on-package-fingerprints.txt Title: Include package fingerprints in consensus documents Author: Nick Mathewson, Mike Perry Created: 2014-02-14 -Status: Finished +Status: Closed +Implemented-In: 0.2.6.3-alpha

0. Abstract