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

[tor/master] Merge branch 'maint-0.2.4'
by arma＠torproject.org 12 Oct '13

12 Oct '13

commit a26a5794a308ce30c5d2cf8d16e57903cbf9c8fb Merge: d5f0501 8f9fb63 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Oct 12 10:48:30 2013 -0400 Merge branch 'maint-0.2.4' changes/bug9946 | 11 +++++++++++ src/or/entrynodes.c | 22 +++++++++++++++++----- 2 files changed, 28 insertions(+), 5 deletions(-)

1 0

[tor/master] be willing to bootstrap from all three of our directory guards
by arma＠torproject.org 12 Oct '13

12 Oct '13

commit 8f9fb63cdb188e27e39cf063c6a9e94df66cf239 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Oct 10 20:09:16 2013 -0400 be willing to bootstrap from all three of our directory guards Also fix a bug where if the guard we choose first doesn't answer, we would try the second guard, but once we connected to the second guard we would abandon it and retry the first one, slowing down bootstrapping. The fix in both cases is to treat all our initially chosen guards as acceptable to use. Fixes bug 9946. --- changes/bug9946 | 11 +++++++++++ src/or/entrynodes.c | 22 +++++++++++++++++----- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/changes/bug9946 b/changes/bug9946 new file mode 100644 index 0000000..5d1c888 --- /dev/null +++ b/changes/bug9946 @@ -0,0 +1,11 @@ + o Minor bugfixes: + - If the guard we choose first doesn't answer, we would try the + second guard, but once we connected to the second guard we would + abandon it and retry the first one, slowing down bootstrapping. + The fix is to treat all our initially chosen guards as acceptable + to use. Fixes bug 9946; bugfix on 0.1.1.11-alpha. + + o Major bugfixes: + - Stop trying to fetch all our directory information from our first + guard. Discovered while fixing bug 9946; bugfix on 0.2.4.8-alpha. + diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index f1af75a..2aa063c 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -345,7 +345,7 @@ control_event_guard_deferred(void) * Else, put the one we pick at the end of the list. */ static const node_t * add_an_entry_guard(const node_t *chosen, int reset_status, int prepend, - int for_directory) + int for_discovery, int for_directory) { const node_t *node; entry_guard_t *entry; @@ -404,6 +404,18 @@ add_an_entry_guard(const node_t *chosen, int reset_status, int prepend, * this guard. For details, see the Jan 2010 or-dev thread. */ entry->chosen_on_date = time(NULL) - crypto_rand_int(3600*24*30); entry->chosen_by_version = tor_strdup(VERSION); + + /* Are we picking this guard because all of our current guards are + * down so we need another one (for_discovery is 1), or because we + * decided we need more variety in our guard list (for_discovery is 0)? + * + * Currently we hack this behavior into place by setting "made_contact" + * for guards of the latter variety, so we'll be willing to use any of + * them right off the bat. + */ + if (!for_discovery) + entry->made_contact = 1; + ((node_t*)node)->using_as_guard = 1; if (prepend) smartlist_insert(entry_guards, 0, entry); @@ -437,7 +449,7 @@ pick_entry_guards(const or_options_t *options, int for_directory) tor_assert(entry_guards); while (num_live_entry_guards(for_directory) < num_needed) { - if (!add_an_entry_guard(NULL, 0, 0, for_directory)) + if (!add_an_entry_guard(NULL, 0, 0, 0, for_directory)) break; changed = 1; } @@ -870,7 +882,7 @@ entry_guards_set_from_config(const or_options_t *options) /* Next, the rest of EntryNodes */ SMARTLIST_FOREACH_BEGIN(entry_nodes, const node_t *, node) { - add_an_entry_guard(node, 0, 0, 0); + add_an_entry_guard(node, 0, 0, 1, 0); if (smartlist_len(entry_guards) > options->NumEntryGuards * 10) break; } SMARTLIST_FOREACH_END(node); @@ -1054,7 +1066,7 @@ choose_random_entry_impl(cpath_build_state_t *state, int for_directory, /* XXX if guard doesn't imply fast and stable, then we need * to tell add_an_entry_guard below what we want, or it might * be a long time til we get it. -RD */ - node = add_an_entry_guard(NULL, 0, 0, for_directory); + node = add_an_entry_guard(NULL, 0, 0, 1, for_directory); if (node) { entry_guards_changed(); /* XXX we start over here in case the new node we added shares @@ -2095,7 +2107,7 @@ learned_bridge_descriptor(routerinfo_t *ri, int from_cache) node = node_get_mutable_by_id(ri->cache_info.identity_digest); tor_assert(node); rewrite_node_address_for_bridge(bridge, node); - add_an_entry_guard(node, 1, 1, 0); + add_an_entry_guard(node, 1, 1, 0, 0); log_notice(LD_DIR, "new bridge descriptor '%s' (%s): %s", ri->nickname, from_cache ? "cached" : "fresh", router_describe(ri));

1 0

[tor/maint-0.2.4] be willing to bootstrap from all three of our directory guards
by arma＠torproject.org 12 Oct '13

12 Oct '13

commit 8f9fb63cdb188e27e39cf063c6a9e94df66cf239 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Oct 10 20:09:16 2013 -0400 be willing to bootstrap from all three of our directory guards Also fix a bug where if the guard we choose first doesn't answer, we would try the second guard, but once we connected to the second guard we would abandon it and retry the first one, slowing down bootstrapping. The fix in both cases is to treat all our initially chosen guards as acceptable to use. Fixes bug 9946. --- changes/bug9946 | 11 +++++++++++ src/or/entrynodes.c | 22 +++++++++++++++++----- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/changes/bug9946 b/changes/bug9946 new file mode 100644 index 0000000..5d1c888 --- /dev/null +++ b/changes/bug9946 @@ -0,0 +1,11 @@ + o Minor bugfixes: + - If the guard we choose first doesn't answer, we would try the + second guard, but once we connected to the second guard we would + abandon it and retry the first one, slowing down bootstrapping. + The fix is to treat all our initially chosen guards as acceptable + to use. Fixes bug 9946; bugfix on 0.1.1.11-alpha. + + o Major bugfixes: + - Stop trying to fetch all our directory information from our first + guard. Discovered while fixing bug 9946; bugfix on 0.2.4.8-alpha. + diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index f1af75a..2aa063c 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -345,7 +345,7 @@ control_event_guard_deferred(void) * Else, put the one we pick at the end of the list. */ static const node_t * add_an_entry_guard(const node_t *chosen, int reset_status, int prepend, - int for_directory) + int for_discovery, int for_directory) { const node_t *node; entry_guard_t *entry; @@ -404,6 +404,18 @@ add_an_entry_guard(const node_t *chosen, int reset_status, int prepend, * this guard. For details, see the Jan 2010 or-dev thread. */ entry->chosen_on_date = time(NULL) - crypto_rand_int(3600*24*30); entry->chosen_by_version = tor_strdup(VERSION); + + /* Are we picking this guard because all of our current guards are + * down so we need another one (for_discovery is 1), or because we + * decided we need more variety in our guard list (for_discovery is 0)? + * + * Currently we hack this behavior into place by setting "made_contact" + * for guards of the latter variety, so we'll be willing to use any of + * them right off the bat. + */ + if (!for_discovery) + entry->made_contact = 1; + ((node_t*)node)->using_as_guard = 1; if (prepend) smartlist_insert(entry_guards, 0, entry); @@ -437,7 +449,7 @@ pick_entry_guards(const or_options_t *options, int for_directory) tor_assert(entry_guards); while (num_live_entry_guards(for_directory) < num_needed) { - if (!add_an_entry_guard(NULL, 0, 0, for_directory)) + if (!add_an_entry_guard(NULL, 0, 0, 0, for_directory)) break; changed = 1; } @@ -870,7 +882,7 @@ entry_guards_set_from_config(const or_options_t *options) /* Next, the rest of EntryNodes */ SMARTLIST_FOREACH_BEGIN(entry_nodes, const node_t *, node) { - add_an_entry_guard(node, 0, 0, 0); + add_an_entry_guard(node, 0, 0, 1, 0); if (smartlist_len(entry_guards) > options->NumEntryGuards * 10) break; } SMARTLIST_FOREACH_END(node); @@ -1054,7 +1066,7 @@ choose_random_entry_impl(cpath_build_state_t *state, int for_directory, /* XXX if guard doesn't imply fast and stable, then we need * to tell add_an_entry_guard below what we want, or it might * be a long time til we get it. -RD */ - node = add_an_entry_guard(NULL, 0, 0, for_directory); + node = add_an_entry_guard(NULL, 0, 0, 1, for_directory); if (node) { entry_guards_changed(); /* XXX we start over here in case the new node we added shares @@ -2095,7 +2107,7 @@ learned_bridge_descriptor(routerinfo_t *ri, int from_cache) node = node_get_mutable_by_id(ri->cache_info.identity_digest); tor_assert(node); rewrite_node_address_for_bridge(bridge, node); - add_an_entry_guard(node, 1, 1, 0); + add_an_entry_guard(node, 1, 1, 0, 0); log_notice(LD_DIR, "new bridge descriptor '%s' (%s): %s", ri->nickname, from_cache ? "cached" : "fresh", router_describe(ri));

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 12 Oct '13

12 Oct '13

commit 665ff51ea5b89fc0810fd439ea805987cdad14f1 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 12 14:15:48 2013 +0000 Update translations for torcheck_completed --- sv/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv/torcheck.po b/sv/torcheck.po index bceb3b0..8373a93 100644 --- a/sv/torcheck.po +++ b/sv/torcheck.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2013-10-12 13:45+0000\n" +"PO-Revision-Date: 2013-10-12 13:50+0000\n" "Last-Translator: WinterFairy <winterfairy(a)riseup.net>\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/torproject/language/sv/)\n" "MIME-Version: 1.0\n"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 12 Oct '13

12 Oct '13

commit 1572e79062a5e6c0251a16f7c8574ea08ede2831 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 12 14:15:45 2013 +0000 Update translations for torcheck --- sv/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv/torcheck.po b/sv/torcheck.po index bceb3b0..8373a93 100644 --- a/sv/torcheck.po +++ b/sv/torcheck.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2013-10-12 13:45+0000\n" +"PO-Revision-Date: 2013-10-12 13:50+0000\n" "Last-Translator: WinterFairy <winterfairy(a)riseup.net>\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/torproject/language/sv/)\n" "MIME-Version: 1.0\n"

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 12 Oct '13

12 Oct '13

commit 9871ee1d4107410347bb286556e3dcbbcb83ff9b Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 12 13:45:49 2013 +0000 Update translations for torcheck_completed --- sv/torcheck.po | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/sv/torcheck.po b/sv/torcheck.po index ed48e62..bceb3b0 100644 --- a/sv/torcheck.po +++ b/sv/torcheck.po @@ -1,18 +1,19 @@ # TorCheck gettext template -# Copyright (C) 2008-2012 The Tor Project, Inc +# Copyright (C) 2008-2013 The Tor Project, Inc # # Translators: # mathiasfriman4896b3d1564846bb <mathias.friman(a)regionjamtland.se>, 2012 # Petomatick <petomatick(a)hotmail.com>, 2011 # WinterFairy <winterfairy(a)riseup.net>, 2013 +# WinterFairy <winterfairy(a)riseup.net>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2013-04-29 08:18+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" -"Language-Team: Tor Translation <tor-translation(a)torproject.org>\n" +"PO-Revision-Date: 2013-10-12 13:45+0000\n" +"Last-Translator: WinterFairy <winterfairy(a)riseup.net>\n" +"Language-Team: Swedish (http://www.transifex.com/projects/p/torproject/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -20,14 +21,14 @@ msgstr "" "Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -msgid "Congratulations. Your browser is configured to use Tor." -msgstr "Grattis. Din webbläsare är konfigurerad att använda Tor." +msgid "Congratulations. This browser is configured to use Tor." +msgstr "Gratulerar. Den här webbläsaren är konfigurerad att använda Tor." msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " "for further information about using Tor safely. You are now free to browse " "the Internet anonymously." -msgstr "Vänligen besök <a href=\"https://www.torproject.org/\">webbplatsen för Tor </a> för mer information om hur du använder Tor säkert. Du kan nu surfa på nätet anonymt." +msgstr "Vänligen besök <a href=\"https://www.torproject.org/\">webbplatsen för Tor</a> för mer information om hur du använder Tor säkert. Du kan nu surfa på nätet anonymt." msgid "There is a security update available for the Tor Browser Bundle." msgstr "Det finns en säkerhetsuppdatering till Tor Browser Bundle." @@ -38,7 +39,7 @@ msgid "" msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Klicka här för att gå till nedladdningssidan</a>" msgid "Sorry. You are not using Tor." -msgstr "Ursäkta. Du använder inte Tor." +msgstr "Tyvärr. Du använder inte Tor." msgid "" "If you are attempting to use a Tor client, please refer to the <a " @@ -48,7 +49,7 @@ msgid "" msgstr "Om du försöker använda en Tor-klient, vänligen se vidare information på <a href=\"https://www.torproject.org/\">webbplatsen för Tor</a> och mer specifikt <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">instruktioner för att konfigurera din Tor-klient</a>." msgid "Sorry, your query failed or an unexpected response was received." -msgstr "Tyvärr misslyckades din fråga efter att ett oväntat svar inkom." +msgstr "Tyvärr, antingen misslyckades din förfrågan eller så inkom ett oväntat svar." msgid "" "A temporary service outage prevents us from determining if your source IP " @@ -57,3 +58,12 @@ msgstr "Ett temporärt fel på tjänsten förhindrar oss från att avgöra om de msgid "Your IP address appears to be: " msgstr "Din IP-adress verkar vara:" + +msgid "Are you using Tor?" +msgstr "Använder du Tor?" + +msgid "This page is also available in the following languages:" +msgstr "Den här sidan finns också på följande språk:" + +msgid "For more information about this exit relay, see:" +msgstr "För mer information om det här exit-reläet, se:"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 12 Oct '13

12 Oct '13

commit ae049bb424cde73828fb379da1578c9c542f311a Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 12 13:45:44 2013 +0000 Update translations for torcheck --- sv/torcheck.po | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/sv/torcheck.po b/sv/torcheck.po index 291cc06..bceb3b0 100644 --- a/sv/torcheck.po +++ b/sv/torcheck.po @@ -5,13 +5,14 @@ # mathiasfriman4896b3d1564846bb <mathias.friman(a)regionjamtland.se>, 2012 # Petomatick <petomatick(a)hotmail.com>, 2011 # WinterFairy <winterfairy(a)riseup.net>, 2013 +# WinterFairy <winterfairy(a)riseup.net>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2013-10-03 09:07+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-10-12 13:45+0000\n" +"Last-Translator: WinterFairy <winterfairy(a)riseup.net>\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/torproject/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,13 +22,13 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Congratulations. This browser is configured to use Tor." -msgstr "" +msgstr "Gratulerar. Den här webbläsaren är konfigurerad att använda Tor." msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " "for further information about using Tor safely. You are now free to browse " "the Internet anonymously." -msgstr "Vänligen besök <a href=\"https://www.torproject.org/\">webbplatsen för Tor </a> för mer information om hur du använder Tor säkert. Du kan nu surfa på nätet anonymt." +msgstr "Vänligen besök <a href=\"https://www.torproject.org/\">webbplatsen för Tor</a> för mer information om hur du använder Tor säkert. Du kan nu surfa på nätet anonymt." msgid "There is a security update available for the Tor Browser Bundle." msgstr "Det finns en säkerhetsuppdatering till Tor Browser Bundle." @@ -38,7 +39,7 @@ msgid "" msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Klicka här för att gå till nedladdningssidan</a>" msgid "Sorry. You are not using Tor." -msgstr "Ursäkta. Du använder inte Tor." +msgstr "Tyvärr. Du använder inte Tor." msgid "" "If you are attempting to use a Tor client, please refer to the <a " @@ -48,7 +49,7 @@ msgid "" msgstr "Om du försöker använda en Tor-klient, vänligen se vidare information på <a href=\"https://www.torproject.org/\">webbplatsen för Tor</a> och mer specifikt <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">instruktioner för att konfigurera din Tor-klient</a>." msgid "Sorry, your query failed or an unexpected response was received." -msgstr "Tyvärr misslyckades din fråga efter att ett oväntat svar inkom." +msgstr "Tyvärr, antingen misslyckades din förfrågan eller så inkom ett oväntat svar." msgid "" "A temporary service outage prevents us from determining if your source IP " @@ -59,10 +60,10 @@ msgid "Your IP address appears to be: " msgstr "Din IP-adress verkar vara:" msgid "Are you using Tor?" -msgstr "" +msgstr "Använder du Tor?" msgid "This page is also available in the following languages:" -msgstr "" +msgstr "Den här sidan finns också på följande språk:" msgid "For more information about this exit relay, see:" -msgstr "" +msgstr "För mer information om det här exit-reläet, se:"

1 0

[translation/torbutton-browserproperties] Update translations for torbutton-browserproperties
by translation＠torproject.org 12 Oct '13

12 Oct '13

commit da31043aedcf868fede8e30b410f519e18d0c35b Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 12 08:16:25 2013 +0000 Update translations for torbutton-browserproperties --- ms_MY/browser.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ms_MY/browser.properties b/ms_MY/browser.properties index fd25b10..bce0b9e 100644 --- a/ms_MY/browser.properties +++ b/ms_MY/browser.properties @@ -1,5 +1,5 @@ # Default home page -# browser.startup.homepage=about:tor +browser.startup.homepage=about:tor # Spell checker dictionary # spellchecker.dictionary=en_US

1 0

[translation/torbutton-branddtd_completed] Update translations for torbutton-branddtd_completed
by translation＠torproject.org 12 Oct '13

12 Oct '13

commit a86adcc508b3bf1a5cc9e57b254dd9baa89cd357 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 12 08:16:23 2013 +0000 Update translations for torbutton-branddtd_completed --- ms_MY/brand.dtd | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ms_MY/brand.dtd b/ms_MY/brand.dtd new file mode 100644 index 0000000..a3bba3e --- /dev/null +++ b/ms_MY/brand.dtd @@ -0,0 +1,8 @@ + + +<!ENTITY brandShortName "PelayarTor"> +<!ENTITY brandFullName "Pelayar Tor"> +<!ENTITY vendorShortName "Projek Tor"> +<!ENTITY trademarkInfo.part1 "Firefox dan logo Firefox adalah hak cipta Yayasan Mozilla.">

1 0

[translation/torbutton-branddtd] Update translations for torbutton-branddtd
by translation＠torproject.org 12 Oct '13

12 Oct '13

commit 7c1b94239de8eefe382c1b5224e3f492c3f98c6c Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 12 08:16:21 2013 +0000 Update translations for torbutton-branddtd --- ms_MY/brand.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ms_MY/brand.dtd b/ms_MY/brand.dtd index d78960c..a3bba3e 100644 --- a/ms_MY/brand.dtd +++ b/ms_MY/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName ""> -<!ENTITY brandFullName ""> +<!ENTITY brandShortName "PelayarTor"> +<!ENTITY brandFullName "Pelayar Tor"> <!ENTITY vendorShortName "Projek Tor"> <!ENTITY trademarkInfo.part1 "Firefox dan logo Firefox adalah hak cipta Yayasan Mozilla.">

1 0