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

[tor/master] Fix crash on HUP with mixed ephemeral services
by nickm＠torproject.org 18 May '15

18 May '15

commit 6f9e90101e64040bda38c34de884f3d996677ac9 Author: John Brooks <john.brooks(a)dereferenced.net> Date: Sat May 16 19:50:18 2015 -0600 Fix crash on HUP with mixed ephemeral services Ephemeral services will be listed in rend_services_list at the end of rend_config_services, so it must check whether directory is non-NULL before comparing. This crash happens when reloading config on a tor with mixed configured and ephemeral services. Fixes bug #16060. Bugfix on 0.2.7.1-alpha. --- changes/bug16060 | 4 ++++ src/or/rendservice.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug16060 b/changes/bug16060 new file mode 100644 index 0000000..eb0b50f --- /dev/null +++ b/changes/bug16060 @@ -0,0 +1,4 @@ + o Minor bugfixes (hidden service): + - Fix a crash when reloading configuration while at least one + configured and one ephemeral hidden service exists. Fixes bug 16060; + bugfix on 0.2.7.1-alpha. diff --git a/src/or/rendservice.c b/src/or/rendservice.c index e170760..daca4cc 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -709,7 +709,8 @@ rend_config_services(const or_options_t *options, int validate_only) * probably ok? */ SMARTLIST_FOREACH_BEGIN(rend_service_list, rend_service_t *, new) { SMARTLIST_FOREACH_BEGIN(old_service_list, rend_service_t *, old) { - if (!strcmp(old->directory, new->directory)) { + if (new->directory && old->directory && + !strcmp(old->directory, new->directory)) { smartlist_add_all(new->intro_nodes, old->intro_nodes); smartlist_clear(old->intro_nodes); smartlist_add(surviving_services, old);

1 0

[tor/master] Merge remote-tracking branch 'special/bug16060'
by nickm＠torproject.org 18 May '15

18 May '15

commit 0d3b3a4a2308c955f75825a145a22997b7008552 Merge: cc1943b 6f9e901 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 18 11:56:16 2015 -0400 Merge remote-tracking branch 'special/bug16060' changes/bug16060 | 4 ++++ src/or/rendservice.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 18 May '15

18 May '15

commit a7a2812657ab86904c2f18ef80bdb7bf685e0f86 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 18 15:45:25 2015 +0000 Update translations for https_everywhere_completed --- pt/https-everywhere.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt/https-everywhere.dtd b/pt/https-everywhere.dtd index 6ae2c1c..136f6eb 100644 --- a/pt/https-everywhere.dtd +++ b/pt/https-everywhere.dtd @@ -40,9 +40,9 @@ <!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0 development.11 notificação"> <!ENTITY https-everywhere.popup.paragraph1 "Ups!. Estava a utilizar a última versão do HTTPS Everywhere estável, mas nós poderemos ter-lhe atualizado acidentalmente para a versão de desenvolvimento no nosso último lançamento."> <!ENTITY https-everywhere.popup.paragraph2 "Gostaria de voltar para a versão estável?"> -<!ENTITY https-everywhere.popup.paragraph3 "Adoraríamos que continuasse a usar a nossa versão de desenvolvimento e ajudasse a tornar HTTPS Everywhere melhor! Poderá encontrar ainda alguns bugs por aí, que poderá relatar para https-everywhere(a)eff.org. Pedimos desculpa pela inconveniência e obrigado por utilizar HTTPS Everywhere."> +<!ENTITY https-everywhere.popup.paragraph3 "Nós iríamos adorar que continuasse a utilizar o nosso lançamento de desenvolvimento e que nos ajudasse a tornar o HTTPS Everywhere melhor! Poderá encontrar ainda alguns erros aqui e acolá, que poderá reportar para https-everywhere(a)eff.org. Pedimos desculpa pela inconveniência, e obrigado por utilizar o HTTPS Everywhere."> <!ENTITY https-everywhere.popup.keep "Manter-me na versão de desenvolvimento"> -<!ENTITY https-everywhere.popup.revert "Descarregar a úlitma versão estável"> +<!ENTITY https-everywhere.popup.revert "Transferir a úlitma versão estável"> <!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests"> <!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancelar">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 18 May '15

18 May '15

