September 2013 - tor-commits - lists.torproject.org

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 01 Sep '13

01 Sep '13

commit b3c08606f87ea23745a4a3f08aceda1bf76e084a Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 1 08:16:41 2013 +0000 Update translations for tor-launcher-network-settings --- ar/network-settings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ar/network-settings.dtd b/ar/network-settings.dtd index 446b88f..9acfe8f 100644 --- a/ar/network-settings.dtd +++ b/ar/network-settings.dtd @@ -43,8 +43,8 @@ <!ENTITY torsettings.firewall.checkbox "اتصال الإنترنت لهذا الكمبيوتر يمر بجدار حماية يسمح بالاتصال فقط من خلال منافذ معينة"> <!ENTITY torsettings.firewall.allowedPorts "المنافذ المسموح بها:"> <!ENTITY torsettings.useBridges.checkbox "مزود خدمة الإنترنت الخاص بي (ISP) يمنع الاتصالات بشبكة تور"> -<!ENTITY torsettings.useBridges.label ""> -<!ENTITY torsettings.useBridges.placeholder ""> +<!ENTITY torsettings.useBridges.label "ادخل جسر او اكثر (جسر واحد في كل سطر)."> +<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port"> <!ENTITY torsettings.copyLog "نسخ سجل تور إلي الحافظة"> <!ENTITY torsettings.bridgeHelpTitle "المساعدة الخاصة بالجسور المُرحلة">

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 01 Sep '13

01 Sep '13

commit 84aa5aebbd4cb436b8d8239b4e909f2305e70ad7 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 1 08:16:26 2013 +0000 Update translations for torbirdy --- ar/torbirdy.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ar/torbirdy.dtd b/ar/torbirdy.dtd index 52459f7..a1d890b 100644 --- a/ar/torbirdy.dtd +++ b/ar/torbirdy.dtd @@ -14,7 +14,7 @@ <!ENTITY torbirdy.prefs.cancel.button "إلغاء"> <!ENTITY torbirdy.prefs.extra1.button "استرجع الإعدادات الافتراضية"> <!ENTITY torbirdy.prefs.extra1.key "d"> -<!ENTITY torbirdy.prefs.extra2.button "فحص اعدادات البروكسي"> +<!ENTITY torbirdy.prefs.extra2.button "افحص اعدادات البروكسي"> <!ENTITY torbirdy.prefs.extra2.key "ا"> <!ENTITY torbirdy.prefs.proxy.label "إعدادات البروكسي"> <!ENTITY torbirdy.prefs.privacy.label "إعدادات الخصوصية"> @@ -45,7 +45,7 @@ <!ENTITY torbirdy.prefs.confirmemail.key "c"> <!ENTITY torbirdy.prefs.emailwizard.label "تمكين القائمة التلقائية لإعداد البريد الألكتروني الخاصة بثاندربيرد [الوضع الافتراضي: معطل]"> <!ENTITY torbirdy.prefs.emailwizard.key "ث"> -<!ENTITY torbirdy.prefs.automatic.label ""> +<!ENTITY torbirdy.prefs.automatic.label "تحقق من وجود رسائل جديدة تلقائيًا لكل الحسابات [الوضع الافتراضي: مُعطل]"> <!ENTITY torbirdy.prefs.automatic.key ""> <!ENTITY torbirdy.prefs.renegotiation.label "سماح الأتصال بالخوادم التي لا تدعم SSL/TLS مع إعادة التفاوض آمنة [الوضع الأفتراضي: لا تسمح]"> <!ENTITY torbirdy.prefs.renegotiation.key "ه">

1 0

[tor/release-0.2.4] fold in changes entries
by arma＠torproject.org 01 Sep '13

01 Sep '13

