April 2018 - tor-commits - lists.torproject.org

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 04 Apr '18

04 Apr '18

commit 81051f5a04c0f6023927bcd0da847605e2b9163d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 4 14:46:08 2018 +0000 Update translations for torbirdy --- pt/torbirdy.dtd | 18 +++++++++--------- pt/torbirdy.properties | 14 +++++++------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pt/torbirdy.dtd b/pt/torbirdy.dtd index 0c075accd..b59f85135 100644 --- a/pt/torbirdy.dtd +++ b/pt/torbirdy.dtd @@ -14,29 +14,29 @@ <!ENTITY torbirdy.prefs.cancel.button "Cancelar"> <!ENTITY torbirdy.prefs.extra2.button "Restaurar Predefinições"> <!ENTITY torbirdy.prefs.extra2.key "d"> -<!ENTITY torbirdy.prefs.testproxy.button "Testar definições do proxy"> +<!ENTITY torbirdy.prefs.testproxy.button "Testar Configurações do Proxy"> <!ENTITY torbirdy.prefs.testproxy.key "n"> <!ENTITY torbirdy.prefs.proxy.label "Proxy"> -<!ENTITY torbirdy.prefs.privacy.label "Definições de Privacidade"> -<!ENTITY torbirdy.prefs.enigmail.label "Configurações do Enigmail"> -<!ENTITY torbirdy.prefs.recommended.text "Use as configurações de proxy recomendadas para o TorBirdy (Tor)"> +<!ENTITY torbirdy.prefs.privacy.label "Privacidade"> +<!ENTITY torbirdy.prefs.enigmail.label "Enigmail"> +<!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 anonimização"> <!ENTITY torbirdy.prefs.anonservice.key "a"> -<!ENTITY torbirdy.prefs.customsettings.text "Utilizar as configurações padrão do proxy"> +<!ENTITY torbirdy.prefs.customsettings.text "Utilizar as configurações de proxy personalizadas"> <!ENTITY torbirdy.prefs.customsettings.key "c"> <!ENTITY torbirdy.prefs.socks_host.label "Host SOCKS:"> <!ENTITY torbirdy.prefs.socks_host.key "h"> <!ENTITY torbirdy.prefs.socks_port.label "Porta:"> <!ENTITY torbirdy.prefs.socks_port.key "p"> -<!ENTITY torbirdy.prefs.torification.label "Torificação Transparente (aviso: necessita de transproxy ou router Tor)"> +<!ENTITY torbirdy.prefs.torification.label ""Torification" Transparente (aviso: requer "transproxy" personalizado ou "router" do Tor)"> <!ENTITY torbirdy.prefs.torification.key "t"> <!ENTITY torbirdy.prefs.global "Global"> -<!ENTITY torbirdy.prefs.imap.label "Ative o suporte para push de email de contas IMAP [por defeito: desativado]"> +<!ENTITY torbirdy.prefs.imap.label "Ativar o suporte de submissão de e-mail para as contas IMAP [predefinição: desativado]"> <!ENTITY torbirdy.prefs.imap.key "p"> -<!ENTITY torbirdy.prefs.startup_folder.label "Selecione a última pasta de e-mail acedida ao iniciar [predefinição: desativada]"> +<!ENTITY torbirdy.prefs.startup_folder.label "Selecionar a última pasta de e-mail acedida no arranque [predefinição: desativada]"> <!ENTITY torbirdy.prefs.startup_folder.key "I"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Coloque as chaves dos IDs do destinatário em mensagens encriptadas [por defeito: não colocar]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Não colocar as Ids. chave do destinatário nas mensagens encriptadas [predefinição: colocar]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!ENTITY torbirdy.prefs.enigmail_protected.label "Desativar cabeçalhos de e-mail encriptados [predefinição: ativado]"> <!ENTITY torbirdy.prefs.enigmail_protected.key "d"> diff --git a/pt/torbirdy.properties b/pt/torbirdy.properties index d1498a190..9127b393e 100644 --- a/pt/torbirdy.properties +++ b/pt/torbirdy.properties @@ -2,17 +2,17 @@ torbirdy.name=TorBirdy torbirdy.enabled.tor=TorBirdy ativado: Tor torbirdy.enabled.jondo=TorBirdy ativado: JonDo -torbirdy.enabled.custom=TorBirdy ativado: Custom Proxy -torbirdy.enabled.torification=TorBirdy ativado: Transparent Torification +torbirdy.enabled.custom=TorBirdy Enabled: Proxy Personalizado +torbirdy.enabled.torification=TorBirdy Enabled: "Torification" Transparente torbirdy.enabled.whonix=TorBirdy ativado: Whonix -torbirdy.disabled=TorBirdy: desativado! +torbirdy.disabled=TorBirdy: Desativado! torbirdy.enabled=TorBirdy: Ativado -torbirdy.email.prompt=TorBirdy desativou o assistente de auto-configuração do Thunderbird's para proteger a sua anonimidade.\n\nAs definições de segurança recomendadas para %S foram preenchidas.\n\nPode configurar as outras definições da conta manuualmente. +torbirdy.email.prompt=TorBirdy desativou o assistente de configuração automática do Thunderbird's para proteger o seu anonimato.\n\nForam definidas as configurações de segurança recomendadas para %S.\n\nPode configurar manualmente as outras configurações da conta. -torbirdy.email.advanced=Por favor note que alterar as configurações avançadas do TorBirdy NÃO é recomendado.\n\nDeve apenas continuar se tiver a certeza do que está a fazer. +torbirdy.email.advanced=Por favor, note que 'NÃO' é recomendado que altere as configurações avançadas do TorBirdy.\n\nDeverá apenas continuar se tiver a certeza do que está a fazer. torbirdy.email.advanced.nextwarning=Mostrar este aviso na próxima vez -torbirdy.email.advanced.title=Definições avançadas TorBirdy +torbirdy.email.advanced.title=Configurações Avançadas do TorBirdy -torbirdy.firstrun=Já está a correr o TorBirdy.\n\nPara ajudar a proteger a sua anonimidade, o TorBirdy força as definições do Thunderbird, de modo a prevenir que sejam alteradas por si ou um suplemento. Existem algumas definiões que podem ser alteradas e que podem ser acedidas pelo diálogo de preferências do TorBirdy. Quando o TorBirdy for desinstalado ou desativado, todas as definições alteradas são repostas (para o valor inicial anterior à instalação).\n\nSe é um utilizador novo, é recomendado que leia as instruções do sítio web TorBirdy para compreender o que estamos a tentar alcançar com o TorBirdy para os nossos utilizadores. +torbirdy.firstrun=Já está a executar o TorBirdy.\n\nPara ajudar a proteger o seu anonimato, o TorBirdy reforçará as configurações do Thunderbird, impedindo que elas sejam alteradas por si ou por qualquer add-on. Existem algumas configurações que podem ser alteradas e acedidas através da janela das preferências do TorBirdy. Quando o TorBirdy é desinstalado ou desativado, todas as configurações alteradas são redefinidas para seus valores predefinidos (os valores anteriores à instalação do TorBirdy).\n\nSe é um novo utilizador, é recomendado que leia as instruções do site da Web do TorBirdy para compreender o que nós estamos a tentar alcançar com o TorBirdy para os nossos utilizadores. torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy

