diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-01-14 14:08:32 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-01-14 14:08:32 -0500 |
| commit | d8902c2e74845c5da5ab5066f57f22f8b209693a (patch) | |
| tree | ae8d31197aa268a783f0365f6c25c15276d00616 /dir-spec.txt | |
| parent | 81aeca7501f89e9889d592ef2217b265c41bf2df (diff) | |
| parent | d97f8d980be01bda3f6122fc6220406f4592a717 (diff) | |
| download | torspec-d8902c2e74845c5da5ab5066f57f22f8b209693a.tar.gz torspec-d8902c2e74845c5da5ab5066f57f22f8b209693a.zip | |
Merge remote-tracking branch 'tor-github/pr/45'
Diffstat (limited to 'dir-spec.txt')
| -rw-r--r-- | dir-spec.txt | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/dir-spec.txt b/dir-spec.txt index 685a62e..91d6052 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -2550,7 +2550,7 @@ A minority of voting authorities that set AuthDirHasIPv6Connectivity will drop unreachable IPv6 ORPorts from the full consensus. Consensus method 27 in 0.3.3.x puts IPv6 ORPorts in the microdesc consensus, so that - authorities can drop unreachable IPv6 ORPorts from all consensus flavours. + authorities can drop unreachable IPv6 ORPorts from all consensus flavors. Consensus method 28 removes IPv6 ORPorts from microdescriptors. "Stable" -- A router is 'Stable' if it is active, and either its Weighted @@ -3252,16 +3252,15 @@ "network-status-version" where version is 3 or higher, and the flavor is a string consisting of alphanumeric characters and dashes: - "network-status-version" SP version SP flavor NL + "network-status-version" SP version [SP flavor] NL 3.9.1. ns consensus - The ns consensus flavor is equivalent to the unflavored consensus - except for its first line which states its consensus flavor name: - - "network-status-version" SP version SP "ns" NL - - [At start, exactly once.] + The ns consensus flavor is equivalent to the unflavored consensus. + When the flavor is omitted from the "network-status-version" line, + it should be assumed to be "ns". Some implementations may explicitly + state that the flavor is "ns" when generating consensuses, but should + accept consensuses where the flavor is omitted. 3.9.2. Microdescriptor consensus |