commit 20d4356c3d25e8b2ac23640e249d787f884a25ac Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Aug 31 20:30:28 2013 -0400 fold in changes entries --- ChangeLog | 28 ++++++++++++++++++++++++++++ changes/bug9366 | 4 ---- changes/bug9543 | 4 ---- changes/bug9546 | 11 ----------- changes/bug9564 | 5 ----- changes/doc-heartbeat-loglevel | 3 --- changes/geoip-august2013 | 3 --- 7 files changed, 28 insertions(+), 30 deletions(-) diff --git a/ChangeLog b/ChangeLog index d0e1f77..95ce519 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,31 @@ +Changes in version 0.2.4.17-rc - 2013-09-0x + o Major bugfixes: + - Bridges now send AUTH_CHALLENGE cells during their v3 handshakes; + previously they did not, which prevented them from receiving + successful connections from relays for self-test or bandwidth + testing. Fixes bug 9546; bugfix on 0.2.3.6-alpha. + - When a relay is extending a circuit to a bridge, it needs to send a + NETINFO cell, even when the bridge hasn't sent an AUTH_CHALLENGE + cell. Fixes bug 9546; bugfix on 0.2.3.6-alpha. + - If the time to download the next old-style networkstatus is in + the future, do not decline to consider whether to download the + next microdescriptor networkstatus. Fixes bug 9564; bugfix on + 0.2.3.14-alpha. + + o Minor fixes (config options): + - Avoid overflows when the user sets MaxCircuitDirtiness to a + ridiculously high value, by imposing a (ridiculously high) 30-day + maximum on MaxCircuitDirtiness. + - Fix the documentation of HeartbeatPeriod to say that the heartbeat + message is logged at notice, not at info. + - Warn and fail if a server is configured not to advertise any + ORPorts at all. (We need *something* to put in our descriptor, + or we just won't work.) + + o Minor features: + - Update to the August 7 2013 Maxmind GeoLite Country database. + + Changes in version 0.2.4.16-rc - 2013-08-10 Tor 0.2.4.16-rc is the second release candidate for the Tor 0.2.4.x series. It fixes several crash bugs in the 0.2.4 branch. diff --git a/changes/bug9366 b/changes/bug9366 deleted file mode 100644 index acc919e..0000000 --- a/changes/bug9366 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features (usability): - - Warn and fail if a server is configured not to advertise any - ORPorts at all. (We need *something* to put in our descriptor, or - we just won't work.) diff --git a/changes/bug9543 b/changes/bug9543 deleted file mode 100644 index 753947f..0000000 --- a/changes/bug9543 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes: - - Avoid overflows when the user sets MaxCircuitDirtiness to a - ridiculously high value, by imposing a (ridiculously high) 30-day - maximum on MaxCircuitDirtiness. diff --git a/changes/bug9546 b/changes/bug9546 deleted file mode 100644 index 2145e35..0000000 --- a/changes/bug9546 +++ /dev/null @@ -1,11 +0,0 @@ - o Major bugfixes: - - - When a relay is extending a circuit to a bridge, it needs to send a - NETINFO cell, even when the bridge hasn't sent an AUTH_CHALLENGE - cell. Fixes bug 9546; bugfix on 0.2.3.6-alpha. - - - Bridges send AUTH_CHALLENGE cells during their handshakes; previously - they did not, which prevented relays from successfully connecting - to a bridge for self-test or bandwidth testing. Fixes bug 9546; - bugfix on 0.2.3.6-alpha. - diff --git a/changes/bug9564 b/changes/bug9564 deleted file mode 100644 index 0df00e3..0000000 --- a/changes/bug9564 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - If the time to download the next old-style networkstatus is in - the future, do not decline to consider whether to download the - next microdescriptor networkstatus. Fixes bug 9564. Bugfix on - 0.2.3.14-alpha. diff --git a/changes/doc-heartbeat-loglevel b/changes/doc-heartbeat-loglevel deleted file mode 100644 index 91f40ad..0000000 --- a/changes/doc-heartbeat-loglevel +++ /dev/null @@ -1,3 +0,0 @@ - o Minor documentation fixes: - - Fix the documentation of HeartbeatPeriod to say that the heartbeat - message is logged at notice, not at info. diff --git a/changes/geoip-august2013 b/changes/geoip-august2013 deleted file mode 100644 index bd15177..0000000 --- a/changes/geoip-august2013 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features: - - Update to the August 7 2013 Maxmind GeoLite Country database. -

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
by arma＠torproject.org 01 Sep '13

01 Sep '13

commit 64410cc88888ff964a82613cc53475def98d9de7 Merge: 0b9c515 41bf8fa Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 12 09:44:36 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 changes/geoip-august2013 | 3 + src/config/geoip | 9207 +++++++++++++++++++++++----------------------- 2 files changed, 4521 insertions(+), 4689 deletions(-)

1 0

[tor/release-0.2.4] Document the correct loglevel for the heartbeat message
by arma＠torproject.org 01 Sep '13

01 Sep '13

commit edaea773e57cc39e892643bcce12c755810f508b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 16 21:58:50 2013 -0400 Document the correct loglevel for the heartbeat message --- changes/doc-heartbeat-loglevel | 3 +++ doc/tor.1.txt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/doc-heartbeat-loglevel b/changes/doc-heartbeat-loglevel new file mode 100644 index 0000000..91f40ad --- /dev/null +++ b/changes/doc-heartbeat-loglevel @@ -0,0 +1,3 @@ + o Minor documentation fixes: + - Fix the documentation of HeartbeatPeriod to say that the heartbeat + message is logged at notice, not at info. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 86e9afc..732a779 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1530,7 +1530,7 @@ is non-zero): **HeartbeatPeriod** __N__ **minutes**|**hours**|**days**|**weeks**:: Log a heartbeat message every **HeartbeatPeriod** seconds. This is - a log level __info__ message, designed to let you know your Tor + a log level __notice__ message, designed to let you know your Tor server is still alive and doing useful things. Settings this to 0 will disable the heartbeat. (Default: 6 hours)

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
by arma＠torproject.org 01 Sep '13