1 0

[metrics-web/master] Link directly to CollecTor subdirectories.
by karsten＠torproject.org 04 Apr '18

04 Apr '18

commit 0af3488050be3a7877d34814e39eb42465afe7ec Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Apr 4 16:15:40 2018 +0200 Link directly to CollecTor subdirectories. --- src/main/resources/web/jsps/collector.jsp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/web/jsps/collector.jsp b/src/main/resources/web/jsps/collector.jsp index 13865ba..3e98785 100644 --- a/src/main/resources/web/jsps/collector.jsp +++ b/src/main/resources/web/jsps/collector.jsp @@ -382,7 +382,7 @@ The sanitizing steps are specified in detail on a separate <h3 id="type-bridge-network-status" class="hover">Bridge Network Statuses <small><code>@type bridge-network-status 1.2</code></small> <a href="/collector/recent/bridge-descriptors/statuses/" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> -<a href="/collector/archive/bridge-descriptors/" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a> +<a href="/collector/archive/bridge-descriptors/statuses/" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a> <a href="#type-bridge-network-status" class="anchor">#</a> </h3> @@ -407,7 +407,7 @@ authority which produced the document, to the header.</li> <h3 id="type-bridge-server-descriptor" class="hover">Bridge Server descriptors <small><code>@type bridge-server-descriptor 1.2</code></small> <a href="/collector/recent/bridge-descriptors/server-descriptors/" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> -<a href="/collector/archive/bridge-descriptors/" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a> +<a href="/collector/archive/bridge-descriptors/server-descriptors/" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a> <a href="#type-bridge-server-descriptor" class="anchor">#</a> </h3> @@ -441,7 +441,7 @@ ports.</li> <h3 id="type-bridge-extra-info" class="hover">Bridge Extra-info Descriptors <small><code>@type bridge-extra-info 1.3</code></small> <a href="/collector/recent/bridge-descriptors/extra-infos/" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> recent</a> -<a href="/collector/archive/bridge-descriptors/" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a> +<a href="/collector/archive/bridge-descriptors/extra-infos/" class="btn btn-primary btn-xs"><i class="fa fa-chevron-right" aria-hidden="true"></i> archive</a> <a href="#type-bridge-extra-info" class="anchor">#</a> </h3>