commit 51960b3f70ac5ad629d50159dba79082c9f94113 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 18 15:45:19 2015 +0000 Update translations for https_everywhere --- pt/https-everywhere.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt/https-everywhere.dtd b/pt/https-everywhere.dtd index 6ae2c1c..136f6eb 100644 --- a/pt/https-everywhere.dtd +++ b/pt/https-everywhere.dtd @@ -40,9 +40,9 @@ <!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0 development.11 notificação"> <!ENTITY https-everywhere.popup.paragraph1 "Ups!. Estava a utilizar a última versão do HTTPS Everywhere estável, mas nós poderemos ter-lhe atualizado acidentalmente para a versão de desenvolvimento no nosso último lançamento."> <!ENTITY https-everywhere.popup.paragraph2 "Gostaria de voltar para a versão estável?"> -<!ENTITY https-everywhere.popup.paragraph3 "Adoraríamos que continuasse a usar a nossa versão de desenvolvimento e ajudasse a tornar HTTPS Everywhere melhor! Poderá encontrar ainda alguns bugs por aí, que poderá relatar para https-everywhere(a)eff.org. Pedimos desculpa pela inconveniência e obrigado por utilizar HTTPS Everywhere."> +<!ENTITY https-everywhere.popup.paragraph3 "Nós iríamos adorar que continuasse a utilizar o nosso lançamento de desenvolvimento e que nos ajudasse a tornar o HTTPS Everywhere melhor! Poderá encontrar ainda alguns erros aqui e acolá, que poderá reportar para https-everywhere(a)eff.org. Pedimos desculpa pela inconveniência, e obrigado por utilizar o HTTPS Everywhere."> <!ENTITY https-everywhere.popup.keep "Manter-me na versão de desenvolvimento"> -<!ENTITY https-everywhere.popup.revert "Descarregar a úlitma versão estável"> +<!ENTITY https-everywhere.popup.revert "Transferir a úlitma versão estável"> <!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests"> <!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancelar">

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/bug16021_027_01'
by nickm＠torproject.org 18 May '15

18 May '15

commit cc1943bf6e567224cea834e7fac3967582074c3e Merge: b54626f a324d7e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 18 11:29:50 2015 -0400 Merge remote-tracking branch 'dgoulet/bug16021_027_01' src/or/rendcommon.h | 1 + src/test/test_hs.c | 133 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 134 insertions(+)

1 0

[tor/master] Test: add unit test for rend_data_t object and functions
by nickm＠torproject.org 18 May '15

18 May '15

