February 2015 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 24 Feb '15

24 Feb '15

commit 51e36026e5b04384bf3311354ef0cd5a5cbf2d59 Merge: 1525eee 2bcb596 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 24 13:24:57 2015 -0500 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.5'
by nickm＠torproject.org 24 Feb '15

24 Feb '15

commit cc6fd9833cbea1e148114af007c83906789b58ec Merge: 4a17c54 51e3602 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 24 13:25:47 2015 -0500 Merge remote-tracking branch 'origin/maint-0.2.5'

1 0

[tor/maint-0.2.6] Merge remote-tracking branch 'public/bug14129_024' into maint-0.2.4
by nickm＠torproject.org 24 Feb '15

24 Feb '15

commit 2bcb596dcf3dd5972de3875da3f1d9485115ce38 Merge: 8e61d38 9052874 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 24 13:23:44 2015 -0500 Merge remote-tracking branch 'public/bug14129_024' into maint-0.2.4 changes/bug14129 | 7 +++++++ src/or/dns.c | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 24 Feb '15

24 Feb '15

commit 51e36026e5b04384bf3311354ef0cd5a5cbf2d59 Merge: 1525eee 2bcb596 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 24 13:24:57 2015 -0500 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

1 0

[tor/maint-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 24 Feb '15

24 Feb '15

commit 51df1f9906510521d1641841d6687e1ab700800a Merge: fec73c8 51e3602 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 24 13:25:32 2015 -0500 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6

1 0

[tor/maint-0.2.5] Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 24 Feb '15

24 Feb '15

commit 51e36026e5b04384bf3311354ef0cd5a5cbf2d59 Merge: 1525eee 2bcb596 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 24 13:24:57 2015 -0500 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

1 0

[tor/maint-0.2.5] Merge remote-tracking branch 'public/bug14129_024' into maint-0.2.4
by nickm＠torproject.org 24 Feb '15

24 Feb '15

commit 2bcb596dcf3dd5972de3875da3f1d9485115ce38 Merge: 8e61d38 9052874 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 24 13:23:44 2015 -0500 Merge remote-tracking branch 'public/bug14129_024' into maint-0.2.4 changes/bug14129 | 7 +++++++ src/or/dns.c | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.2.4] Avoid attempts to double-remove edge connections from the DNS resolver.
by nickm＠torproject.org 24 Feb '15

24 Feb '15

commit 905287415b834db1a92205e8436f66a3b2d6846c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 8 11:00:21 2015 -0500 Avoid attempts to double-remove edge connections from the DNS resolver. Also, avoid crashing when we attempt to double-remove an edge connection from the DNS resolver: just log a bug warning instead. Fixes bug 14129. Bugfix on 0d20fee2fbd48978, which was in 0.0.7rc1. jowr found the bug. cypherpunks wrote the fix. I added the log message and removed the assert. --- changes/bug14129 | 7 +++++++ src/or/dns.c | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/changes/bug14129 b/changes/bug14129 new file mode 100644 index 0000000..6153cd8 --- /dev/null +++ b/changes/bug14129 @@ -0,0 +1,7 @@ + o Major bugfixes (exit node stability): + + - Fix an assertion failure that could occur under high DNS load. Fixes + bug 14129; bugfix on Tor 0.0.7rc1. Found by "jowr"; diagnosed and fixed + by "cypherpunks". + + diff --git a/src/or/dns.c b/src/or/dns.c index fb1b10d..8b6e3b0 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -557,6 +557,8 @@ purge_expired_resolves(time_t now) /* Connections should only be pending if they have no socket. */ tor_assert(!SOCKET_OK(pend->conn->base_.s)); pendconn = pend->conn; + /* Prevent double-remove */ + pendconn->base_.state = EXIT_CONN_STATE_RESOLVEFAILED; if (!pendconn->base_.marked_for_close) { connection_edge_end(pendconn, END_STREAM_REASON_TIMEOUT); circuit_detach_stream(circuit_get_by_edge_conn(pendconn), pendconn); @@ -1132,7 +1134,9 @@ connection_dns_remove(edge_connection_t *conn) return; /* more are pending */ } } - tor_assert(0); /* not reachable unless onlyconn not in pending list */ + log_warn(LD_BUG, "Connection (fd "TOR_SOCKET_T_FORMAT") was not waiting " + "for a resolve of %s, but we tried to remove it.", + conn->base_.s, escaped_safe_str(conn->base_.address)); } }

1 0

[tor/maint-0.2.4] Merge remote-tracking branch 'public/bug14129_024' into maint-0.2.4
by nickm＠torproject.org 24 Feb '15

24 Feb '15

