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

[tor/master] Merge branch 'maint-0.2.7'
by nickm＠torproject.org 08 Dec '15

08 Dec '15

commit b585cf3ca38a947450cafacaef4d85db6c377635 Merge: 95c03b2 eeb9751 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 8 09:44:01 2015 -0500 Merge branch 'maint-0.2.7' changes/bug17781 | 3 +++ 1 file changed, 3 insertions(+)

1 0

[tor/maint-0.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 08 Dec '15

08 Dec '15

commit 432852577000ab5eb07ae3ca961a36e5f6e796ba Merge: e8e89fd b0867fe Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 8 09:38:48 2015 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug17781 | 3 +++ src/or/connection_edge.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.2.6] Fix a compilation warning introduced by clang 3.6
by nickm＠torproject.org 08 Dec '15

08 Dec '15

commit b0867fec964a8692e9c605da82b3a3393eeaf451 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 8 09:37:05 2015 -0500 Fix a compilation warning introduced by clang 3.6 There was a dead check when we made sure that an array member of a struct was non-NULL. Tor has been doing this check since at least 0.2.3, maybe earlier. Fixes bug 17781. --- changes/bug17781 | 3 +++ src/or/connection_edge.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug17781 b/changes/bug17781 new file mode 100644 index 0000000..01ed231 --- /dev/null +++ b/changes/bug17781 @@ -0,0 +1,3 @@ + o Compilation fixes: + - Fix a compilation warning with Clang 3.6: Do not check the + presence of an address which can never be NULL. Fixes bug 17781. diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 895c0f7..39f8af6 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -748,7 +748,7 @@ connection_ap_fail_onehop(const char *failed_digest, /* we don't know the digest; have to compare addr:port */ tor_addr_t addr; if (!build_state || !build_state->chosen_exit || - !entry_conn->socks_request || !entry_conn->socks_request->address) + !entry_conn->socks_request) continue; if (tor_addr_parse(&addr, entry_conn->socks_request->address)<0 || !tor_addr_eq(&build_state->chosen_exit->addr, &addr) ||

1 0

[tor/maint-0.2.6] Merge branch 'maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 08 Dec '15

08 Dec '15

commit b53ff8606714c2f94d251a40c1a073bca760495e Merge: 089ee13 4328525 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 8 09:43:25 2015 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug17781 | 3 +++ 1 file changed, 3 insertions(+)

1 0

[tor/maint-0.2.4] Fix a compilation warning introduced by clang 3.6
by nickm＠torproject.org 08 Dec '15

08 Dec '15

commit b0867fec964a8692e9c605da82b3a3393eeaf451 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 8 09:37:05 2015 -0500 Fix a compilation warning introduced by clang 3.6 There was a dead check when we made sure that an array member of a struct was non-NULL. Tor has been doing this check since at least 0.2.3, maybe earlier. Fixes bug 17781. --- changes/bug17781 | 3 +++ src/or/connection_edge.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug17781 b/changes/bug17781 new file mode 100644 index 0000000..01ed231 --- /dev/null +++ b/changes/bug17781 @@ -0,0 +1,3 @@ + o Compilation fixes: + - Fix a compilation warning with Clang 3.6: Do not check the + presence of an address which can never be NULL. Fixes bug 17781. diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 895c0f7..39f8af6 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -748,7 +748,7 @@ connection_ap_fail_onehop(const char *failed_digest, /* we don't know the digest; have to compare addr:port */ tor_addr_t addr; if (!build_state || !build_state->chosen_exit || - !entry_conn->socks_request || !entry_conn->socks_request->address) + !entry_conn->socks_request) continue; if (tor_addr_parse(&addr, entry_conn->socks_request->address)<0 || !tor_addr_eq(&build_state->chosen_exit->addr, &addr) ||

1 0

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

08 Dec '15

commit d60fbb79684662de1e7cdc45f6de0225e8aca6c0 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 8 14:15:45 2015 +0000 Update translations for abouttor-homepage_completed --- pt_BR/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/aboutTor.dtd b/pt_BR/aboutTor.dtd index 4c018fa..2f321cf 100644 --- a/pt_BR/aboutTor.dtd +++ b/pt_BR/aboutTor.dtd @@ -12,7 +12,7 @@ <!ENTITY aboutTor.check.label "Testar as configurações de rede Tor"> -<!ENTITY aboutTor.success.label "Boas-vindas no Navegador Tor!"> +<!ENTITY aboutTor.success.label "Boas-vindas ao Navegador Tor!"> <!ENTITY aboutTor.success2.label "Conectad0 à rede Tor!"> <!ENTITY aboutTor.success3.label "Sinta-se à vontade para navegar anonimamente na Internet."> <!ENTITY aboutTor.failure.label "Alguma coisa deu errado!">

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 08 Dec '15

08 Dec '15

commit 730c5f5669f9e72894adc5396c8286e3de4972f6 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 8 14:15:41 2015 +0000 Update translations for abouttor-homepage --- pt_BR/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/aboutTor.dtd b/pt_BR/aboutTor.dtd index 4c018fa..2f321cf 100644 --- a/pt_BR/aboutTor.dtd +++ b/pt_BR/aboutTor.dtd @@ -12,7 +12,7 @@ <!ENTITY aboutTor.check.label "Testar as configurações de rede Tor"> -<!ENTITY aboutTor.success.label "Boas-vindas no Navegador Tor!"> +<!ENTITY aboutTor.success.label "Boas-vindas ao Navegador Tor!"> <!ENTITY aboutTor.success2.label "Conectad0 à rede Tor!"> <!ENTITY aboutTor.success3.label "Sinta-se à vontade para navegar anonimamente na Internet."> <!ENTITY aboutTor.failure.label "Alguma coisa deu errado!">

1 0

[tor/master] Fix memory leak by circuit marked for close list
by nickm＠torproject.org 08 Dec '15

08 Dec '15

commit 95c03b29de3f6e8c67c7638a9de16ddaa4731948 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Tue Dec 1 13:34:31 2015 +0100 Fix memory leak by circuit marked for close list This commit fixes a memory leak introduced by commit 8b4e5b7ee902fb7fa07767410a18433d752c7aef. --- src/or/circuitlist.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index c4992d4..15b8748 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -911,6 +911,9 @@ circuit_free_all(void) smartlist_free(circuits_pending_chans); circuits_pending_chans = NULL; + smartlist_free(circuits_pending_close); + circuits_pending_close = NULL; + { chan_circid_circuit_map_t **elt, **next, *c; for (elt = HT_START(chan_circid_map, &chan_circid_map);

1 0

[translation/tor-messenger-otrproperties_completed] Update translations for tor-messenger-otrproperties_completed
by translation＠torproject.org 08 Dec '15

08 Dec '15

commit 6c0bca816cb529ffdf694724258ee19099f60d90 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 8 13:46:36 2015 +0000 Update translations for tor-messenger-otrproperties_completed --- da/otr.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/da/otr.properties b/da/otr.properties index c9770ab..be3b380 100644 --- a/da/otr.properties +++ b/da/otr.properties @@ -11,7 +11,7 @@ msgevent.rcvdmsg_malformed=Vi modtog en misdannet data meddelelse fra %S. msgevent.log_heartbeat_rcvd=Hjerteslag modtaget fra %S. msgevent.log_heartbeat_sent=Hjerteslag sendt til %S. msgevent.rcvdmsg_general_err=En OTR fejl opstod. -msgevent.rcvdmsg_unecrypted=Vi modtog en ikke krypteret meddelelse fra %S. +msgevent.rcvdmsg_unecrypted=Følgende besked modtaget fra %S var ikke krypteret: %S msgevent.rcvdmsg_unrecognized=Vi modtog en ugenkendelig OTR meddelelse fra %S. msgevent.rcvdmsg_for_other_instance=%S har sendt en meddelelse beregnet til en anden session. Hvis du er logget ind flere gange, kunne en anden session have modtaget beskeden. context.gone_secure_private=Privat samtale med %S er startet.

1 0

[translation/tor-messenger-otrproperties] Update translations for tor-messenger-otrproperties
by translation＠torproject.org 08 Dec '15

08 Dec '15

commit 866125d5b0e380616b6c5bb3869a0f942758b751 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 8 13:46:33 2015 +0000 Update translations for tor-messenger-otrproperties --- da/otr.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/da/otr.properties b/da/otr.properties index 7fb2be9..be3b380 100644 --- a/da/otr.properties +++ b/da/otr.properties @@ -11,7 +11,7 @@ msgevent.rcvdmsg_malformed=Vi modtog en misdannet data meddelelse fra %S. msgevent.log_heartbeat_rcvd=Hjerteslag modtaget fra %S. msgevent.log_heartbeat_sent=Hjerteslag sendt til %S. msgevent.rcvdmsg_general_err=En OTR fejl opstod. -msgevent.rcvdmsg_unecrypted=The following message received from %S was not encrypted: %S +msgevent.rcvdmsg_unecrypted=Følgende besked modtaget fra %S var ikke krypteret: %S msgevent.rcvdmsg_unrecognized=Vi modtog en ugenkendelig OTR meddelelse fra %S. msgevent.rcvdmsg_for_other_instance=%S har sendt en meddelelse beregnet til en anden session. Hvis du er logget ind flere gange, kunne en anden session have modtaget beskeden. context.gone_secure_private=Privat samtale med %S er startet.

1 0