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

[tor/master] Merge remote-tracking branch 'public/bug9716_024'
by nickm＠torproject.org 19 Sep '13

19 Sep '13

commit 67bb1a44bd2af54d2475404b187c5475db7ea76d Merge: 2f2fa76 a2754d4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 19 10:50:34 2013 -0400 Merge remote-tracking branch 'public/bug9716_024' changes/bug9716 | 4 ++++ src/or/connection.c | 23 ++++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --cc src/or/connection.c index 8c66a17,41946e4..8cf23ab --- a/src/or/connection.c +++ b/src/or/connection.c @@@ -1045,9 -1030,10 +1066,9 @@@ connection_listener_new(const struct so } if (is_tcp) { - if (listen(s,SOMAXCONN) < 0) { + if (tor_listen(s) < 0) { log_warn(LD_NET, "Could not listen on %s:%u: %s", address, usePort, tor_socket_strerror(tor_socket_errno(s))); - tor_close_socket(s); goto err; } }

1 0

[tor/master] Try using INT_MAX, not SOMAXCONN, to set listen() backlog.
by nickm＠torproject.org 19 Sep '13

19 Sep '13

commit a2754d418dffb6188717d5e84d9bea59a2c9853b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 11 13:30:45 2013 -0400 Try using INT_MAX, not SOMAXCONN, to set listen() backlog. Fall back to SOMAXCONN if INT_MAX doesn't work. We'd like to do this because the actual maximum is overrideable by the kernel, and the value in the header file might not be right at all. All implementations I can find out about claim that this is supported. Fix for 9716; bugfix on every Tor. --- changes/bug9716 | 4 ++++ src/or/connection.c | 23 ++++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/changes/bug9716 b/changes/bug9716 new file mode 100644 index 0000000..5e39077 --- /dev/null +++ b/changes/bug9716 @@ -0,0 +1,4 @@ + o Bugfixes (performance): + - Set the listen() backlog limit to the largest actually supported + on the system, not to the value in a header file. Fixes bug 9716; + bugfix on every released Tor. diff --git a/src/or/connection.c b/src/or/connection.c index 6e754a0..41946e4 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -926,6 +926,27 @@ make_socket_reuseable(tor_socket_t sock) #endif } +/** Max backlog to pass to listen. We start at */ +static int listen_limit = INT_MAX; + +/* Listen on <b>fd</b> with appropriate backlog. Return as for listen. */ +static int +tor_listen(tor_socket_t fd) +{ + int r; + + if ((r = listen(fd, listen_limit)) < 0) { + if (listen_limit == SOMAXCONN) + return r; + if ((r = listen(fd, SOMAXCONN)) == 0) { + listen_limit = SOMAXCONN; + log_warn(LD_NET, "Setting listen backlog to INT_MAX connections " + "didn't work, but SOMAXCONN did. Lowering backlog limit."); + } + } + return r; +} + /** Bind a new non-blocking socket listening to the socket described * by <b>listensockaddr</b>. * @@ -1009,7 +1030,7 @@ connection_listener_new(const struct sockaddr *listensockaddr, } if (is_tcp) { - if (listen(s,SOMAXCONN) < 0) { + if (tor_listen(s) < 0) { log_warn(LD_NET, "Could not listen on %s:%u: %s", address, usePort, tor_socket_strerror(tor_socket_errno(s))); tor_close_socket(s);

1 0

[torspec/master] Fix typo.
by nickm＠torproject.org 19 Sep '13

19 Sep '13

commit 872d3dd4ba6e8ad3ffe1a3ed557ab714b64af427 Author: Linus Nordberg <linus(a)torproject.org> Date: Thu Sep 19 13:15:18 2013 +0200 Fix typo. --- dir-spec.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dir-spec.txt b/dir-spec.txt index 7222a3b..d66ea18 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -1290,7 +1290,7 @@ must have a bandwidth this high. "guard-bw-exc-exits" -- If exits can't be guards, then all guards - guards must have a bandwidth this high. + must have a bandwidth this high. "ignoring-advertised-bws" -- 1 if we have enough measured bandwidths that we'll ignore the advertised bandwidth

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 19 Sep '13

19 Sep '13

commit 3f4469e4f41ba27ad7545c53b5e5e41ed685e19c Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 19 13:46:22 2013 +0000 Update translations for abouttor-homepage --- pt_BR/aboutTor.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt_BR/aboutTor.dtd b/pt_BR/aboutTor.dtd index 5f48c84..4d2a034 100644 --- a/pt_BR/aboutTor.dtd +++ b/pt_BR/aboutTor.dtd @@ -42,8 +42,8 @@ <!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> <!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> <!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchSP.search.beforeLink.label ""> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label ""> +<!ENTITY aboutTor.searchSP.search.beforeLink.label "com"> +<!ENTITY aboutTor.searchDDG.search.beforeLink.label "com"> <!ENTITY aboutTor.searchSP.search.label "Página de Início"> <!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> <!ENTITY aboutTor.searchSP.search.link "https://startpage.com/">

1 0

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

19 Sep '13

commit 729cc6514159ace718f34891db0adff34bba1801 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 19 13:46:06 2013 +0000 Update translations for torbirdy --- pt_BR/torbirdy.dtd | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pt_BR/torbirdy.dtd b/pt_BR/torbirdy.dtd index edecdde..db859c1 100644 --- a/pt_BR/torbirdy.dtd +++ b/pt_BR/torbirdy.dtd @@ -1,5 +1,5 @@ <!ENTITY torbirdy.accountprefs.title "Configurações da Conta"> -<!ENTITY torbirdy.accountprefs.startup.label "Verifique se há novas mensagens ao iniciar"> +<!ENTITY torbirdy.accountprefs.startup.label "Verificar se há novas mensagens ao iniciar"> <!ENTITY torbirdy.accountprefs.startup.key "I"> <!ENTITY torbirdy.accountprefs.minutes.label "Verificar se há novas mensagens a cada"> <!ENTITY torbirdy.accountprefs.minutes.key "a"> @@ -8,7 +8,7 @@ <!ENTITY torbirdy.accountprefs.save.button "Salvar"> <!ENTITY torbirdy.accountprefs.save.key "S"> -<!ENTITY torbirdy.prefs.title "Preferências"> +<!ENTITY torbirdy.prefs.title "Preferências do TorBirdy"> <!ENTITY torbirdy.prefs.save.button "Salvar"> <!ENTITY torbirdy.prefs.save.key "s"> <!ENTITY torbirdy.prefs.cancel.button "Cancelar"> @@ -20,9 +20,9 @@ <!ENTITY torbirdy.prefs.privacy.label ""> <!ENTITY torbirdy.prefs.enigmail.label ""> <!ENTITY torbirdy.prefs.security.label ""> -<!ENTITY torbirdy.prefs.recommended.text "Utilizar as configurações de proxy recomendadas pelo TorBirdy (Tor)"> +<!ENTITY torbirdy.prefs.recommended.text "Utilizar as configurações de proxy recomendadas para o TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r"> -<!ENTITY torbirdy.prefs.anonservice.text "Escolha um serviço de anonimato"> +<!ENTITY torbirdy.prefs.anonservice.text "Escolher um serviço de anonimato"> <!ENTITY torbirdy.prefs.anonservice.key "a"> <!ENTITY torbirdy.prefs.customsettings.text "Usar configurações de proxy personalizadas"> <!ENTITY torbirdy.prefs.customsettings.key "p"> @@ -41,7 +41,7 @@ <!ENTITY torbirdy.prefs.timezone.key "f"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Não colocar a ID dos destinatários em mensagens criptografadas [padrão: colocar]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> -<!ENTITY torbirdy.prefs.confirmemail.label "Confirmar antes de enviar email se Enigmail estiver ativado [padrão: não confirmar]"> +<!ENTITY torbirdy.prefs.confirmemail.label "Confirmar antes de enviar e-mail se Enigmail estiver ativado [padrão: não confirmar]"> <!ENTITY torbirdy.prefs.confirmemail.key "c"> <!ENTITY torbirdy.prefs.emailwizard.label "Ativar o assistente de configuração de email do Thunderbird [padrão: desativar]"> <!ENTITY torbirdy.prefs.emailwizard.key "w"> @@ -51,7 +51,7 @@ <!ENTITY torbirdy.prefs.renegotiation.key "r"> <!ENTITY torbirdy.prefs.account_specific "Configurações da Conta"> <!ENTITY torbirdy.prefs.select_account.key "s"> -<!ENTITY torbirdy.prefs.select_account.label "Escolha uma conta:"> +<!ENTITY torbirdy.prefs.select_account.label "Escolher uma conta:"> <!ENTITY torbirdy.prefs.enigmail.keyserver.label "Servidor de chave(s) a usar:"> <!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">

1 0

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

19 Sep '13

commit d3bd19d7c3bab09afedf87483b63390247c58329 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 19 12:16:30 2013 +0000 Update translations for torbutton-branddtd_completed --- sl/brand.dtd | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sl/brand.dtd b/sl/brand.dtd new file mode 100644 index 0000000..1f856bd --- /dev/null +++ b/sl/brand.dtd @@ -0,0 +1,8 @@ + + +<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandFullName "Tor Browser"> +<!ENTITY vendorShortName "Tor Project"> +<!ENTITY trademarkInfo.part1 "Firefox in njegova grafična podoba sta blagovni znamki skupnosti Mozilla Foundation.">

1 0

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

19 Sep '13

commit 86ed15cb1521327e2af38f8e3677d6ac19ce2e82 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 19 12:16:28 2013 +0000 Update translations for torbutton-branddtd --- sl/brand.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sl/brand.dtd b/sl/brand.dtd index 284a1ec..1f856bd 100644 --- a/sl/brand.dtd +++ b/sl/brand.dtd @@ -5,4 +5,4 @@ <!ENTITY brandShortName "TorBrowser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> -<!ENTITY trademarkInfo.part1 ""> +<!ENTITY trademarkInfo.part1 "Firefox in njegova grafična podoba sta blagovni znamki skupnosti Mozilla Foundation.">

1 0

[translation/torbutton-brandproperties_completed] Update translations for torbutton-brandproperties_completed
by translation＠torproject.org 19 Sep '13

19 Sep '13

commit a2cc322db24af8e9aa05786724df811d675ad25c Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 19 12:16:26 2013 +0000 Update translations for torbutton-brandproperties_completed --- sl/brand.properties | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/sl/brand.properties b/sl/brand.properties new file mode 100644 index 0000000..a8969cb --- /dev/null +++ b/sl/brand.properties @@ -0,0 +1,15 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# 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/. + +brandShortName=TorBrowser +brandFullName=Tor Browser +vendorShortName=Tor Project + +homePageSingleStartMain=Firefox Start, hitra domača stran z vgrajenim iskanjem +homePageImport=Uvozi domačo stran od %S + +homePageMigrationPageTitle=Izbira domače strani +homePageMigrationDescription=Prosimo, da izberete domačo stran, ki jo želite uporabljati: + +syncBrandShortName=Sinhroniziraj

1 0

[translation/torbutton-brandproperties] Update translations for torbutton-brandproperties
by translation＠torproject.org 19 Sep '13

19 Sep '13

commit 503a323e81154b995e5b0653c6e8fc5935309452 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 19 12:16:24 2013 +0000 Update translations for torbutton-brandproperties --- sl/brand.properties | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sl/brand.properties b/sl/brand.properties index 6598ccd..a8969cb 100644 --- a/sl/brand.properties +++ b/sl/brand.properties @@ -2,14 +2,14 @@ # 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/. -# brandShortName=TorBrowser -# brandFullName=Tor Browser -# vendorShortName=Tor Project +brandShortName=TorBrowser +brandFullName=Tor Browser +vendorShortName=Tor Project -# homePageSingleStartMain=Firefox Start, a fast home page with built-in search -# homePageImport=Import your home page from %S +homePageSingleStartMain=Firefox Start, hitra domača stran z vgrajenim iskanjem +homePageImport=Uvozi domačo stran od %S -# homePageMigrationPageTitle=Home Page Selection -# homePageMigrationDescription=Please select the home page you wish to use: +homePageMigrationPageTitle=Izbira domače strani +homePageMigrationDescription=Prosimo, da izberete domačo stran, ki jo želite uporabljati: -# syncBrandShortName=Sync +syncBrandShortName=Sinhroniziraj

1 0

[translation/tor-launcher-progress_completed] Update translations for tor-launcher-progress_completed
by translation＠torproject.org 19 Sep '13

19 Sep '13

commit b40e148c2e177f8a3d09e41abfa2d5c9ec9dc880 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 19 12:16:15 2013 +0000 Update translations for tor-launcher-progress_completed --- sl/progress.dtd | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sl/progress.dtd b/sl/progress.dtd new file mode 100644 index 0000000..8c06133 --- /dev/null +++ b/sl/progress.dtd @@ -0,0 +1,4 @@ +<!ENTITY torprogress.dialog.title "Tor stanje"> +<!ENTITY torprogress.openSettings "Odpri nastavitve"> +<!ENTITY torprogress.heading "Povezovanje v Tor omrežje"> +<!ENTITY torprogress.pleaseWait "Tor brskalnik se bo odprl takoj, ko se bo vzpostavila povezava s Tor omrežjem.">

1 0