commit 2bcb596dcf3dd5972de3875da3f1d9485115ce38 Merge: 8e61d38 9052874 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 24 13:23:44 2015 -0500 Merge remote-tracking branch 'public/bug14129_024' into maint-0.2.4 changes/bug14129 | 7 +++++++ src/or/dns.c | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-)

1 0

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation＠torproject.org 24 Feb '15

24 Feb '15

commit 47a1bb550a261d210a0a1736b49b65f50224f5df Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 24 18:15:50 2015 +0000 Update translations for abouttor-homepage_completed --- pt/aboutTor.dtd | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pt/aboutTor.dtd b/pt/aboutTor.dtd index 00c5e66..bdfaec2 100644 --- a/pt/aboutTor.dtd +++ b/pt/aboutTor.dtd @@ -8,40 +8,40 @@ <!ENTITY aboutTor.outOfDateTorOn.label "CONTUDO, este navegador está desatualizado."> <!ENTITY aboutTor.outOfDateTorOff.label "TAMBÉM, este navegador está desatualizado."> -<!ENTITY aboutTor.outOfDate2.label "Clique na cebola e escolha Procurar por atualizações do Tor"> +<!ENTITY aboutTor.outOfDate2.label "Clique na cebola e escolha Procurar por Atualizações do Navegador Tor"> -<!ENTITY aboutTor.check.label "Testar as Definições da Rede Tor"> +<!ENTITY aboutTor.check.label "Testar as Configurações da Rede Tor"> <!ENTITY aboutTor.success.label "Parabéns!"> <!ENTITY aboutTor.success2.label "Este navegador está configurado para utilizar o Tor."> -<!ENTITY aboutTor.success3.label "Agora já pode navegar a Internet de forma anónima."> -<!ENTITY aboutTor.failure.label "Algo Correu Mal!"> +<!ENTITY aboutTor.success3.label "Agora já pode navegar na Internet anonimamente."> +<!ENTITY aboutTor.failure.label "Ocorreu Algo de Errado!"> <!ENTITY aboutTor.failure2.label "O Tor não está a funcionar neste navegador."> -<!ENTITY aboutTor.failure3prefix.label "Para assistência, por favor contacte"> +<!ENTITY aboutTor.failure3prefix.label "Para assistência, por favor, contacte"> <!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> <!ENTITY aboutTor.failure3suffix.label "."> -<!ENTITY aboutTor.search.label "Pesquisar"> +<!ENTITY aboutTor.search.label "Procurar"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> <!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> <!ENTITY aboutTor.torInfo1.label "Informação adicional:"> -<!ENTITY aboutTor.torInfo2.label "País e endereço IP:"> +<!ENTITY aboutTor.torInfo2.label "País e Endereço de IP:"> <!ENTITY aboutTor.torInfo3.label "Nó de saída:"> -<!ENTITY aboutTor.torInfo4.label "Este servidor não guarda informação dos visitantes."> -<!ENTITY aboutTor.whatnextQuestion.label "O que se segue?"> +<!ENTITY aboutTor.torInfo4.label "Este servidor não regista qualquer informação sobre os visitantes."> +<!ENTITY aboutTor.whatnextQuestion.label "E a seguir?"> <!ENTITY aboutTor.whatnextAnswer.label "O Tor NÃO é tudo o que precisa para navegar anonimamente na internet! Poderá ter que mudar alguns dos seus hábitos de navegação para ter a certeza que a sua identidade está segura."> -<!ENTITY aboutTor.whatnext.label "Dicas sobre como se tornar anónimo »"> +<!ENTITY aboutTor.whatnext.label "Dicas Sobre Como se Manter Anónimo »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> -<!ENTITY aboutTor.helpInfo1.label "Você pode ajudar!"> -<!ENTITY aboutTor.helpInfo2.label "Há muitas maneiras para ajudar a rede Tor tornar-se mais rápida e forte:"> -<!ENTITY aboutTor.helpInfo3.label "Criar um Nó de Relay Tor »"> +<!ENTITY aboutTor.helpInfo1.label "Você Pode Ajudar!"> +<!ENTITY aboutTor.helpInfo2.label "Existem muitas maneiras para ajudar a tornar a rede Tor mais rápida e segura:"> +<!ENTITY aboutTor.helpInfo3.label "Execute um Nó de Retransmissão Tor »"> <!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> -<!ENTITY aboutTor.helpInfo4.label "Voluntarie os seus serviços »"> +<!ENTITY aboutTor.helpInfo4.label "Voluntarie os Seus Serviços »"> <!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.helpInfo5.label "Faça um donativo »"> +<!ENTITY aboutTor.helpInfo5.label "Efetue um Donativo »"> <!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> <!ENTITY aboutTor.footer.label "O Projeto Tor é uma organização sem fins lucrativos US 501(c)(3) dedicada à investigação, desenvolvimento e promoção de anonimidade e privacidade online.">

1 0