- tor-commits - lists.torproject.org

[ooni-probe/master] Add 2-clause BSD simplified license.
by art＠torproject.org 10 May '12

10 May '12

commit 341af8ebb6c2b0e2628b20ee4be1e80cfb133031 Author: Arturo Filastò <hellais(a)torproject.org> Date: Thu May 10 18:02:19 2012 +0200 Add 2-clause BSD simplified license. --- LICENSE | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f1a9745 --- /dev/null +++ b/LICENSE @@ -0,0 +1,26 @@ +Copyright (c) 2012, Jacob Appelbaum, Arturo Filastò +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +The views and conclusions contained in the software and documentation are those +of the authors and should not be interpreted as representing official policies, +either expressed or implied, of the FreeBSD Project.

1 0

[tor/master] Add missing CRLFs to AUTHCHALLENGE failure replies
by nickm＠torproject.org 10 May '12

10 May '12

commit f6617473700eb4b4ab30255e7176d774c38931cd Author: Ravi Chandra Padmala <neenaoffline(a)gmail.com> Date: Fri May 4 02:34:26 2012 +0530 Add missing CRLFs to AUTHCHALLENGE failure replies Fix #5760 --- src/or/control.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index ddfc80e..5ffe63b 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2839,13 +2839,13 @@ handle_control_authchallenge(control_connection_t *conn, uint32_t len, cp += strlen("SAFECOOKIE"); } else { connection_write_str_to_buf("513 AUTHCHALLENGE only supports SAFECOOKIE " - "authentication", conn); + "authentication\r\n", conn); connection_mark_for_close(TO_CONN(conn)); return -1; } if (!authentication_cookie_is_set) { - connection_write_str_to_buf("515 Cookie authentication is disabled", conn); + connection_write_str_to_buf("515 Cookie authentication is disabled\r\n", conn); connection_mark_for_close(TO_CONN(conn)); return -1; } @@ -2856,7 +2856,7 @@ handle_control_authchallenge(control_connection_t *conn, uint32_t len, decode_escaped_string(cp, len - (cp - body), &client_nonce, &client_nonce_len); if (newcp == NULL) { - connection_write_str_to_buf("513 Invalid quoted client nonce", + connection_write_str_to_buf("513 Invalid quoted client nonce\r\n", conn); connection_mark_for_close(TO_CONN(conn)); return -1; @@ -2870,7 +2870,7 @@ handle_control_authchallenge(control_connection_t *conn, uint32_t len, if (base16_decode(client_nonce, client_nonce_len, cp, client_nonce_encoded_len) < 0) { - connection_write_str_to_buf("513 Invalid base16 client nonce", + connection_write_str_to_buf("513 Invalid base16 client nonce\r\n", conn); connection_mark_for_close(TO_CONN(conn)); return -1; @@ -2882,7 +2882,7 @@ handle_control_authchallenge(control_connection_t *conn, uint32_t len, cp += strspn(cp, " \t\n\r"); if (*cp != '\0' || cp != body + len) { - connection_write_str_to_buf("513 Junk at end of AUTHCHALLENGE command", + connection_write_str_to_buf("513 Junk at end of AUTHCHALLENGE command\r\n", conn); connection_mark_for_close(TO_CONN(conn)); tor_free(client_nonce);

1 0

[tor/master] Add changes/bug5760
by nickm＠torproject.org 10 May '12

10 May '12

commit 5bbf04dc9727de393ab1c42440124d875c79c13e Author: Ravi Chandra Padmala <neenaoffline(a)gmail.com> Date: Thu May 10 12:53:16 2012 +0530 Add changes/bug5760 --- changes/bug5760 | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changes/bug5760 b/changes/bug5760 new file mode 100644 index 0000000..a26407b --- /dev/null +++ b/changes/bug5760 @@ -0,0 +1,3 @@ + o Major bugfixes: + - End AUTHCHALLENGE error response messages with a CRLF. Fixes bug 5760; + bugfix on 0.2.3.16-alpha, and backported to maint-0.2.2

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 10 May '12

10 May '12