1 0

[metrics-web/master] Use proper call list syntax.
by karsten＠torproject.org 04 Apr '18

04 Apr '18

commit 41907268f1b86337961b7035984ee084a3bd6bab Author: iwakeh <iwakeh(a)torproject.org> Date: Tue Apr 3 07:32:38 2018 +0000 Use proper call list syntax. --- src/main/java/org/torproject/metrics/web/RObjectGenerator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/torproject/metrics/web/RObjectGenerator.java b/src/main/java/org/torproject/metrics/web/RObjectGenerator.java index e3a2419..aea6db7 100644 --- a/src/main/java/org/torproject/metrics/web/RObjectGenerator.java +++ b/src/main/java/org/torproject/metrics/web/RObjectGenerator.java @@ -131,7 +131,7 @@ public class RObjectGenerator implements ServletContextListener { } String function = this.availableGraphs.get(requestedGraph) .getFunction(); - queryBuilder.append(function).append("("); + queryBuilder.append(function).append(", "); StringBuilder imageFilenameBuilder = new StringBuilder(requestedGraph); for (Map.Entry<String, String[]> parameter @@ -155,7 +155,7 @@ public class RObjectGenerator implements ServletContextListener { } imageFilenameBuilder.append(".").append(fileType); String imageFilename = imageFilenameBuilder.toString(); - queryBuilder.append("path = '%1$s'))), '%1$s')"); + queryBuilder.append("path = '%1$s')), '%1$s')"); String query = queryBuilder.toString(); File imageFile = new File(this.cachedGraphsDirectory + "/" + imageFilename);

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 04 Apr '18

04 Apr '18

commit e28e78b2f8bb04a74cb946cb84fb879053d962fc Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 4 13:45:48 2018 +0000 Update translations for https_everywhere_completed --- fr/https-everywhere.dtd | 2 ++ ga/https-everywhere.dtd | 2 ++ 2 files changed, 4 insertions(+) diff --git a/fr/https-everywhere.dtd b/fr/https-everywhere.dtd index ca9118e1f..4952257a3 100644 --- a/fr/https-everywhere.dtd +++ b/fr/https-everywhere.dtd @@ -2,6 +2,7 @@ <!ENTITY https-everywhere.about.ext_name "HTTPS partout"> <!ENTITY https-everywhere.about.ext_description "Chiffrez le Web ! Utilisez automatiquement la sécurité HTTPS avec de nombreux sites."> <!ENTITY https-everywhere.about.version "Version"> +<!ENTITY https-everywhere.about.rulesets_version "Version des ensembles de règles pour"> <!ENTITY https-everywhere.about.add_new_rule "Ajouter une nouvelle règle"> <!ENTITY https-everywhere.menu.donate_eff_imperative "Faire un don à la FFÉ"> @@ -14,6 +15,7 @@ <!ENTITY https-everywhere.options.generalSettings "Paramètres généraux"> <!ENTITY https-everywhere.options.importSettings "Importer les paramètres"> <!ENTITY https-everywhere.options.import "Importer"> +<!ENTITY https-everywhere.options.autoUpdateRulesets "Ensembles de règles de mise à jour automatique"> <!ENTITY https-everywhere.options.imported "Vos paramètres ont été importés."> <!ENTITY https-everywhere.prefs.export_settings "Exporter les paramètres"> diff --git a/ga/https-everywhere.dtd b/ga/https-everywhere.dtd index 9563e621c..67e37b517 100644 --- a/ga/https-everywhere.dtd +++ b/ga/https-everywhere.dtd @@ -2,6 +2,7 @@ <!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> <!ENTITY https-everywhere.about.ext_description "Criptigh an Gréasán! Bain úsáid as slándáil HTTPS go huathoibríoch ar go leor suíomh."> <!ENTITY https-everywhere.about.version "Leagan"> +<!ENTITY https-everywhere.about.rulesets_version "Leagan na rialacha le haghaidh"> <!ENTITY https-everywhere.about.add_new_rule "Cuir Riail Nua Leis"> <!ENTITY https-everywhere.menu.donate_eff_imperative "Tabhair síntiús airgid don EFF"> @@ -14,6 +15,7 @@ <!ENTITY https-everywhere.options.generalSettings "Socruithe Ginearálta"> <!ENTITY https-everywhere.options.importSettings "Iompórtáil Socruithe"> <!ENTITY https-everywhere.options.import "Iompórtáil"> +<!ENTITY https-everywhere.options.autoUpdateRulesets "Nuashonraigh rialacha go huathoibríoch"> <!ENTITY https-everywhere.options.imported "Iompórtáladh do chuid socruithe."> <!ENTITY https-everywhere.prefs.export_settings "Easpórtáil Socruithe">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 04 Apr '18

04 Apr '18

commit 28df1e20545f122050d09e1a221b0717810d7413 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 4 13:45:38 2018 +0000 Update translations for https_everywhere --- fr/https-everywhere.dtd | 4 ++-- ga/https-everywhere.dtd | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fr/https-everywhere.dtd b/fr/https-everywhere.dtd index 03ff03eda..4952257a3 100644 --- a/fr/https-everywhere.dtd +++ b/fr/https-everywhere.dtd @@ -2,7 +2,7 @@ <!ENTITY https-everywhere.about.ext_name "HTTPS partout"> <!ENTITY https-everywhere.about.ext_description "Chiffrez le Web ! Utilisez automatiquement la sécurité HTTPS avec de nombreux sites."> <!ENTITY https-everywhere.about.version "Version"> -<!ENTITY https-everywhere.about.rulesets_version "Rulesets version for "> +<!ENTITY https-everywhere.about.rulesets_version "Version des ensembles de règles pour"> <!ENTITY https-everywhere.about.add_new_rule "Ajouter une nouvelle règle"> <!ENTITY https-everywhere.menu.donate_eff_imperative "Faire un don à la FFÉ"> @@ -15,7 +15,7 @@ <!ENTITY https-everywhere.options.generalSettings "Paramètres généraux"> <!ENTITY https-everywhere.options.importSettings "Importer les paramètres"> <!ENTITY https-everywhere.options.import "Importer"> -<!ENTITY https-everywhere.options.autoUpdateRulesets "Auto-update rulesets"> +<!ENTITY https-everywhere.options.autoUpdateRulesets "Ensembles de règles de mise à jour automatique"> <!ENTITY https-everywhere.options.imported "Vos paramètres ont été importés."> <!ENTITY https-everywhere.prefs.export_settings "Exporter les paramètres"> diff --git a/ga/https-everywhere.dtd b/ga/https-everywhere.dtd index e19dac4ab..67e37b517 100644 --- a/ga/https-everywhere.dtd +++ b/ga/https-everywhere.dtd @@ -2,7 +2,7 @@ <!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> <!ENTITY https-everywhere.about.ext_description "Criptigh an Gréasán! Bain úsáid as slándáil HTTPS go huathoibríoch ar go leor suíomh."> <!ENTITY https-everywhere.about.version "Leagan"> -<!ENTITY https-everywhere.about.rulesets_version "Rulesets version for "> +<!ENTITY https-everywhere.about.rulesets_version "Leagan na rialacha le haghaidh"> <!ENTITY https-everywhere.about.add_new_rule "Cuir Riail Nua Leis"> <!ENTITY https-everywhere.menu.donate_eff_imperative "Tabhair síntiús airgid don EFF"> @@ -15,7 +15,7 @@ <!ENTITY https-everywhere.options.generalSettings "Socruithe Ginearálta"> <!ENTITY https-everywhere.options.importSettings "Iompórtáil Socruithe"> <!ENTITY https-everywhere.options.import "Iompórtáil"> -<!ENTITY https-everywhere.options.autoUpdateRulesets "Auto-update rulesets"> +<!ENTITY https-everywhere.options.autoUpdateRulesets "Nuashonraigh rialacha go huathoibríoch"> <!ENTITY https-everywhere.options.imported "Iompórtáladh do chuid socruithe."> <!ENTITY https-everywhere.prefs.export_settings "Easpórtáil Socruithe">

1 0

[tor/maint-0.3.3] Bug 21394 touchup: Increase DNS attempts to 3
by nickm＠torproject.org 04 Apr '18

04 Apr '18

commit 06484eb5e19081f478c0c5569e2de6fcfb8d3531 Author: Dhalgren <dhalgren.tor(a)gmail.com> Date: Sun Apr 1 05:01:51 2018 +0000 Bug 21394 touchup: Increase DNS attempts to 3 Also don't give up on a resolver as quickly if multiple are configured. --- changes/bug21394.2 | 7 +++++++ src/or/dns.c | 19 +++++++++++-------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/changes/bug21394.2 b/changes/bug21394.2 new file mode 100644 index 000000000..b580d2a78 --- /dev/null +++ b/changes/bug21394.2 @@ -0,0 +1,7 @@ + o Minor bugfix (Exit node DNS retries): + - Re-attempt timed-out DNS queries 3 times before failure, since our + timeout is 5 seconds for them, but clients wait 10-15. Also allow + slightly more timeouts per resolver before giving up on it in the + case where an exit has multiple resolvers configured. Fixes bug 21394; + bugfix on 0.3.1.9. + diff --git a/src/or/dns.c b/src/or/dns.c index c1e3c3256..33628373d 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -1428,27 +1428,30 @@ configure_nameservers(int force) // If we only have one nameserver, it does not make sense to back off // from it for a timeout. Unfortunately, the value for max-timeouts is // currently clamped by libevent to 255, but it does not hurt to set - // it higher in case libevent gets a patch for this. - // Reducing attempts in the case of just one name server too, because - // it is very likely to be a local one where a network connectivity - // issue should not cause an attempt to fail. + // it higher in case libevent gets a patch for this. Higher-than- + // default maximum of 3 with multiple nameservers to avoid spuriously + // marking one down on bursts of timeouts resulting from scans/attacks + // against non-responding authoritative DNS servers. if (evdns_base_count_nameservers(the_evdns_base) == 1) { SET("max-timeouts:", "1000000"); - SET("attempts:", "1"); } else { - SET("max-timeouts:", "3"); + SET("max-timeouts:", "10"); } // Elongate the queue of maximum inflight dns requests, so if a bunch - // time out at the resolver (happens commonly with unbound) we won't + // remain pending at the resolver (happens commonly with Unbound) we won't // stall every other DNS request. This potentially means some wasted // CPU as there's a walk over a linear queue involved, but this is a // much better tradeoff compared to just failing DNS requests because // of a full queue. SET("max-inflight:", "8192"); - // Time out after 5 seconds if no reply. + // Two retries at 5 and 10 seconds for bind9/named which relies on + // clients to handle retries. Second retry for retried circuits with + // extended 15 second timeout. Superfluous with local-system Unbound + // instance--has its own elaborate retry scheme. SET("timeout:", "5"); + SET("attempts:","3"); if (options->ServerDNSRandomizeCase) SET("randomize-case:", "1");

1 0

[tor/master] Bug 21394 touchup: Increase DNS attempts to 3
by nickm＠torproject.org 04 Apr '18

04 Apr '18

commit 06484eb5e19081f478c0c5569e2de6fcfb8d3531 Author: Dhalgren <dhalgren.tor(a)gmail.com> Date: Sun Apr 1 05:01:51 2018 +0000 Bug 21394 touchup: Increase DNS attempts to 3 Also don't give up on a resolver as quickly if multiple are configured. --- changes/bug21394.2 | 7 +++++++ src/or/dns.c | 19 +++++++++++-------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/changes/bug21394.2 b/changes/bug21394.2 new file mode 100644 index 000000000..b580d2a78 --- /dev/null +++ b/changes/bug21394.2 @@ -0,0 +1,7 @@ + o Minor bugfix (Exit node DNS retries): + - Re-attempt timed-out DNS queries 3 times before failure, since our + timeout is 5 seconds for them, but clients wait 10-15. Also allow + slightly more timeouts per resolver before giving up on it in the + case where an exit has multiple resolvers configured. Fixes bug 21394; + bugfix on 0.3.1.9. + diff --git a/src/or/dns.c b/src/or/dns.c index c1e3c3256..33628373d 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -1428,27 +1428,30 @@ configure_nameservers(int force) // If we only have one nameserver, it does not make sense to back off // from it for a timeout. Unfortunately, the value for max-timeouts is // currently clamped by libevent to 255, but it does not hurt to set - // it higher in case libevent gets a patch for this. - // Reducing attempts in the case of just one name server too, because - // it is very likely to be a local one where a network connectivity - // issue should not cause an attempt to fail. + // it higher in case libevent gets a patch for this. Higher-than- + // default maximum of 3 with multiple nameservers to avoid spuriously + // marking one down on bursts of timeouts resulting from scans/attacks + // against non-responding authoritative DNS servers. if (evdns_base_count_nameservers(the_evdns_base) == 1) { SET("max-timeouts:", "1000000"); - SET("attempts:", "1"); } else { - SET("max-timeouts:", "3"); + SET("max-timeouts:", "10"); } // Elongate the queue of maximum inflight dns requests, so if a bunch - // time out at the resolver (happens commonly with unbound) we won't + // remain pending at the resolver (happens commonly with Unbound) we won't // stall every other DNS request. This potentially means some wasted // CPU as there's a walk over a linear queue involved, but this is a // much better tradeoff compared to just failing DNS requests because // of a full queue. SET("max-inflight:", "8192"); - // Time out after 5 seconds if no reply. + // Two retries at 5 and 10 seconds for bind9/named which relies on + // clients to handle retries. Second retry for retried circuits with + // extended 15 second timeout. Superfluous with local-system Unbound + // instance--has its own elaborate retry scheme. SET("timeout:", "5"); + SET("attempts:","3"); if (options->ServerDNSRandomizeCase) SET("randomize-case:", "1");

1 0

[tor/maint-0.3.3] Merge branch 'bug21394_029_redux' into maint-0.3.3
by nickm＠torproject.org 04 Apr '18

04 Apr '18

commit ec8ee541296f3ca494421cd8c8f9903e848823ec Merge: 7ccb1c5a8 06484eb5e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 4 08:55:37 2018 -0400 Merge branch 'bug21394_029_redux' into maint-0.3.3 changes/bug21394.2 | 7 +++++++ src/or/dns.c | 19 +++++++++++-------- 2 files changed, 18 insertions(+), 8 deletions(-)

1 0

[tor/master] ticket(25645): remove unused variable n_possible from channel_get_for_extend()
by nickm＠torproject.org 04 Apr '18

04 Apr '18

commit 2680a8b5b108ff1532b1aa59849e3156ce76f52b Author: Deepesh Pathak <deepshpathak(a)gmail.com> Date: Tue Apr 3 09:17:23 2018 +0530 ticket(25645): remove unused variable n_possible from channel_get_for_extend() --- changes/ticket25645 | 4 ++++ src/or/channel.c | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/changes/ticket25645 b/changes/ticket25645 new file mode 100644 index 000000000..ab20a5ca4 --- /dev/null +++ b/changes/ticket25645 @@ -0,0 +1,4 @@ + o Minor bugfixes (channel_get_for_extend()): + - Remove the unused variable n_possible from the function + Fixes bug 25645; bugfix on 0.2.4.4-alpha + diff --git a/src/or/channel.c b/src/or/channel.c index a9483ee02..af2558e1f 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -2387,7 +2387,7 @@ channel_get_for_extend(const char *rsa_id_digest, { channel_t *chan, *best = NULL; int n_inprogress_goodaddr = 0, n_old = 0; - int n_noncanonical = 0, n_possible = 0; + int n_noncanonical = 0; tor_assert(msg_out); tor_assert(launch_out); @@ -2450,8 +2450,6 @@ channel_get_for_extend(const char *rsa_id_digest, continue; } - ++n_possible; - if (!best) { best = chan; /* If we have no 'best' so far, this one is good enough. */ continue;

1 0

[tor/master] Merge remote-tracking branch 'fristonio/ticket-25645'
by nickm＠torproject.org 04 Apr '18

04 Apr '18

commit 218b1746baea65c06551f7e2736d382e6a01a49d Merge: 21c81348a 2680a8b5b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 3 19:19:02 2018 -0400 Merge remote-tracking branch 'fristonio/ticket-25645' changes/ticket25645 | 4 ++++ src/or/channel.c | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-)

1 0