commit a324d7e8e185b1fbeb6f13c6f3a313c6d85dcdfb Author: David Goulet <dgoulet(a)ev0ke.net> Date: Thu May 14 12:08:54 2015 -0400 Test: add unit test for rend_data_t object and functions Closes #16021 Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/or/rendcommon.h | 1 + src/test/test_hs.c | 133 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 134 insertions(+) diff --git a/src/or/rendcommon.h b/src/or/rendcommon.h index 806851c..aacc751 100644 --- a/src/or/rendcommon.h +++ b/src/or/rendcommon.h @@ -73,6 +73,7 @@ void rend_get_descriptor_id_bytes(char *descriptor_id_out, const char *secret_id_part); size_t rend_cache_get_total_allocation(void); +rend_data_t * rend_data_dup(const rend_data_t *data); rend_data_t *rend_data_client_create(const char *onion_address, const char *desc_id, const char *cookie, diff --git a/src/test/test_hs.c b/src/test/test_hs.c index 49681b4..a166f2c 100644 --- a/src/test/test_hs.c +++ b/src/test/test_hs.c @@ -298,7 +298,140 @@ test_pick_bad_tor2web_rendezvous_node(void *arg) routerset_free(options->Tor2webRendezvousPoints); } +/* Make sure rend_data_t is valid at creation, destruction and when + * duplicated. */ +static void +test_hs_rend_data(void *arg) +{ + int rep; + rend_data_t *client; + /* Binary format of a descriptor ID. */ + char desc_id[DIGEST_LEN]; + char client_cookie[REND_DESC_COOKIE_LEN]; + time_t now = time(NULL); + + base32_decode(desc_id, sizeof(desc_id), STR_DESC_ID_BASE32, + REND_DESC_ID_V2_LEN_BASE32); + memset(client_cookie, 'e', sizeof(client_cookie)); + + client = rend_data_client_create(STR_HS_ADDR, desc_id, client_cookie, + REND_NO_AUTH); + tt_assert(client); + tt_int_op(client->auth_type, ==, REND_NO_AUTH); + tt_str_op(client->onion_address, OP_EQ, STR_HS_ADDR); + tt_mem_op(client->desc_id_fetch, OP_EQ, desc_id, sizeof(desc_id)); + tt_mem_op(client->descriptor_cookie, OP_EQ, client_cookie, + sizeof(client_cookie)); + tt_assert(client->hsdirs_fp); + tt_int_op(smartlist_len(client->hsdirs_fp), ==, 0); + for (rep = 0; rep < REND_NUMBER_OF_NON_CONSECUTIVE_REPLICAS; rep++) { + int ret = rend_compute_v2_desc_id(desc_id, client->onion_address, + client->descriptor_cookie, now, rep); + /* That shouldn't never fail. */ + tt_int_op(ret, ==, 0); + tt_mem_op(client->descriptor_id[rep], OP_EQ, desc_id, sizeof(desc_id)); + } + /* The rest should be zeroed because this is a client request. */ + tt_int_op(tor_digest_is_zero(client->rend_pk_digest), ==, 1); + tt_int_op(tor_digest_is_zero(client->rend_cookie), ==, 1); + + /* Test dup(). */ + rend_data_t *client_dup = rend_data_dup(client); + tt_assert(client_dup); + tt_int_op(client_dup->auth_type, ==, client->auth_type); + tt_str_op(client_dup->onion_address, OP_EQ, client->onion_address); + tt_mem_op(client_dup->desc_id_fetch, OP_EQ, client->desc_id_fetch, + sizeof(client_dup->desc_id_fetch)); + tt_mem_op(client_dup->descriptor_cookie, OP_EQ, client->descriptor_cookie, + sizeof(client_dup->descriptor_cookie)); + + tt_assert(client_dup->hsdirs_fp); + tt_int_op(smartlist_len(client_dup->hsdirs_fp), ==, 0); + for (rep = 0; rep < REND_NUMBER_OF_NON_CONSECUTIVE_REPLICAS; rep++) { + tt_mem_op(client_dup->descriptor_id[rep], OP_EQ, + client->descriptor_id[rep], DIGEST_LEN); + } + /* The rest should be zeroed because this is a client request. */ + tt_int_op(tor_digest_is_zero(client_dup->rend_pk_digest), ==, 1); + tt_int_op(tor_digest_is_zero(client_dup->rend_cookie), ==, 1); + rend_data_free(client); + rend_data_free(client_dup); + + /* Reset state. */ + base32_decode(desc_id, sizeof(desc_id), STR_DESC_ID_BASE32, + REND_DESC_ID_V2_LEN_BASE32); + memset(client_cookie, 'e', sizeof(client_cookie)); + + /* Try with different parameters here for which some content should be + * zeroed out. */ + client = rend_data_client_create(NULL, desc_id, NULL, REND_BASIC_AUTH); + tt_assert(client); + tt_int_op(client->auth_type, ==, REND_BASIC_AUTH); + tt_int_op(strlen(client->onion_address), ==, 0); + tt_mem_op(client->desc_id_fetch, OP_EQ, desc_id, sizeof(desc_id)); + tt_int_op(tor_mem_is_zero(client->descriptor_cookie, + sizeof(client->descriptor_cookie)), ==, 1); + tt_assert(client->hsdirs_fp); + tt_int_op(smartlist_len(client->hsdirs_fp), ==, 0); + for (rep = 0; rep < REND_NUMBER_OF_NON_CONSECUTIVE_REPLICAS; rep++) { + tt_int_op(tor_digest_is_zero(client->descriptor_id[rep]), ==, 1); + } + /* The rest should be zeroed because this is a client request. */ + tt_int_op(tor_digest_is_zero(client->rend_pk_digest), ==, 1); + tt_int_op(tor_digest_is_zero(client->rend_cookie), ==, 1); + rend_data_free(client); + + /* Let's test the service object now. */ + rend_data_t *service; + char rend_pk_digest[DIGEST_LEN]; + uint8_t rend_cookie[DIGEST_LEN]; + memset(rend_pk_digest, 'f', sizeof(rend_pk_digest)); + memset(rend_cookie, 'g', sizeof(rend_cookie)); + + service = rend_data_service_create(STR_HS_ADDR, rend_pk_digest, + rend_cookie, REND_NO_AUTH); + tt_assert(service); + tt_int_op(service->auth_type, ==, REND_NO_AUTH); + tt_str_op(service->onion_address, OP_EQ, STR_HS_ADDR); + tt_mem_op(service->rend_pk_digest, OP_EQ, rend_pk_digest, + sizeof(rend_pk_digest)); + tt_mem_op(service->rend_cookie, OP_EQ, rend_cookie, sizeof(rend_cookie)); + tt_assert(service->hsdirs_fp); + tt_int_op(smartlist_len(service->hsdirs_fp), ==, 0); + for (rep = 0; rep < REND_NUMBER_OF_NON_CONSECUTIVE_REPLICAS; rep++) { + tt_int_op(tor_digest_is_zero(service->descriptor_id[rep]), ==, 1); + } + /* The rest should be zeroed because this is a service request. */ + tt_int_op(tor_digest_is_zero(service->descriptor_cookie), ==, 1); + tt_int_op(tor_digest_is_zero(service->desc_id_fetch), ==, 1); + + /* Test dup(). */ + rend_data_t *service_dup = rend_data_dup(service); + tt_assert(service_dup); + tt_int_op(service_dup->auth_type, ==, service->auth_type); + tt_str_op(service_dup->onion_address, OP_EQ, service->onion_address); + tt_mem_op(service_dup->rend_pk_digest, OP_EQ, service->rend_pk_digest, + sizeof(service_dup->rend_pk_digest)); + tt_mem_op(service_dup->rend_cookie, OP_EQ, service->rend_cookie, + sizeof(service_dup->rend_cookie)); + tt_assert(service_dup->hsdirs_fp); + tt_int_op(smartlist_len(service_dup->hsdirs_fp), ==, 0); + for (rep = 0; rep < REND_NUMBER_OF_NON_CONSECUTIVE_REPLICAS; rep++) { + tt_int_op(tor_digest_is_zero(service_dup->descriptor_id[rep]), ==, 1); + } + /* The rest should be zeroed because this is a service request. */ + tt_int_op(tor_digest_is_zero(service_dup->descriptor_cookie), ==, 1); + tt_int_op(tor_digest_is_zero(service_dup->desc_id_fetch), ==, 1); + rend_data_free(service); + rend_data_free(service_dup); + + done: + return; +} + struct testcase_t hs_tests[] = { + { "hs_rend_data", test_hs_rend_data, TT_FORK, + NULL, NULL }, { "hs_desc_event", test_hs_desc_event, TT_FORK, NULL, NULL }, { "pick_tor2web_rendezvous_node", test_pick_tor2web_rendezvous_node, TT_FORK,

