commit 57efa12578944a1afb535e2c28374257c40f5c23 Author: Sebastian Hahn sebastian@torproject.org Date: Sat Nov 26 03:57:54 2011 +0100

Trivial whitespace cleanup --- control-spec.txt | 4 ++-- dir-spec-v2.txt | 5 +++-- dir-spec.txt | 14 +++++++------- gettor-spec.txt | 53 +++++++++++++++++++++++++++-------------------------- path-spec.txt | 7 ++++--- 5 files changed, 43 insertions(+), 40 deletions(-)

diff --git a/control-spec.txt b/control-spec.txt index 01dc4d5..88be91e 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -541,7 +541,7 @@ 0.2.2.1-alpha and later by default, each line is of the form: LongName SP ORStatus CRLF

- In Tor versions 0.1.2.2-alpha through 0.2.2.1-alpha with feature + In Tor versions 0.1.2.2-alpha through 0.2.2.1-alpha with feature VERBOSE_NAMES turned off and before version 0.1.2.2-alpha, each line is of the form: ServerID SP ORStatus CRLF @@ -552,7 +552,7 @@ 0.2.2.1-alpha and later by default, each line is of the form: LongName SP Status [SP ISOTime] CRLF

- In Tor versions 0.1.2.2-alpha through 0.2.2.1-alpha with feature + In Tor versions 0.1.2.2-alpha through 0.2.2.1-alpha with feature VERBOSE_NAMES turned off and before version 0.1.2.2-alpha, each line is of the form: ServerID2 SP Status [SP ISOTime] CRLF diff --git a/dir-spec-v2.txt b/dir-spec-v2.txt index d1be27f..7b06b02 100644 --- a/dir-spec-v2.txt +++ b/dir-spec-v2.txt @@ -155,7 +155,7 @@ Every router descriptor MUST start with a "router" Item; MUST end with a "router-signature" Item and an extra NL; and MUST contain exactly one instance of each of the following Items: "published" "onion-key" - "signing-key" "bandwidth". + "signing-key" "bandwidth".

A router descriptor MAY have zero or one of each of the following Items, but MUST NOT have more than one: "contact", "uptime", "fingerprint", @@ -892,5 +892,6 @@

7.2. HTTP status codes

- XXX We should write down what return codes dirservers send in what situations. + XXX We should write down what return codes dirservers send in what + situations.

diff --git a/dir-spec.txt b/dir-spec.txt index b4db02e..539581b 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -1342,12 +1342,12 @@

An estimate of the bandwidth of this relay, in an arbitrary unit (currently kilobytes per second). Used to weight router - selection. + selection.

- Additionally, the Measured= keyword is present in votes by + Additionally, the Measured= keyword is present in votes by participating bandwidth measurement authorities to indicate - a measured bandwidth currently produced by measuring stream - capacities. + a measured bandwidth currently produced by measuring stream + capacities.

Other weighting keywords may be added later. Clients MUST ignore keywords they do not recognize. @@ -1632,9 +1632,9 @@ one, breaking ties in favor of the lexicographically larger vote.) The port list is encoded as specified in 3.4.2.

- * If consensus-method 6 or later is in use and if 3 or more - authorities provide a Measured= keyword in their votes for - a router, the authorities produce a consensus containing a + * If consensus-method 6 or later is in use and if 3 or more + authorities provide a Measured= keyword in their votes for + a router, the authorities produce a consensus containing a Bandwidth= keyword equal to the median of the Measured= votes.

* If consensus-method 7 or later is in use, the params line is diff --git a/gettor-spec.txt b/gettor-spec.txt index 0a30efc..dd26b3d 100644 --- a/gettor-spec.txt +++ b/gettor-spec.txt @@ -8,27 +8,27 @@

1. Overview