01 Sep '13

commit 3433b7ce3992b9566dba9b64f64f0676e712696a Merge: d5cfbf9 64410cc Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 12 09:45:07 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 changes/geoip-august2013 | 3 + src/config/geoip | 9207 +++++++++++++++++++++++----------------------- 2 files changed, 4521 insertions(+), 4689 deletions(-)

1 0

[tor/release-0.2.4] Make bridges send AUTH_CHALLENGE cells
by arma＠torproject.org 01 Sep '13

01 Sep '13

commit 940cef3367591fd1ee86971c202ef92aba931cb7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 21 10:10:35 2013 -0400 Make bridges send AUTH_CHALLENGE cells The spec requires them to do so, and not doing so creates a situation where they can't send-test because relays won't extend to them because of the other part of bug 9546. Fixes bug 9546; bugfix on 0.2.3.6-alpha. --- bug9546 | 5 ----- changes/bug9546 | 11 +++++++++++ src/or/command.c | 4 ++-- src/or/connection_or.c | 2 +- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/bug9546 b/bug9546 deleted file mode 100644 index 8596eac..0000000 --- a/bug9546 +++ /dev/null @@ -1,5 +0,0 @@ - o Major bugfixes: - - - When a relay is extending a circuit to a bridge, it needs to send a - NETINFO cell, even when the bridge hasn't sent an AUTH_CHALLENGE - cell. Fixes bug 9546; bugfix on ????. diff --git a/changes/bug9546 b/changes/bug9546 new file mode 100644 index 0000000..2145e35 --- /dev/null +++ b/changes/bug9546 @@ -0,0 +1,11 @@ + o Major bugfixes: + + - When a relay is extending a circuit to a bridge, it needs to send a + NETINFO cell, even when the bridge hasn't sent an AUTH_CHALLENGE + cell. Fixes bug 9546; bugfix on 0.2.3.6-alpha. + + - Bridges send AUTH_CHALLENGE cells during their handshakes; previously + they did not, which prevented relays from successfully connecting + to a bridge for self-test or bandwidth testing. Fixes bug 9546; + bugfix on 0.2.3.6-alpha. + diff --git a/src/or/command.c b/src/or/command.c index 26e4e68..61e1e13 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -755,8 +755,8 @@ command_process_versions_cell(var_cell_t *cell, or_connection_t *conn) const int send_versions = !started_here; /* If we want to authenticate, send a CERTS cell */ const int send_certs = !started_here || public_server_mode(get_options()); - /* If we're a relay that got a connection, ask for authentication. */ - const int send_chall = !started_here && public_server_mode(get_options()); + /* If we're a host that got a connection, ask for authentication. */ + const int send_chall = !started_here; /* If our certs cell will authenticate us, we can send a netinfo cell * right now. */ const int send_netinfo = !started_here; diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 56c6ed5..fbb7c31 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -2144,7 +2144,7 @@ connection_or_compute_authenticate_cell_body(or_connection_t *conn, const tor_cert_t *id_cert=NULL, *link_cert=NULL; const digests_t *my_digests, *their_digests; const uint8_t *my_id, *their_id, *client_id, *server_id; - if (tor_tls_get_my_certs(0, &link_cert, &id_cert)) + if (tor_tls_get_my_certs(server, &link_cert, &id_cert)) return -1; my_digests = tor_cert_get_id_digests(id_cert); their_digests = tor_cert_get_id_digests(conn->handshake_state->id_cert);

1 0

[tor/release-0.2.4] Send NETINFO on receiving a NETINFO if we have not yet sent one.
by arma＠torproject.org 01 Sep '13

01 Sep '13

commit 0daa26a4732234333e67d04c9b215ff6704fa9cd Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 20 14:52:56 2013 -0400 Send NETINFO on receiving a NETINFO if we have not yet sent one. (Backport to Tor 0.2.3) Relays previously, when initiating a connection, would only send a NETINFO after sending an AUTHENTICATE. But bridges, when receiving a connection, would never send AUTH_CHALLENGE. So relays wouldn't AUTHENTICATE, and wouldn't NETINFO, and then bridges would be surprised to be receiving CREATE cells on a non-open circuit. Fixes bug 9546. --- bug9546 | 5 +++++ src/or/command.c | 10 ++++++++++ src/or/connection_or.c | 7 +++++++ src/or/or.h | 3 +++ 4 files changed, 25 insertions(+) diff --git a/bug9546 b/bug9546 new file mode 100644 index 0000000..8596eac --- /dev/null +++ b/bug9546 @@ -0,0 +1,5 @@ + o Major bugfixes: + + - When a relay is extending a circuit to a bridge, it needs to send a + NETINFO cell, even when the bridge hasn't sent an AUTH_CHALLENGE + cell. Fixes bug 9546; bugfix on ????. diff --git a/src/or/command.c b/src/or/command.c index 8321e26..26e4e68 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -941,6 +941,16 @@ command_process_netinfo_cell(cell_t *cell, or_connection_t *conn) * trustworthy. */ (void)my_apparent_addr; + if (! conn->handshake_state->sent_netinfo) { + /* If we were prepared to authenticate, but we never got an AUTH_CHALLENGE + * cell, then we would not previously have sent a NETINFO cell. Do so + * now. */ + if (connection_or_send_netinfo(conn) < 0) { + connection_mark_for_close(TO_CONN(conn)); + return; + } + } + if (connection_or_set_state_open(conn)<0) { log_fn(LOG_PROTOCOL_WARN, LD_OR, "Got good NETINFO cell from %s:%d; but " "was unable to make the OR connection become open.", diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 5eecee0..56c6ed5 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1975,6 +1975,12 @@ connection_or_send_netinfo(or_connection_t *conn) tor_assert(conn->handshake_state); + if (conn->handshake_state->sent_netinfo) { + log_warn(LD_BUG, "Attempted to send an extra netinfo cell on a connection " + "where we already sent one."); + return 0; + } + memset(&cell, 0, sizeof(cell_t)); cell.command = CELL_NETINFO; @@ -2009,6 +2015,7 @@ connection_or_send_netinfo(or_connection_t *conn) } conn->handshake_state->digest_sent_data = 0; + conn->handshake_state->sent_netinfo = 1; connection_or_write_cell_to_buf(&cell, conn); return 0; diff --git a/src/or/or.h b/src/or/or.h index dd95c34..b8f334e 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1161,6 +1161,9 @@ typedef struct or_handshake_state_t { /* True iff we've received valid authentication to some identity. */ unsigned int authenticated : 1; + /* True iff we have sent a netinfo cell */ + unsigned int sent_netinfo : 1; + /** True iff we should feed outgoing cells into digest_sent and * digest_received respectively. *

1 0

[tor/release-0.2.4] Send NETINFO on receiving a NETINFO if we have not yet sent one.
by arma＠torproject.org 01 Sep '13

01 Sep '13

commit 1bb4a4f9bdf24706a459e4aefb2b0fb75622f7ac Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 20 14:52:56 2013 -0400 Send NETINFO on receiving a NETINFO if we have not yet sent one. Relays previously, when initiating a connection, would only send a NETINFO after sending an AUTHENTICATE. But bridges, when receiving a connection, would never send AUTH_CHALLENGE. So relays wouldn't AUTHENTICATE, and wouldn't NETINFO, and then bridges would be surprised to be receiving CREATE cells on a non-open circuit. Fixes bug 9546. --- changes/bug9546 | 5 +++++ src/or/channeltls.c | 10 ++++++++++ src/or/connection_or.c | 7 +++++++ src/or/or.h | 3 +++ 4 files changed, 25 insertions(+) diff --git a/changes/bug9546 b/changes/bug9546 new file mode 100644 index 0000000..8596eac --- /dev/null +++ b/changes/bug9546 @@ -0,0 +1,5 @@ + o Major bugfixes: + + - When a relay is extending a circuit to a bridge, it needs to send a + NETINFO cell, even when the bridge hasn't sent an AUTH_CHALLENGE + cell. Fixes bug 9546; bugfix on ????. diff --git a/src/or/channeltls.c b/src/or/channeltls.c index d758d22..a7953e7 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -1474,6 +1474,16 @@ channel_tls_process_netinfo_cell(cell_t *cell, channel_tls_t *chan) /* XXX maybe act on my_apparent_addr, if the source is sufficiently * trustworthy. */ + if (! chan->conn->handshake_state->sent_netinfo) { + /* If we were prepared to authenticate, but we never got an AUTH_CHALLENGE + * cell, then we would not previously have sent a NETINFO cell. Do so + * now. */ + if (connection_or_send_netinfo(chan->conn) < 0) { + connection_or_close_for_error(chan->conn, 0); + return; + } + } + if (connection_or_set_state_open(chan->conn) < 0) { log_fn(LOG_PROTOCOL_WARN, LD_OR, "Got good NETINFO cell from %s:%d; but " diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 3616363..31cc9c7 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -2042,6 +2042,12 @@ connection_or_send_netinfo(or_connection_t *conn) tor_assert(conn->handshake_state); + if (conn->handshake_state->sent_netinfo) { + log_warn(LD_BUG, "Attempted to send an extra netinfo cell on a connection " + "where we already sent one."); + return 0; + } + memset(&cell, 0, sizeof(cell_t)); cell.command = CELL_NETINFO; @@ -2083,6 +2089,7 @@ connection_or_send_netinfo(or_connection_t *conn) } conn->handshake_state->digest_sent_data = 0; + conn->handshake_state->sent_netinfo = 1; connection_or_write_cell_to_buf(&cell, conn); return 0; diff --git a/src/or/or.h b/src/or/or.h index 3dc96b9..8c6c1e3 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1357,6 +1357,9 @@ typedef struct or_handshake_state_t { /* True iff we've received valid authentication to some identity. */ unsigned int authenticated : 1; + /* True iff we have sent a netinfo cell */ + unsigned int sent_netinfo : 1; + /** True iff we should feed outgoing cells into digest_sent and * digest_received respectively. *

1 0

[tor/release-0.2.4] Replace return with continue in update_consensus_networkstatus_downloads
by arma＠torproject.org 01 Sep '13

01 Sep '13

commit 2530c842207ecbec0d178fa5ce804a61a1c6ec6c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 22 10:00:37 2013 -0400 Replace return with continue in update_consensus_networkstatus_downloads Fix for bug 9564; bugfix on 0.2.3.14-alpha. --- changes/bug9564 | 5 +++++ src/or/networkstatus.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug9564 b/changes/bug9564 new file mode 100644 index 0000000..0df00e3 --- /dev/null +++ b/changes/bug9564 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - If the time to download the next old-style networkstatus is in + the future, do not decline to consider whether to download the + next microdescriptor networkstatus. Fixes bug 9564. Bugfix on + 0.2.3.14-alpha. diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 2553a74..e780ead 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1239,7 +1239,7 @@ update_consensus_networkstatus_downloads(time_t now) } if (time_to_download_next_consensus[i] > now) - return; /* Wait until the current consensus is older. */ + continue; /* Wait until the current consensus is older. */ resource = networkstatus_get_flavor_name(i);

1 0