commit e2aafe87c793bd06d432701d207d70c7744ef6e2 Author: Linus Nordberg linus@torproject.org Date: Tue Aug 28 16:51:47 2012 +0200

Specify consensus method 14 adding "a" lines. --- dir-spec.txt | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/dir-spec.txt b/dir-spec.txt index 36b4328..65163bc 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -1076,6 +1076,12 @@

The "onion-key" element as specified in 2.1.

+ "a" SP address ":" portlist NL + + [Any number] + + The "or-address" element as specified in 2.1. + "family" names NL

[At most once] @@ -1354,6 +1360,18 @@ ORPort is its current OR port, "DirPort" is its current directory port, or "0" for "none".

+ "a" SP address ":" portlist NL + + [Any number.] + + Present only if the OR has at least one IPv6 address. + + Address and portlist are as for "or-address" as specified in + 2.1. + + (Only included when the vote or consensus is generated with + consensus-method 13 or later.) + "s" SP Flags NL

[Exactly once.] @@ -1736,6 +1754,10 @@ * If consensus method 13 or later is used, microdesc consensuses omit any router for which no microdesc was agreed upon.

+ * If consensus method 14 or later is used, votes and + consensuses may include "a" lines listing additional OR + ports. + The signatures at the end of a consensus document are sorted in ascending order by identity digest.

@@ -1764,6 +1786,7 @@ "11" -- Don't consider BadExits when calculating bandwidth weights "12" -- Params are only included if enough auths voted for them "13" -- Omit router entries with missing microdescriptors. + "14" -- Adds support for "a" lines.

Before generating a consensus, an authority must decide which consensus