- GetTor was created to resolve direct and indirect censorship of Tor's software. - In many countries and networks Tor's main website is blocked and would be Tor - users are unable to download even the source code to the Tor program. Other - software hosted by the Tor Project is similarly censored. The filtering - of the possible download sites is sometimes easy to bypass by using our TLS enabled - website. In other cases the website and all of the mirrors are entirely - blocked; this is a situation where a user seems to actually need Tor to fetch - Tor. We discovered that it is feasible to use alternate transport methods such - as SMTP between a non-trusted third party or with IRC and XDCC. + GetTor was created to resolve direct and indirect censorship of Tor's + software. In many countries and networks Tor's main website is blocked and + would be Tor users are unable to download even the source code to the Tor + program. Other software hosted by the Tor Project is similarly censored. The + filtering of the possible download sites is sometimes easy to bypass by using + our TLS enabled website. In other cases the website and all of the mirrors are + entirely blocked; this is a situation where a user seems to actually need Tor + to fetch Tor. We discovered that it is feasible to use alternate transport + methods such as SMTP between a non-trusted third party or with IRC and XDCC.

2. Implementation

Any compliant GetTor implementation will implement at least a single transport - to meet the needs of a certain class of users. It should be i18n and l10n compliant - for all user facing interactions; users should be able to manually set their - language and this should serve as their preference for localization of any - software delivered. The implementation must be free software and it should be - freely available by request from the implementation that they interface with - to download any of the other software available from that GetTor instance. - Security and privacy considerations should be described on a per transport - basis. + to meet the needs of a certain class of users. It should be i18n and l10n + compliant for all user facing interactions; users should be able to manually + set their language and this should serve as their preference for localization + of any software delivered. The implementation must be free software and it + should be freely available by request from the implementation that they + interface with to download any of the other software available from that + GetTor instance. Security and privacy considerations should be described on a + per transport basis.

2.1 Reference implementation

@@ -36,16 +36,17 @@

3. SMTP transport

- The SMTP transport for GetTor should allow users to send any RFC822 compliant message - in any known human language; GetTor should respond in whatever language is - detected with supplementary translations in the same email. GetTor shall offer - a list of all available software in the body of the email - it should offer the - software as a list of packages and their subsequent descriptions. + The SMTP transport for GetTor should allow users to send any RFC822 compliant + message in any known human language; GetTor should respond in whatever + language is detected with supplementary translations in the same email. + GetTor shall offer a list of all available software in the body of the email - + it should offer the software as a list of packages and their subsequent + descriptions.

3.1 SMTP transport security considerations

- Any GetTor instance that offers SMTP as a transport should optionally implement - the checking of DKIM signatures to ensure that email is not forged. + Any GetTor instance that offers SMTP as a transport should optionally + implement the checking of DKIM signatures to ensure that email is not forged. Optionally GetTor should take an OpenPGP key from the user and encrypt the response with a blinded message.

@@ -63,8 +64,8 @@

4. Other transports

- At this time no other transports have been specified. IRC XDCC is a likely useful - system as is XMPP/Jabber with the newest OTR file sharing transport. + At this time no other transports have been specified. IRC XDCC is a likely + useful system as is XMPP/Jabber with the newest OTR file sharing transport.

5. Implementation suggestions

diff --git a/path-spec.txt b/path-spec.txt index 480772e..7d19889 100644 --- a/path-spec.txt +++ b/path-spec.txt @@ -348,7 +348,8 @@ of their choices. frequently occurring 50ms histogram bin, until the point where 1000 circuits are recorded. After this point, the weighted average of the top 'cbtnummodes' (default: 3) midpoint modes is used as Xm. All times below - this value are counted as having the midpoint value of this weighted average bin. + this value are counted as having the midpoint value of this weighted average + bin.

The timeout itself is calculated by using the Pareto Quantile function (the inverted CDF) to give us the value on the CDF such that 80% of the mass @@ -471,8 +472,8 @@ of their choices. Min: Value of cbtquantile parameter Max: 99 Effect: This is the position on the quantile curve to use to set the - timeout value to use to actually close circuits. It is a percent - (0-99). + timeout value to use to actually close circuits. It is a + percent (0-99).

cbttestfreq Default: 60