- tor-commits - lists.torproject.org

[tor/master] Format IPv6 policies correctly.
by nickm＠torproject.org 08 Dec '15

08 Dec '15

commit e9bf584694a592852293b945575d17ea4c3b742b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 8 08:42:52 2015 -0500 Format IPv6 policies correctly. Previously we'd suppressed the mask-bits field in the output when formatting a policy if it was >=32. But that should be a >=128 if we're talking about IPv6. Since we didn't put these in descriptors, this bug affects only log messages and controller outputs. Fix for bug 16056. The code in question was new in 0.2.0, but the bug was introduced in 0.2.4 when we started supporting IPv6 exits. --- changes/bug16056 | 4 ++++ src/or/policies.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/changes/bug16056 b/changes/bug16056 new file mode 100644 index 0000000..e3311c0 --- /dev/null +++ b/changes/bug16056 @@ -0,0 +1,4 @@ + o Minor bugfixes (relay, IPv6): + - When displaying an IPv6 exit policy, include the mask bits correctly + even when the number is greater than 31. Fixes bug 16056; bugfix on + 0.2.4.7-alpha. Patch from "gturner". \ No newline at end of file diff --git a/src/or/policies.c b/src/or/policies.c index 9c858ec..b247e6a 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -1391,9 +1391,9 @@ policy_write_item(char *buf, size_t buflen, addr_policy_t *policy, if (result < 0) return -1; written += strlen(buf); - /* If the maskbits is 32 we don't need to give it. If the mask is 0, - * we already wrote "*". */ - if (policy->maskbits < 32 && policy->maskbits > 0) { + /* If the maskbits is 32 (IPv4) or 128 (IPv6) we don't need to give it. If + the mask is 0, we already wrote "*". */ + if (policy->maskbits < (is_ip6?128:32) && policy->maskbits > 0) { if (tor_snprintf(buf+written, buflen-written, "/%d", policy->maskbits)<0) return -1; written += strlen(buf+written);

1 0

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

08 Dec '15

commit 1321608786c452ab9f0bf19f37509938f7755117 Merge: d6adb26 e9bf584 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 8 08:45:09 2015 -0500 Merge branch 'maint-0.2.7' changes/bug16056 | 4 ++++ src/or/policies.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.2.7] Format IPv6 policies correctly.
by nickm＠torproject.org 08 Dec '15

08 Dec '15

commit e9bf584694a592852293b945575d17ea4c3b742b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 8 08:42:52 2015 -0500 Format IPv6 policies correctly. Previously we'd suppressed the mask-bits field in the output when formatting a policy if it was >=32. But that should be a >=128 if we're talking about IPv6. Since we didn't put these in descriptors, this bug affects only log messages and controller outputs. Fix for bug 16056. The code in question was new in 0.2.0, but the bug was introduced in 0.2.4 when we started supporting IPv6 exits. --- changes/bug16056 | 4 ++++ src/or/policies.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/changes/bug16056 b/changes/bug16056 new file mode 100644 index 0000000..e3311c0 --- /dev/null +++ b/changes/bug16056 @@ -0,0 +1,4 @@ + o Minor bugfixes (relay, IPv6): + - When displaying an IPv6 exit policy, include the mask bits correctly + even when the number is greater than 31. Fixes bug 16056; bugfix on + 0.2.4.7-alpha. Patch from "gturner". \ No newline at end of file diff --git a/src/or/policies.c b/src/or/policies.c index 9c858ec..b247e6a 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -1391,9 +1391,9 @@ policy_write_item(char *buf, size_t buflen, addr_policy_t *policy, if (result < 0) return -1; written += strlen(buf); - /* If the maskbits is 32 we don't need to give it. If the mask is 0, - * we already wrote "*". */ - if (policy->maskbits < 32 && policy->maskbits > 0) { + /* If the maskbits is 32 (IPv4) or 128 (IPv6) we don't need to give it. If + the mask is 0, we already wrote "*". */ + if (policy->maskbits < (is_ip6?128:32) && policy->maskbits > 0) { if (tor_snprintf(buf+written, buflen-written, "/%d", policy->maskbits)<0) return -1; written += strlen(buf+written);

1 0

[tor/master] Fix memory leak in ntor test
by nickm＠torproject.org 08 Dec '15

08 Dec '15

commit 4ae555facef43555452cae42ba658de4f87cfa7b Author: cypherpunks <cypherpunks(a)torproject.org> Date: Mon Nov 16 13:21:56 2015 +0100 Fix memory leak in ntor test --- src/test/test_ntor_cl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/test_ntor_cl.c b/src/test/test_ntor_cl.c index bfbf13a..915a5d0 100644 --- a/src/test/test_ntor_cl.c +++ b/src/test/test_ntor_cl.c @@ -106,6 +106,7 @@ server1(int argc, char **argv) done: tor_free(keys); tor_free(hexkeys); + dimap_free(keymap, NULL); return result; }

1 0

[tor/master] Add changes file for 17778
by nickm＠torproject.org 08 Dec '15

08 Dec '15

commit d6adb26a49c516475ca5ef0f32a1c255cc131fe8 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Mon Nov 16 15:12:44 2015 +0100 Add changes file for 17778 --- changes/bug17778 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug17778 b/changes/bug17778 new file mode 100644 index 0000000..9844969 --- /dev/null +++ b/changes/bug17778 @@ -0,0 +1,3 @@ + o Minor bugfixes (tests): + - Fix a memory leak in the ntor test. Fixes bug 17778; bugfix on + 0.2.4.8-alpha.

1 0

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

08 Dec '15

commit 0519ae56ebccbaf91a3747e81b92361de799f29d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 8 13:16:27 2015 +0000 Update translations for tor-messenger-conversationsproperties --- el/conversations.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/el/conversations.properties b/el/conversations.properties index 26041ff..8743c03 100644 --- a/el/conversations.properties +++ b/el/conversations.properties @@ -15,7 +15,7 @@ statusChanged=%1$S είναι τώρα %2$S. # %1$S is the display name of the contact. # %2$S is the new status type (a value from status.properties). # %3$S is the status text (eg. "I'm currently away from the computer"). -statusChangedWithStatusText=%1$S is now %2$S: %3$S. +statusChangedWithStatusText=%1$S είναι τώρα %2$S: %3$S. # LOCALIZATION NOTE (statusChangedFromUnknown[WithStatusText]): # special case of the previous 2 strings for when the status was # previously unknown. These 2 strings should not mislead the user @@ -45,7 +45,7 @@ noTopic=No topic message for this room. # LOCALIZATION NOTE (topicSet): # %1$S is the conversation name, %2$S is the topic. -topicSet=The topic for %1$S is: %2$S. +topicSet=Το θέμα για %1$S είναι: %2$S. # LOCALIZATION NOTE (topicNotSet): # %S is the conversation name. topicNotSet=There is no topic for %S.

1 0

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

08 Dec '15

commit 72f62077da50023518df12eccdf916e5a84857b7 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 8 13:15:50 2015 +0000 Update translations for abouttor-homepage --- lv/aboutTor.dtd | 2 +- pt_BR/aboutTor.dtd | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lv/aboutTor.dtd b/lv/aboutTor.dtd index c24738c..86aabf0 100644 --- a/lv/aboutTor.dtd +++ b/lv/aboutTor.dtd @@ -6,7 +6,7 @@ <!ENTITY aboutTor.title "Par Tor"> -<!ENTITY aboutTor.outOfDateTorOn.label "WARNING: this browser is out of date."> +<!ENTITY aboutTor.outOfDateTorOn.label "BRĪDINĀJUMS: šis pārlūks ir novecojis."> <!ENTITY aboutTor.outOfDateTorOff.label "Turklāt šis pārlūks ir novecojis."> <!ENTITY aboutTor.outOfDate2.label "Noklikšķiniet uz sīpola un tad izvēlieties Pārbaudīt atjauninājumus pārlūkam Tor. "> diff --git a/pt_BR/aboutTor.dtd b/pt_BR/aboutTor.dtd index f9254e0..752d81d 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 "Welcome to Tor Browser"> +<!ENTITY aboutTor.success.label "Boas-vindas ao Navegador Tor!"> <!ENTITY aboutTor.success2.label "Connected to the Tor network."> <!ENTITY aboutTor.success3.label "Sinta-se à vontade para navegar anonimamente na Internet."> <!ENTITY aboutTor.failure.label "Alguma coisa deu errado!"> @@ -31,7 +31,7 @@ <!ENTITY aboutTor.torInfo2.label "País e Endereço IP:"> <!ENTITY aboutTor.torInfo3.label "Nó de saída:"> <!ENTITY aboutTor.torInfo4.label "Este servidor não registra nenhuma informação sobre os seus usuários."> -<!ENTITY aboutTor.whatnextQuestion.label "E depois?"> +<!ENTITY aboutTor.whatnextQuestion.label "O que mais?"> <!ENTITY aboutTor.whatnextAnswer.label "Tor NÃO é tudo o que você precisa para navegar anonimamente! Para isso, você precisará mudar alguns hábitos de utilização da Internet, que garantirão a proteção da sua identidade. "> <!ENTITY aboutTor.whatnext.label "Dicas para garantir seu anonimato""> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning">

1 0

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

08 Dec '15

commit 20506e96d0db29f4733c0d720bf6c2db15400bcc Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 8 13:15:30 2015 +0000 Update translations for tails-greeter_completed --- da/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/da/da.po b/da/da.po index 9b9c11c..9081964 100644 --- a/da/da.po +++ b/da/da.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-02 21:29+0100\n" -"PO-Revision-Date: 2015-12-08 12:23+0000\n" +"PO-Revision-Date: 2015-12-08 12:47+0000\n" "Last-Translator: Tommy Gade\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n"

1 0

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

08 Dec '15

commit bd3fdafd14b387190fdc93ab607197e710ba5f9c Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 8 13:15:26 2015 +0000 Update translations for tails-greeter --- da/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/da/da.po b/da/da.po index 9b9c11c..9081964 100644 --- a/da/da.po +++ b/da/da.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-02 21:29+0100\n" -"PO-Revision-Date: 2015-12-08 12:23+0000\n" +"PO-Revision-Date: 2015-12-08 12:47+0000\n" "Last-Translator: Tommy Gade\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n"

1 0

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

08 Dec '15

commit f5e3e44702141aae47b35420b312c963f12a5f3c Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 8 12:49:34 2015 +0000 Update translations for torbutton-abouttbupdatedtd --- el/abouttbupdate.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/el/abouttbupdate.dtd b/el/abouttbupdate.dtd index 37567bd..565f3cf 100644 --- a/el/abouttbupdate.dtd +++ b/el/abouttbupdate.dtd @@ -1,6 +1,6 @@ <!ENTITY aboutTBUpdate.title "Tor Browser Update"> <!ENTITY aboutTBUpdate.updated "Tor Browser has been updated."> -<!ENTITY aboutTBUpdate.linkPrefix "For the most up-to-date information about this release, "> -<!ENTITY aboutTBUpdate.linkLabel "visit our website"> +<!ENTITY aboutTBUpdate.linkPrefix "Για τις πιο πρόοσφατες πληροφορίες για αυτή την έκδοση,"> +<!ENTITY aboutTBUpdate.linkLabel "επισκεφθείτε την ιστοσελίδα μας"> <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.changeLogHeading "Changelog:">

1 0