1 0

[tor/master] Silence two make rules
by nickm＠torproject.org 18 May '15

18 May '15

commit b54626fd111f3a76fc14ac33f9a483c6345e57a4 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Mon May 18 11:29:07 2015 -0400 Silence two make rules --- src/or/include.am | 2 +- src/test/include.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/include.am b/src/or/include.am index e315cae..0ce3cdc 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -190,7 +190,7 @@ ORHEADERS = \ noinst_HEADERS+= $(ORHEADERS) micro-revision.i micro-revision.i: FORCE - $(AM_V_GEN)rm -f micro-revision.tmp; \ + $(AM_V_at)rm -f micro-revision.tmp; \ if test -d "$(top_srcdir)/.git" && \ test -x "`which git 2>&1;true`"; then \ HASH="`cd "$(top_srcdir)" && git rev-parse --short=16 HEAD`"; \ diff --git a/src/test/include.am b/src/test/include.am index cfdfc40..c672b3f 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -18,7 +18,7 @@ check-am: set-test-permissions .PHONY: set-test-permissions set-test-permissions: $(TESTSCRIPTS) - chmod u+x $(TESTSCRIPTS) + $(AM_V_at)chmod u+x $(TESTSCRIPTS) noinst_PROGRAMS+= src/test/bench

1 0

[translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed
by translation＠torproject.org 18 May '15

18 May '15

commit faa6faaa3399a34310344875addfb7947bc20d65 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 18 15:17:14 2015 +0000 Update translations for torbutton-abouttorproperties_completed --- it/abouttor.properties | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/it/abouttor.properties b/it/abouttor.properties new file mode 100644 index 0000000..db49b15 --- /dev/null +++ b/it/abouttor.properties @@ -0,0 +1,21 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Cerca <a href="%1$S"> in sicurezza</a>con<a href="%2$S">Starpage</a> +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/ita/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Cerca <a href="%1$S">in modo sicuro</a> con <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ + +aboutTor.searchDC.privacy=Cerca <a href="%1$S"> in sicurezza </a> con <a href="%2$S">Disconnect.me</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDC.privacy.link=https://disconnect.me/privacy +# The following string is a link which replaces %2$S above. +aboutTor.searchDC.search.link=https://search.disconnect.me/

1 0

[translation/torbutton-aboutdialogdtd_completed] Update translations for torbutton-aboutdialogdtd_completed
by translation＠torproject.org 18 May '15

18 May '15

commit bf1346f35df8eb647a912c0640a08b963a47578c Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 18 15:17:07 2015 +0000 Update translations for torbutton-aboutdialogdtd_completed --- pt/aboutdialog.dtd | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pt/aboutdialog.dtd b/pt/aboutdialog.dtd new file mode 100644 index 0000000..8f2ace6 --- /dev/null +++ b/pt/aboutdialog.dtd @@ -0,0 +1,19 @@ +<!ENTITY project.start "&brandShortName; é desenvolvido por "> + +<!ENTITY project.tpoLink "o &vendorShortName;"> +<!ENTITY project.end ", uma sem fins lucrativos, a trabalhar para defender a sua privacidade e liberdade on-line."> + +<!ENTITY help.start "Pretende ajudar?"> + +<!ENTITY help.donateLink "Doar"> +<!ENTITY help.or "ou"> + +<!ENTITY help.getInvolvedLink "contribua"> +<!ENTITY help.end "!"> + +<!ENTITY bottomLinks.questions "Questões?"> + +<!ENTITY bottomLinks.grow "Ajude a Crescer a Rede Tor!"> + +<!ENTITY bottomLinks.license "Informação do Licenciamento"> +<!ENTITY tor.TrademarkStatement "'Tor' e o 'Logótipo Onion' são marcas registadas de Tor Project, Inc.">

1 0

[translation/torbutton-aboutdialogdtd] Update translations for torbutton-aboutdialogdtd
by translation＠torproject.org 18 May '15

18 May '15

commit a5f693fa3aebe4b541252eb76b9a4cf57b6203a6 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 18 15:17:02 2015 +0000 Update translations for torbutton-aboutdialogdtd --- pl/aboutdialog.dtd | 6 +++--- pt/aboutdialog.dtd | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pl/aboutdialog.dtd b/pl/aboutdialog.dtd index 5515896..4d22c7d 100644 --- a/pl/aboutdialog.dtd +++ b/pl/aboutdialog.dtd @@ -3,15 +3,15 @@ <!ENTITY project.tpoLink "the &vendorShortName;"> <!ENTITY project.end ", a nonprofit working to defend your privacy and freedom online."> -<!ENTITY help.start "Want to help? "> +<!ENTITY help.start "Chcesz pomóc?">  <!ENTITY help.donateLink "Darowizna"> -<!ENTITY help.or " or "> +<!ENTITY help.or "lub">  <!ENTITY help.getInvolvedLink "get involved"> <!ENTITY help.end "!">  -<!ENTITY bottomLinks.questions "Questions?"> +<!ENTITY bottomLinks.questions "Pytania?">  <!ENTITY bottomLinks.grow "Help the Tor Network Grow!">  diff --git a/pt/aboutdialog.dtd b/pt/aboutdialog.dtd index c5a3e32..8f2ace6 100644 --- a/pt/aboutdialog.dtd +++ b/pt/aboutdialog.dtd @@ -1,19 +1,19 @@ -<!ENTITY project.start "&brandShortName; is developed by "> +<!ENTITY project.start "&brandShortName; é desenvolvido por ">  -<!ENTITY project.tpoLink "the &vendorShortName;"> -<!ENTITY project.end ", a nonprofit working to defend your privacy and freedom online."> +<!ENTITY project.tpoLink "o &vendorShortName;"> +<!ENTITY project.end ", uma sem fins lucrativos, a trabalhar para defender a sua privacidade e liberdade on-line."> -<!ENTITY help.start "Want to help? "> +<!ENTITY help.start "Pretende ajudar?">  <!ENTITY help.donateLink "Doar"> -<!ENTITY help.or " or "> +<!ENTITY help.or "ou">  -<!ENTITY help.getInvolvedLink "get involved"> +<!ENTITY help.getInvolvedLink "contribua"> <!ENTITY help.end "!">  -<!ENTITY bottomLinks.questions "Questions?"> +<!ENTITY bottomLinks.questions "Questões?">  -<!ENTITY bottomLinks.grow "Help the Tor Network Grow!"> +<!ENTITY bottomLinks.grow "Ajude a Crescer a Rede Tor!">  -<!ENTITY bottomLinks.license "Licensing Information"> -<!ENTITY tor.TrademarkStatement "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc."> +<!ENTITY bottomLinks.license "Informação do Licenciamento"> +<!ENTITY tor.TrademarkStatement "'Tor' e o 'Logótipo Onion' são marcas registadas de Tor Project, Inc.">

1 0