commit 8c09923f20379619adc58765a795920435a96822 Merge: 98a30da 5bbf04d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 10 11:50:14 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug5760 | 3 +++ src/or/control.c | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --cc src/or/control.c index 397bb53,5ffe63b..ec0bb8a --- a/src/or/control.c +++ b/src/or/control.c @@@ -3017,10 -2870,9 +3017,10 @@@ handle_control_authchallenge(control_co if (base16_decode(client_nonce, client_nonce_len, cp, client_nonce_encoded_len) < 0) { - connection_write_str_to_buf("513 Invalid base16 client nonce", + connection_write_str_to_buf("513 Invalid base16 client nonce\r\n", conn); connection_mark_for_close(TO_CONN(conn)); + tor_free(client_nonce); return -1; }

1 0

[tor/maint-0.2.2] Add missing CRLFs to AUTHCHALLENGE failure replies
by nickm＠torproject.org 10 May '12

10 May '12

commit f6617473700eb4b4ab30255e7176d774c38931cd Author: Ravi Chandra Padmala <neenaoffline(a)gmail.com> Date: Fri May 4 02:34:26 2012 +0530 Add missing CRLFs to AUTHCHALLENGE failure replies Fix #5760 --- src/or/control.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index ddfc80e..5ffe63b 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2839,13 +2839,13 @@ handle_control_authchallenge(control_connection_t *conn, uint32_t len, cp += strlen("SAFECOOKIE"); } else { connection_write_str_to_buf("513 AUTHCHALLENGE only supports SAFECOOKIE " - "authentication", conn); + "authentication\r\n", conn); connection_mark_for_close(TO_CONN(conn)); return -1; } if (!authentication_cookie_is_set) { - connection_write_str_to_buf("515 Cookie authentication is disabled", conn); + connection_write_str_to_buf("515 Cookie authentication is disabled\r\n", conn); connection_mark_for_close(TO_CONN(conn)); return -1; } @@ -2856,7 +2856,7 @@ handle_control_authchallenge(control_connection_t *conn, uint32_t len, decode_escaped_string(cp, len - (cp - body), &client_nonce, &client_nonce_len); if (newcp == NULL) { - connection_write_str_to_buf("513 Invalid quoted client nonce", + connection_write_str_to_buf("513 Invalid quoted client nonce\r\n", conn); connection_mark_for_close(TO_CONN(conn)); return -1; @@ -2870,7 +2870,7 @@ handle_control_authchallenge(control_connection_t *conn, uint32_t len, if (base16_decode(client_nonce, client_nonce_len, cp, client_nonce_encoded_len) < 0) { - connection_write_str_to_buf("513 Invalid base16 client nonce", + connection_write_str_to_buf("513 Invalid base16 client nonce\r\n", conn); connection_mark_for_close(TO_CONN(conn)); return -1; @@ -2882,7 +2882,7 @@ handle_control_authchallenge(control_connection_t *conn, uint32_t len, cp += strspn(cp, " \t\n\r"); if (*cp != '\0' || cp != body + len) { - connection_write_str_to_buf("513 Junk at end of AUTHCHALLENGE command", + connection_write_str_to_buf("513 Junk at end of AUTHCHALLENGE command\r\n", conn); connection_mark_for_close(TO_CONN(conn)); tor_free(client_nonce);

1 0

[tor/maint-0.2.2] Add changes/bug5760
by nickm＠torproject.org 10 May '12

10 May '12

commit 5bbf04dc9727de393ab1c42440124d875c79c13e Author: Ravi Chandra Padmala <neenaoffline(a)gmail.com> Date: Thu May 10 12:53:16 2012 +0530 Add changes/bug5760 --- changes/bug5760 | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changes/bug5760 b/changes/bug5760 new file mode 100644 index 0000000..a26407b --- /dev/null +++ b/changes/bug5760 @@ -0,0 +1,3 @@ + o Major bugfixes: + - End AUTHCHALLENGE error response messages with a CRLF. Fixes bug 5760; + bugfix on 0.2.3.16-alpha, and backported to maint-0.2.2

1 0

[torspec/master] Add proposal 201: Make bridges report statistics on daily v3 network status requests
by nickm＠torproject.org 10 May '12

10 May '12

commit 25793f4b7b80063ff19a55c4fa8549bf24f0874a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 10 11:43:09 2012 -0400 Add proposal 201: Make bridges report statistics on daily v3 network status requests --- proposals/000-index.txt | 2 + proposals/201-bridge-v3-reqs-stats.txt | 38 ++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 0 deletions(-) diff --git a/proposals/000-index.txt b/proposals/000-index.txt index e35ce60..edab8f2 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -121,6 +121,7 @@ Proposals by number: 198 Restore semantics of TLS ClientHello [OPEN] 199 Integration of BridgeFinder and BridgeFinderHelper [OPEN] 200 Adding new, extensible CREATE, EXTEND, and related cells [OPEN] +201 Make bridges report statistics on daily v3 network status requests [OPEN] Proposals by status: @@ -161,6 +162,7 @@ Proposals by status: 198 Restore semantics of TLS ClientHello 199 Integration of BridgeFinder and BridgeFinderHelper [for 0.2.3.x+] 200 Adding new, extensible CREATE, EXTEND, and related cells + 201 Make bridges report statistics on daily v3 network status requests [for 0.2.4.x] ACCEPTED: 117 IPv6 exits [for 0.2.3.x] 140 Provide diffs between consensuses diff --git a/proposals/201-bridge-v3-reqs-stats.txt b/proposals/201-bridge-v3-reqs-stats.txt new file mode 100644 index 0000000..7ac6e56 --- /dev/null +++ b/proposals/201-bridge-v3-reqs-stats.txt @@ -0,0 +1,38 @@ +Filename: 201-bridge-v3-reqs-stats.txt +Title: Make bridges report statistics on daily v3 network status requests +Author: Karsten Loesing +Created: 10-May-2012 +Status: Open +Target: 0.2.4.x + +Overview: + + Our current approach [0] to estimate daily bridge users is based on + unique IP addresses reported by bridges, and it is very likely broken. + A bridge can connect to two or more bridges, so that unique IP address + sets overlap to an unknown extent. We should instead count requests for + v3 network statuses, sum them up for all bridges, and divide by the + average number of requests that a bridge client makes per day. This + approach is similar to how we estimate directly connecting users. This + proposal describes how bridges would report v3 network status requests + in their extra-info descriptors. + +Specification: + + Bridges include a new keyword line in their extra-info descriptors that + contains the number of v3 network status requests by country they saw + over a period of 24 hours. The reported numbers refer to the period + stated in the "bridge-stats-end" line. The new keyword line would go + after the "bridge-ips" line in dir-spec.txt: + + "bridge-v3-reqs" CC=N,CC=N,... NL + [At most once.] + + List of mappings from two-letter country codes to the number of + requests for v3 network statuses from that country as seen by the + bridge, rounded up to the nearest multiple of 8. Only those requests + are counted that the directory can answer with a 200 OK status code. + + +[0] https://metrics.torproject.org/papers/countingusers-2010-11-30.pdf +

1 0

[torspec/master] Merge remote-tracking branches 'linus/typos' and 'linus/dirspec'
by nickm＠torproject.org 10 May '12

10 May '12

commit 0239597186f5c7bb081fe9eb726b08f4716ef6d0 Merge: 1e90068 919ec4a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 10 11:40:56 2012 -0400 Merge remote-tracking branches 'linus/typos' and 'linus/dirspec' dir-spec.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[torspec/master] s/it's/its/1
by nickm＠torproject.org 10 May '12

10 May '12

commit f9067427f3fe2c403360ac11258c3ec28afa09d2 Author: Linus Nordberg <linus(a)nordberg.se> Date: Thu Mar 22 13:53:27 2012 +0100 s/it's/its/1 --- dir-spec.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index 315114f..be1ad0f 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -1309,7 +1309,7 @@ "Publication" is the publication time of its most recent descriptor, in the form YYYY-MM-DD HH:MM:SS, in GMT. "IP" is its current IP address; - ORPort is its current OR port, "DirPort" is it's current directory + ORPort is its current OR port, "DirPort" is its current directory port, or "0" for "none". "s" SP Flags NL

1 0

[torspec/master] A relay is running if it's been reached within the last 45 minutes, not 30.
by nickm＠torproject.org 10 May '12

10 May '12

commit 919ec4a3194b53dcc1e4a772377652c49639de46 Author: Linus Nordberg <linus(a)nordberg.se> Date: Thu May 10 16:39:31 2012 +0200 A relay is running if it's been reached within the last 45 minutes, not 30. This changed in May 2006, see f6ff3e6f. --- dir-spec.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index 315114f..b0e06ee 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -1491,7 +1491,7 @@ identity. "Running" -- A router is 'Running' if the authority managed to connect to - it successfully within the last 30 minutes. + it successfully within the last 45 minutes. "Stable" -- A router is 'Stable' if it is active, and either its Weighted MTBF is at least the median for known active routers or its Weighted MTBF

1 0