diff options
| -rw-r--r-- | dir-spec.txt | 63 | ||||
| -rw-r--r-- | proposals/000-index.txt | 4 | ||||
| -rw-r--r-- | proposals/318-limit-protovers.md | 3 | ||||
| -rw-r--r-- | proposals/326-tor-relay-well-known-uri-rfc8615.md | 7 | ||||
| -rw-r--r-- | proposals/BY_INDEX.md | 2 | ||||
| -rw-r--r-- | proposals/README.md | 2 | ||||
| -rw-r--r-- | rend-spec-v3.txt | 2 |
7 files changed, 72 insertions, 11 deletions
diff --git a/dir-spec.txt b/dir-spec.txt index 68a1319..a29d86a 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -855,7 +855,7 @@ sorted by keyword. Values should be numerically ascending within each entry. (This implies that there should be no overlapping ranges.) Ranges should be represented as compactly as possible. Ints must be no - more than 2^32 - 2. (Yes, 2.) + larger than 63. This field was first added in Tor 0.2.9.x. @@ -3466,6 +3466,10 @@ FPRLIST is +-separated list of recognized authority identity fingerprints as in appendix B. +4.6 Retrying failed downloads + + See section 5.5 below; it applies to caches as well as clients. + 5. Client operation Every Tor that is not a directory server (that is, those that do @@ -3676,6 +3680,63 @@ (This section is removed; authorities no longer assign the 'Named' flag.) +5.5. Retrying failed downloads + + This section applies to caches as well as to clients. + + When a client fails to download a resource (a consensus, a router + descriptor, a microdescriptor, etc) it waits for a certain amount of + time before retrying the download. To determine the amount of time + to wait, clients use a randomized exponential backoff algorithm. + (Specifically, they use a variation of the "decorrelated jitter" + algorithm from + https://aws.amazon.com/blogs/architecture/exponential-backoff-and-jitter/ .) + + The specific formula used to compute the 'i+1'th delay is: + + Delay_{i+1} = MIN(cap, random_between(lower_bound, upper_bound))) + where upper_bound = MAX(lower_bound+1, Delay_i * 3) + lower_bound = MAX(1, base_delay). + + The value of 'cap' is set to INT_MAX; the value of 'base_delay' + depends on what is being downloaded, whether the client is fully + bootstrapped, how the client is configured, and where it is + downloading from. Current base_delay values are: + + Consensus objects, as a non-bridge cache: + 0 (TestingServerConsensusDownloadInitialDelay) + + Consensus objects, as a client or bridge that has bootstrapped: + 0 (TestingClientConsensusDownloadInitialDelay) + + Consensus objects, as a client or bridge that is bootstrapping, + when connecting to an authority because no "fallback" caches are + known: + 0 (ClientBootstrapConsensusAuthorityOnlyDownloadInitialDelay) + + Consensus objects, as a client or bridge that is bootstrapping, + when "fallback" caches are known but connecting to an authority + anyway: + 6 (ClientBootstrapConsensusAuthorityDownloadInitialDelay) + + Consensus objects, as a client or bridge that is bootstrapping, + when downloading from a "fallback" cache. + 0 (ClientBootstrapConsensusFallbackDownloadInitialDelay) + + Bridge descriptors, as a bridge-using client when at least one bridge + is usable: + 10800 (TestingBridgeDownloadInitialDelay) + + Bridge descriptors, otherwise: + 0 (TestingBridgeBootstrapDownloadInitialDelay) + + Other objects, as cache or authority: + 0 (TestingServerDownloadInitialDelay) + + Other objects, as client: + 0 (TestingClientDownloadInitialDelay) + + 6. Standards compliance All clients and servers MUST support HTTP 1.0. Clients and servers MAY diff --git a/proposals/000-index.txt b/proposals/000-index.txt index b6658ff..f6ff770 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -238,7 +238,7 @@ Proposals by number: 315 Updating the list of fields required in directory documents [OPEN] 316 FlashFlow: A Secure Speed Test for Tor (Parent Proposal) [DRAFT] 317 Improve security aspects of DNS name resolution [NEEDS-REVISION] -318 Limit protover values to 0-63 [ACCEPTED] +318 Limit protover values to 0-63 [CLOSED] 319 RELAY_FRAGMENT cells [OPEN] 320 Removing TAP usage from v2 onion services [REJECTED] 321 Better performance and usability for the MyFamily option (v2) [OPEN] @@ -295,7 +295,6 @@ Proposals by status: 311 Tor Relay IPv6 Reachability 312 Tor Relay Automatic IPv6 Address Discovery 313 Tor Relay IPv6 Statistics - 318 Limit protover values to 0-63 META: 000 Index of Tor Proposals 001 The Tor Proposal Process @@ -405,6 +404,7 @@ Proposals by status: 302 Hiding onion service clients using padding [in 0.4.1.1-alpha] 304 Extending SOCKS5 Onion Service Error Codes 305 ESTABLISH_INTRO Cell DoS Defense Extension + 318 Limit protover values to 0-63 [in 0.4.5.1-alpha] SUPERSEDED: 112 Bring Back Pathlen Coin Weight 113 Simplifying directory authority administration diff --git a/proposals/318-limit-protovers.md b/proposals/318-limit-protovers.md index d96a2c7..17e12b2 100644 --- a/proposals/318-limit-protovers.md +++ b/proposals/318-limit-protovers.md @@ -3,7 +3,8 @@ Filename: 318-limit-protovers.md Title: Limit protover values to 0-63. Author: Nick Mathewson Created: 11 May 2020 -Status: Accepted +Status: Closed +Implemented-In: 0.4.5.1-alpha ``` # Limit protover values to 0-63. diff --git a/proposals/326-tor-relay-well-known-uri-rfc8615.md b/proposals/326-tor-relay-well-known-uri-rfc8615.md index cd7f074..a741e1c 100644 --- a/proposals/326-tor-relay-well-known-uri-rfc8615.md +++ b/proposals/326-tor-relay-well-known-uri-rfc8615.md @@ -10,8 +10,7 @@ Status: Open This is a specification for a well-known [registry](https://www.iana.org/assignments/well-known-uris/) entry according to [RFC8615](https://tools.ietf.org/html/rfc8615). -This resource identifier is used for the the verification of [Tor](https://www.torproject.org/) relay contact information -(more specifically the [operatorurl](https://nusenu.github.io/ContactInfo-Information-Sharing-Specification/#operatorurl)). +This resource identifier can be used for serving and finding proofs related to [Tor](https://www.torproject.org/) relay contact information. It can also be used for autodiscovery of Tor relays run by a given entity, if the entity domain is known. It solves the issue that Tor relay contact information is an unidirectional and unverified claim by nature. This well-known URI aims to allow the verification of the unidirectional claim. @@ -23,7 +22,7 @@ organization by pointing to its website: Tor relay contact information field -> * The "tor-relay" URI allows for the verification of that claim by fetching the files containing Tor relay ID(s) under the specified URI, because attackers can not easily place these files at the given location. -* By publishing Tor relay IDs under this URI the website operator claims to operate these relays. +* By publishing Tor relay IDs under this URI the website operator claims to be the responsible entity for these Tor relays. The verification of listed Tor relay IDs only succeeds if the claim can be verified bidirectionally (website -> relay and relay -> website). * This URI is not related to Tor bridges or Tor onion services. @@ -62,7 +61,7 @@ Tor Project Development Mailing List <tor-dev@lists.torproject.org> * [https://gitweb.torproject.org/torspec.git/tree/tor-spec.txt](https://gitweb.torproject.org/torspec.git/tree/tor-spec.txt) * [https://gitweb.torproject.org/torspec.git/tree/cert-spec.txt](https://gitweb.torproject.org/torspec.git/tree/cert-spec.txt) -* [https://nusenu.github.io/ContactInfo-Information-Sharing-Specification/#operatorurl](https://nusenu.github.io/ContactInfo-Information-Sharing-Specification/#operatorurl) +* [https://nusenu.github.io/ContactInfo-Information-Sharing-Specification](https://nusenu.github.io/ContactInfo-Information-Sharing-Specification) * [RFC8615](https://tools.ietf.org/html/rfc8615) diff --git a/proposals/BY_INDEX.md b/proposals/BY_INDEX.md index 7c604fa..90a151d 100644 --- a/proposals/BY_INDEX.md +++ b/proposals/BY_INDEX.md @@ -235,7 +235,7 @@ Below are a list of proposals sorted by their proposal number. See * [`315-update-dir-required-fields.txt`](/proposals/315-update-dir-required-fields.txt): Updating the list of fields required in directory documents [OPEN] * [`316-flashflow.md`](/proposals/316-flashflow.md): FlashFlow: A Secure Speed Test for Tor (Parent Proposal) [DRAFT] * [`317-secure-dns-name-resolution.txt`](/proposals/317-secure-dns-name-resolution.txt): Improve security aspects of DNS name resolution [NEEDS-REVISION] -* [`318-limit-protovers.md`](/proposals/318-limit-protovers.md): Limit protover values to 0-63 [ACCEPTED] +* [`318-limit-protovers.md`](/proposals/318-limit-protovers.md): Limit protover values to 0-63 [CLOSED] * [`319-wide-everything.md`](/proposals/319-wide-everything.md): RELAY_FRAGMENT cells [OPEN] * [`320-tap-out-again.md`](/proposals/320-tap-out-again.md): Removing TAP usage from v2 onion services [REJECTED] * [`321-happy-families.md`](/proposals/321-happy-families.md): Better performance and usability for the MyFamily option (v2) [OPEN] diff --git a/proposals/README.md b/proposals/README.md index 6d302ec..904009e 100644 --- a/proposals/README.md +++ b/proposals/README.md @@ -55,7 +55,6 @@ implementation. * [`311-relay-ipv6-reachability.txt`](/proposals/311-relay-ipv6-reachability.txt): Tor Relay IPv6 Reachability * [`312-relay-auto-ipv6-addr.txt`](/proposals/312-relay-auto-ipv6-addr.txt): Tor Relay Automatic IPv6 Address Discovery * [`313-relay-ipv6-stats.txt`](/proposals/313-relay-ipv6-stats.txt): Tor Relay IPv6 Statistics -* [`318-limit-protovers.md`](/proposals/318-limit-protovers.md): Limit protover values to 0-63 ## FINISHED proposals: implemented, specs not merged @@ -233,6 +232,7 @@ necessary. * [`302-padding-machines-for-onion-clients.txt`](/proposals/302-padding-machines-for-onion-clients.txt): Hiding onion service clients using padding * [`304-socks5-extending-hs-error-codes.txt`](/proposals/304-socks5-extending-hs-error-codes.txt): Extending SOCKS5 Onion Service Error Codes * [`305-establish-intro-dos-defense-extention.txt`](/proposals/305-establish-intro-dos-defense-extention.txt): ESTABLISH_INTRO Cell DoS Defense Extension +* [`318-limit-protovers.md`](/proposals/318-limit-protovers.md): Limit protover values to 0-63 ## RESERVE proposals: saving for later diff --git a/rend-spec-v3.txt b/rend-spec-v3.txt index 8059017..83c3bdc 100644 --- a/rend-spec-v3.txt +++ b/rend-spec-v3.txt @@ -802,7 +802,7 @@ Table of contents: using the current consensus "valid-after" as specified in section [TIME-PERIODS]. - Then, for each node listed in the current consensus with the HSDirV3 flag, + Then, for each node listed in the current consensus with the HSDir flag, we compute a directory index for that node as: hsdir_index(node) = H("node-idx" | node_identity | |