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

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 06 Feb '20

06 Feb '20

commit 148bb5954810c514fdbcecd7da96f456160507bc Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 6 11:24:05 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+de.po | 28 ++++++++++++++-------------- contents+fa.po | 6 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/contents+de.po b/contents+de.po index 8cdf829b29..5422bf787a 100644 --- a/contents+de.po +++ b/contents+de.po @@ -7,11 +7,11 @@ # erinm, 2019 # Ettore Atalan <atalanttore(a)googlemail.com>, 2019 # Lars Schimmer <echelon(a)i2pmail.org>, 2019 -# Emma Peel, 2019 # Philipp . <Kuschat(a)gmx.de>, 2019 # Simon Kirchner <twistiosplayer(a)gmail.com>, 2020 # Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2020 # Jonas Kröber <murmel.schelm(a)gmail.com>, 2020 +# Emma Peel, 2020 # msgid "" msgstr "" @@ -19,7 +19,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-01-20 16:43+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Jonas Kröber <murmel.schelm(a)gmail.com>, 2020\n" +"Last-Translator: Emma Peel, 2020\n" "Language-Team: German (https://www.transifex.com/otf/teams/1519/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2194,9 +2194,8 @@ msgid "" " so." msgstr "" "Du kannst helfen, die Geschwindigkeit des Netzwerks zu verbessern, indem du " -"dein [eigenes Tor Relais betreibst] " -"(https://community.torproject.org/relay/) oder andere dazu zu ermutigen, " -"dasselbe zu tun." +"dein [eigenes Tor Relais betreibst](https://community.torproject.org/relay/)" +" oder andere dazu zu ermutigen, dasselbe zu tun." #: https//support.torproject.org/tbb/tbb-22/ #: (content/tbb/tbb-22/contents+en.lrquestion.description) @@ -2677,10 +2676,10 @@ msgid "" "translator/)" msgstr "" "Wir möchten, dass jeder Tor-Browser in seiner eigenen Sprache nutzen kann. " -"Tor-Browser ist jetzt [in 32 verschiedenen Sprachen verfügbar] " -"(https://www.torproject.org/download/languages/) und wir arbeiten daran, " -"weitere hinzuzufügen. Möchtest du uns bei der Übersetzung helfen? [Siehe " -"hier](https://tb-manual.torproject.org/becoming-tor-translator/)" +"Tor-Browser ist jetzt [in 32 verschiedenen Sprachen " +"verfügbar](https://www.torproject.org/download/languages/), und wir arbeiten" +" daran, weitere hinzuzufügen. Möchtest du uns bei der Übersetzung helfen? " +"[Siehe hier](https://tb-manual.torproject.org/becoming-tor-translator/)" #: https//support.torproject.org/tbb/tbb-37/ #: (content/tbb/tbb-37/contents+en.lrquestion.description) @@ -2690,8 +2689,9 @@ msgid "" "releases](https://www.torproject.org/download/alpha/)." msgstr "" "Du kannst uns auch helfen, die nächsten Sprachen zu testen, die wir " -"veröffentlichen werden, indem du [Tor Browser Alpha Veröffentlichungen] " -"(https://www.torproject.org/download/alpha/) installierst und testest." +"veröffentlichen werden, indem du [Tor Browser Alpha " +"Veröffentlichungen](https://www.torproject.org/download/alpha/) installierst" +" und testest." #: https//support.torproject.org/tbb/tbb-38/ #: (content/tbb/tbb-38/contents+en.lrquestion.title) @@ -3123,9 +3123,9 @@ msgid "" "Verification](https://support.google.com/accounts/answer/185839) on their " "accounts to add an extra layer of security." msgstr "" -"Seit kurzem können Gmail-Benutzer [2-Faktor-Authentifizierung] " -"(https://support.google.com/accounts/answer/185839) für ihre Konten " -"einschalten, um eine zusätzliche Sicherheitsebene hinzuzufügen." +"Seit kurzem können Gmail-Benutzer [2-Faktor-" +"Authentifizierung](https://support.google.com/accounts/answer/185839) für " +"ihre Konten einschalten, um eine zusätzliche Sicherheitsebene hinzuzufügen." #: https//support.torproject.org/tbb/tbb-46/ #: (content/tbb/tbb-46/contents+en.lrquestion.title) diff --git a/contents+fa.po b/contents+fa.po index eb52f3ecac..7d52522afa 100644 --- a/contents+fa.po +++ b/contents+fa.po @@ -10,8 +10,8 @@ # MYZJ, 2019 # Hamid reza Zaefarani, 2019 # Samaneh M <asamana.haoma(a)gmail.com>, 2019 -# Emma Peel, 2020 # magnifico, 2020 +# Emma Peel, 2020 # msgid "" msgstr "" @@ -19,7 +19,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-01-20 16:43+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: magnifico, 2020\n" +"Last-Translator: Emma Peel, 2020\n" "Language-Team: Persian (https://www.transifex.com/otf/teams/1519/fa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -3724,7 +3724,7 @@ msgid "" "[email](https://support.torproject.org/gettor/gettor-2) instead." msgstr "" "GetTor از طریق توییتر هم اکنون تحت نگهداری می باشد. لطفا به جای آن از " -"[ایمیل] (https://support.torproject.org/gettor/gettor-2) استفاده کنید." +"[ایمیل](https://support.torproject.org/gettor/gettor-2) استفاده کنید." #: https//support.torproject.org/gettor/gettor-4/ #: (content/gettor/gettor-4/contents+en.lrquestion.title)

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 06 Feb '20

06 Feb '20

commit d50a65453c5c42451c516c46a04c835953bc5826 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 6 11:23:25 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+de.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contents+de.po b/contents+de.po index 9d465fc75f..ca9f2da69d 100644 --- a/contents+de.po +++ b/contents+de.po @@ -8,9 +8,9 @@ # Steve Dougherty, 2019 # IDRASSI Mounir <mounir.idrassi(a)idrix.fr>, 2019 # Ettore Atalan <atalanttore(a)googlemail.com>, 2019 -# Emma Peel, 2019 # Philipp . <Kuschat(a)gmx.de>, 2019 # Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2019 +# Emma Peel, 2020 # msgid "" msgstr "" @@ -18,7 +18,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-15 12:00+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2019\n" +"Last-Translator: Emma Peel, 2020\n" "Language-Team: German (https://www.transifex.com/otf/teams/1519/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -471,8 +471,8 @@ msgid "" "licenses](https://2019.www.torproject.org/docs/faq.html.en#DistributingTor)." msgstr "" "Die Tor®-Software wird auf verschiedene Weise lizenziert. Erfahren Sie mehr " -"über die [verschiedenen Lizenzen] " -"(https://2019.www.torproject.org/docs/faq.html.en#DistributingTor)" +"über die [verschiedenen " +"Lizenzen](https://2019.www.torproject.org/docs/faq.html.en#DistributingTor)." #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body)

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 06 Feb '20

06 Feb '20

commit ada030fcd6218a315cbb9ef97466ee870763ff94 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 6 11:20:15 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+de.po | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/contents+de.po b/contents+de.po index 2574452c53..ddaf898c1f 100644 --- a/contents+de.po +++ b/contents+de.po @@ -8,8 +8,8 @@ # Friedrich-Wilhelm Prussak <info(a)prussak.de>, 2019 # Philipp . <Kuschat(a)gmx.de>, 2019 # Jonas Kröber <murmel.schelm(a)gmail.com>, 2019 -# Emma Peel, 2020 # Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2020 +# Emma Peel, 2020 # msgid "" msgstr "" @@ -17,7 +17,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-01-15 15:58+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2020\n" +"Last-Translator: Emma Peel, 2020\n" "Language-Team: German (https://www.transifex.com/otf/teams/1519/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -442,8 +442,8 @@ msgid "" "3. (Recommended) Verify the [file's " "signature](https://support.torproject.org/en/tbb/how-to-verify-signature/)." msgstr "" -"3. (Empfohlen) Überprüfe die [Datei-Signatur] " -"(https://support.torproject.org/en/tbb/how-to-verify-signature/)" +"3. (Empfohlen) Überprüfe die [Datei-" +"Signatur](https://support.torproject.org/en/tbb/how-to-verify-signature/)." #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) @@ -1195,9 +1195,9 @@ msgstr "" "den anderen Knoten im Kanal. Um Profiling-Angriffe zu vermeiden, ändert sich" " der Schutz-Knoten erst nach 2-3 Monaten, im Gegensatz zu den anderen " "Knoten, die sich mit jeder neuen Domäne ändern. Weitere Informationen über " -"Schutz-Knoten findest du in den [F&A] " -"(https://www.torproject.org/docs/faq#EntryGuards) und im [Support-Portal] " -"(https://support.torproject.org/tbb/tbb-2/)" +"Schutz-Knoten findest du in den " +"[F&A](https://www.torproject.org/docs/faq#EntryGuards) und im [Support-" +"Portal](https://support.torproject.org/tbb/tbb-2/)." #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) @@ -2344,8 +2344,8 @@ msgid "" "2. Navigate to the Tor Browser [download " "page](https://torproject.org/download)." msgstr "" -"2. Navigiere zum Tor Browser [Download-Seite] " -"(https://torproject.org/download)" +"2. Navigiere zum Tor Browser [Download-" +"Seite](https://torproject.org/download)." #: https//tb-manual.torproject.org/make-tor-portable/ #: (content/make-tor-portable/contents+en.lrtopic.body) @@ -2361,8 +2361,8 @@ msgid "" "4. (Recommended) Verify the [files " "signature](https://support.torproject.org/tbb/how-to-verify-signature/)." msgstr "" -"4. (Empfohlen) Überprüfe die [Datei-Signatur] " -"(https://support.torproject.org/tbb/how-to-verify-signature/)" +"4. (Empfohlen) Überprüfe die [Datei-" +"Signatur](https://support.torproject.org/tbb/how-to-verify-signature/)." #: https//tb-manual.torproject.org/make-tor-portable/ #: (content/make-tor-portable/contents+en.lrtopic.body)

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 06 Feb '20

06 Feb '20

commit c5a4dc4c47754da106a0bbde315d0c616995e2e3 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 6 11:15:27 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+de.po | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/contents+de.po b/contents+de.po index 93886b5d06..1b3cc8ba5d 100644 --- a/contents+de.po +++ b/contents+de.po @@ -7,9 +7,9 @@ # Tobias Killer, 2019 # Philipp Winter, 2019 # Ettore Atalan <atalanttore(a)googlemail.com>, 2019 -# Emma Peel, 2019 # Philipp . <Kuschat(a)gmx.de>, 2019 # Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2020 +# Emma Peel, 2020 # msgid "" msgstr "" @@ -17,7 +17,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-12-11 12:15+CET\n" "PO-Revision-Date: 2019-12-11 10:50+0000\n" -"Last-Translator: Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2020\n" +"Last-Translator: Emma Peel, 2020\n" "Language-Team: German (https://www.transifex.com/otf/teams/1519/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -200,7 +200,7 @@ msgid "" "community-team) for more help." msgstr "" "Wenn dies deine Community beschreibt oder wenn du dir nicht sicher bist, " -"bitte [kontaktiere unser Community Team] (https://lists.torproject.org/cgi-" +"bitte [kontaktiere unser Community Team](https://lists.torproject.org/cgi-" "bin/mailman/listinfo/tor-community-team) für weitere Hilfe." #: https//community.torproject.org/onion-services/ @@ -289,7 +289,7 @@ msgid "" msgstr "" "Unsere aktuellen Übersetzungsprioritäten sind die Übersetzung von Tor " "Browser (https://torpat.ch/locales) der Tor Browser-Dokumentation und der " -"Webseite des [Tor Projekts] (https://torpat.ch/tpo-locales) aber es gibt " +"Webseite des [Tor Projekts](https://torpat.ch/tpo-locales), aber es gibt " "viele andere Dokumente, bei deren Übersetzung wir ebenfalls Hilfe gebrauchen" " könnten." @@ -586,8 +586,7 @@ msgid "" " [bridge with obfs4 support](relay/setup/bridge)." msgstr "" "Wenn du weniger als 10 Mbit/s, aber mindestens 1 Mbit/s hast, empfehlen wir " -"dir, eine [Brücke mit obfs4-Unterstützung] (relay/setup/bridge) zu " -"betreiben." +"dir, eine [Brücke mit obfs4-Unterstützung](relay/setup/bridge) zu betreiben." #: https//community.torproject.org/relay/relays-requirements/ #: (content/relay-operations/relays-requirements/contents+en.lrpage.body) @@ -1014,9 +1013,9 @@ msgid "" msgstr "" "Wenn ein Benutzer beispielsweise urheberrechtlich geschütztes Material " "herunterlädt, während er dein Exit-Relay benutzt, erhältst du als die " -"betreibende Person möglicherweise eine [DMCA-Benachrichtigung] " -"(https://www.dmca.com/Solutions/view.aspx?ID=712f28a5-93f2-467b-" -"ba92-3d58c8345a32&?ref=sol08a2)." +"betreibende Person möglicherweise eine [DMCA-" +"Benachrichtigung](https://www.dmca.com/Solutions/view.aspx?ID=712f28a5-93f2" +"-467b-ba92-3d58c8345a32&?ref=sol08a2)." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body)

1 0

[tor/master] hs-v3: Remove descriptor when we remove client authorization
by asn＠torproject.org 06 Feb '20

06 Feb '20

commit 9278a24729c92b9f5c670b3e1608e2cdbd8bd9a1 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Feb 4 09:25:55 2020 -0500 hs-v3: Remove descriptor when we remove client authorization When the ONION_CLIENT_AUTH_REMOVE command is given to tor, now also remove the descriptor associated with the client authorization credentials. Fixes #33148 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket33148 | 5 +++++ src/feature/hs/hs_cache.c | 36 ++++++++++++++++++++++++++++++ src/feature/hs/hs_cache.h | 1 + src/feature/hs/hs_client.c | 3 +++ src/test/test_hs_cache.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 100 insertions(+) diff --git a/changes/ticket33148 b/changes/ticket33148 new file mode 100644 index 000000000..1f44b4259 --- /dev/null +++ b/changes/ticket33148 @@ -0,0 +1,5 @@ + o Minor bugfixes (onion service v3, client authorization): + - When removing client authorization credentials using the control port, + also remove the associated descriptor so they don't linger and are still + usable hence making the onion service behind client authorization + reachable. Fixes bug 33148; bugfix on 0.4.3.1-alpha. diff --git a/src/feature/hs/hs_cache.c b/src/feature/hs/hs_cache.c index a7b41b835..9cf408ca3 100644 --- a/src/feature/hs/hs_cache.c +++ b/src/feature/hs/hs_cache.c @@ -847,6 +847,42 @@ hs_cache_store_as_client(const char *desc_str, return ret; } +/** Remove and free a client cache descriptor entry for the given onion + * service ed25519 public key. If the descriptor is decoded, the intro + * circuits are closed if any. + * + * This does nothing if no descriptor exists for the given key. */ +void +hs_cache_remove_as_client(const ed25519_public_key_t *key) +{ + hs_cache_client_descriptor_t *cached_desc = NULL; + + tor_assert(key); + + cached_desc = lookup_v3_desc_as_client(key->pubkey); + if (!cached_desc) { + return; + } + /* If we have a decrypted/decoded descriptor, attempt to close its + * introduction circuit(s). We shouldn't have circuit(s) without a + * descriptor else it will lead to a failure. */ + if (cached_desc->desc) { + hs_client_close_intro_circuits_from_desc(cached_desc->desc); + } + /* Remove and free. */ + remove_v3_desc_as_client(cached_desc); + cache_client_desc_free(cached_desc); + + /* Logging. */ + { + char key_b64[BASE64_DIGEST256_LEN + 1]; + digest256_to_base64(key_b64, (const char *) key); + log_info(LD_REND, "Onion service v3 descriptor '%s' removed " + "from client cache", + safe_str_client(key_b64)); + } +} + /** Clean all client caches using the current time now. */ void hs_cache_clean_as_client(time_t now) diff --git a/src/feature/hs/hs_cache.h b/src/feature/hs/hs_cache.h index ebe1621e8..bb3c77f22 100644 --- a/src/feature/hs/hs_cache.h +++ b/src/feature/hs/hs_cache.h @@ -85,6 +85,7 @@ const char * hs_cache_lookup_encoded_as_client(const struct ed25519_public_key_t *key); hs_desc_decode_status_t hs_cache_store_as_client(const char *desc_str, const struct ed25519_public_key_t *identity_pk); +void hs_cache_remove_as_client(const struct ed25519_public_key_t *key); void hs_cache_clean_as_client(time_t now); void hs_cache_purge_as_client(void); diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c index 611cc5430..4599bde5b 100644 --- a/src/feature/hs/hs_client.c +++ b/src/feature/hs/hs_client.c @@ -1735,6 +1735,9 @@ hs_client_remove_auth_credentials(const char *hsaddress) find_and_remove_client_auth_creds_file(cred); } + /* Remove associated descriptor if any. */ + hs_cache_remove_as_client(&service_identity_pk); + client_service_authorization_free(cred); return REMOVAL_SUCCESS; } diff --git a/src/test/test_hs_cache.c b/src/test/test_hs_cache.c index 9e0094d25..8ea550b65 100644 --- a/src/test/test_hs_cache.c +++ b/src/test/test_hs_cache.c @@ -645,6 +645,59 @@ test_client_cache_decrypt(void *arg) UNMOCK(networkstatus_get_live_consensus); } +static void +test_client_cache_remove(void *arg) +{ + int ret; + ed25519_keypair_t service_kp; + hs_descriptor_t *desc1 = NULL; + + (void) arg; + + hs_init(); + + MOCK(networkstatus_get_live_consensus, + mock_networkstatus_get_live_consensus); + + /* Set consensus time. Lookup will not return the entry if it has expired + * and it is checked against the consensus valid_after time. */ + parse_rfc1123_time("Sat, 26 Oct 1985 13:00:00 UTC", + &mock_ns.valid_after); + parse_rfc1123_time("Sat, 26 Oct 1985 14:00:00 UTC", + &mock_ns.fresh_until); + parse_rfc1123_time("Sat, 26 Oct 1985 16:00:00 UTC", + &mock_ns.valid_until); + + /* Generate service keypair */ + tt_int_op(0, OP_EQ, ed25519_keypair_generate(&service_kp, 0)); + + /* Build a descriptor and cache it. */ + { + char *encoded; + desc1 = hs_helper_build_hs_desc_with_ip(&service_kp); + tt_assert(desc1); + ret = hs_desc_encode_descriptor(desc1, &service_kp, NULL, &encoded); + tt_int_op(ret, OP_EQ, 0); + tt_assert(encoded); + + /* Store it */ + ret = hs_cache_store_as_client(encoded, &service_kp.pubkey); + tt_int_op(ret, OP_EQ, HS_DESC_DECODE_OK); + tor_free(encoded); + tt_assert(hs_cache_lookup_as_client(&service_kp.pubkey)); + } + + /* Remove the cached entry. */ + hs_cache_remove_as_client(&service_kp.pubkey); + tt_assert(!hs_cache_lookup_as_client(&service_kp.pubkey)); + + done: + hs_descriptor_free(desc1); + hs_free_all(); + + UNMOCK(networkstatus_get_live_consensus); +} + struct testcase_t hs_cache[] = { /* Encoding tests. */ { "directory", test_directory, TT_FORK, @@ -659,6 +712,8 @@ struct testcase_t hs_cache[] = { NULL, NULL }, { "client_cache_decrypt", test_client_cache_decrypt, TT_FORK, NULL, NULL }, + { "client_cache_remove", test_client_cache_remove, TT_FORK, + NULL, NULL }, END_OF_TESTCASES };

1 0

[tor/master] test: Missing hs_init() in some hs_control tests
by asn＠torproject.org 06 Feb '20

06 Feb '20

commit a8456d2a11c35d7e707bb1395d56115227104b34 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Feb 4 09:56:25 2020 -0500 test: Missing hs_init() in some hs_control tests Without the hs_init(), the caches are not initialized and the previous commit was causing an assert due to the missing caches. But regardless of that, those tests were not initializing but were calling hs_free_all(). Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/test/test_hs_control.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/test/test_hs_control.c b/src/test/test_hs_control.c index dc0db18bd..881479016 100644 --- a/src/test/test_hs_control.c +++ b/src/test/test_hs_control.c @@ -218,6 +218,8 @@ test_hs_control_good_onion_client_auth_add(void *arg) char *cp1 = NULL; size_t sz; + hs_init(); + { /* Setup the control conn */ memset(&conn, 0, sizeof(control_connection_t)); TO_CONN(&conn)->outbuf = buf_new(); @@ -415,6 +417,8 @@ test_hs_control_bad_onion_client_auth_add(void *arg) size_t sz; char *args = NULL; + hs_init(); + { /* Setup the control conn */ memset(&conn, 0, sizeof(control_connection_t)); TO_CONN(&conn)->outbuf = buf_new(); @@ -493,6 +497,8 @@ test_hs_control_store_permanent_creds(void *arg) size_t sz; + hs_init(); + { /* Setup the control conn */ memset(&conn, 0, sizeof(control_connection_t)); TO_CONN(&conn)->outbuf = buf_new();

1 0

[tor-browser-build/master] Add missing '#' characters in license headers
by gk＠torproject.org 06 Feb '20

06 Feb '20

commit 28c15aa19da511b213ef6e1708116013fbaef9a3 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Feb 6 10:20:22 2020 +0000 Add missing '#' characters in license headers --- tools/authenticode_check.sh | 2 +- tools/hash_signed_bundles.sh | 2 +- tools/marsigning_check.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/authenticode_check.sh b/tools/authenticode_check.sh index 819c9d1..5d3b4cc 100755 --- a/tools/authenticode_check.sh +++ b/tools/authenticode_check.sh @@ -5,7 +5,7 @@ # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are # met: - +# # * Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # diff --git a/tools/hash_signed_bundles.sh b/tools/hash_signed_bundles.sh index 4354d47..1e21c49 100755 --- a/tools/hash_signed_bundles.sh +++ b/tools/hash_signed_bundles.sh @@ -5,7 +5,7 @@ # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are # met: - +# # * Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # diff --git a/tools/marsigning_check.sh b/tools/marsigning_check.sh index 0663603..3e58249 100755 --- a/tools/marsigning_check.sh +++ b/tools/marsigning_check.sh @@ -5,7 +5,7 @@ # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are # met: - +# # * Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. #

1 0

[translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
by translation＠torproject.org 06 Feb '20

06 Feb '20

commit 8657bee990d4c37dba336d786e1665de32ee9cb4 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 6 08:45:36 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/ja/LC_MESSAGES/messages.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/ja/LC_MESSAGES/messages.po b/locale/ja/LC_MESSAGES/messages.po index 0afa4af6f3..16f6ad1878 100644 --- a/locale/ja/LC_MESSAGES/messages.po +++ b/locale/ja/LC_MESSAGES/messages.po @@ -1957,7 +1957,7 @@ msgstr "株式の寄付はできますか？" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:577 msgid "You can donate stock to the Tor Project." -msgstr "" +msgstr "はい、 Tor Project に株式を寄付する事は可能です。" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:579 msgid ""

1 0

[translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
by translation＠torproject.org 06 Feb '20

06 Feb '20

commit a59d363366c34c9ed88a7aeb0a95015dab56a0d2 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 6 08:15:39 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/ja/LC_MESSAGES/messages.po | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/locale/ja/LC_MESSAGES/messages.po b/locale/ja/LC_MESSAGES/messages.po index 7ea7ecaed2..0afa4af6f3 100644 --- a/locale/ja/LC_MESSAGES/messages.po +++ b/locale/ja/LC_MESSAGES/messages.po @@ -6,12 +6,12 @@ # 石上敬祐 <k.130.email(a)gmail.com>, 2019 # h345u37g3 h345u37g3, 2019 # erinm, 2019 -# 323484, 2020 # Agent Exe <sw.172.135.9.xxx.l62118102(a)gmail.com>, 2020 +# 323484, 2020 # msgid "" msgstr "" -"Last-Translator: Agent Exe <sw.172.135.9.xxx.l62118102(a)gmail.com>, 2020\n" +"Last-Translator: 323484, 2020\n" "Language-Team: Japanese (https://www.transifex.com/otf/teams/1519/ja/)\n" "Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" @@ -1574,6 +1574,13 @@ msgid "" " Phone number: 206-420-3136 \n" " Contact person: Isabela Bagueros, Executive Director " msgstr "" +"Tor Project Tax ID 番号 (EIN #): 20-8096820 \n" +" 住所: \n" +" The Tor Project, Inc. \n" +" 217 First Avenue South #4903 \n" +" Seattle, WA 98194 \n" +" 電話番号: 206-420-3136 \n" +" 交渉担当者: Isabela Bagueros, Executive Director " #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:345 msgid "" @@ -1946,7 +1953,7 @@ msgstr "" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:573 msgid "Can I make a stock donation?" -msgstr "" +msgstr "株式の寄付はできますか？" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:577 msgid "You can donate stock to the Tor Project."

1 0

[translation/tpo-web_completed] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed
by translation＠torproject.org 06 Feb '20

06 Feb '20

commit c3aea1be089788b1350471cc539938daa4976083 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 6 05:53:19 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed --- contents+zh-CN.po | 52 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 20 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index e4330a7696..b3a6e958fe 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -6,13 +6,13 @@ # ヨイツの賢狼ホロ, 2019 # Dianyu Liu <liudianyu5(a)gmail.com>, 2019 # MD Rights <psychi2009(a)gmail.com>, 2019 -# ff98sha, 2019 # erinm, 2019 # IDRASSI Mounir <mounir.idrassi(a)idrix.fr>, 2019 # ciaran <ciaranchen(a)qq.com>, 2019 # YFdyh000 <yfdyh000(a)gmail.com>, 2019 # Emma Peel, 2019 # Cloud P <heige.pcloud(a)outlook.com>, 2020 +# ff98sha, 2020 # msgid "" msgstr "" @@ -20,7 +20,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-15 12:00+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: Cloud P <heige.pcloud(a)outlook.com>, 2020\n" +"Last-Translator: ff98sha, 2020\n" "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -149,7 +149,7 @@ msgstr "现在就捐助" #: https//www.torproject.org/about/trademark/ #: (content/about/trademark/contents+en.lrtrademark.title) msgid "Trademark" -msgstr "" +msgstr "商标" #: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body) msgid "Community" @@ -228,6 +228,8 @@ msgid "" "add more. Want to help us translate? [See " "here](https://community.torproject.org/localization/)" msgstr "" +"我们希望每一个人都可以使用他们自己的语言享受Tor 浏览器。Tor 浏览器目前支持32种不同的语言，并且我们希望为其加入更多。想要帮助我们翻译吗？ " +"[查看这里](https://community.torproject.org/localization/)" #: https//www.torproject.org/download/tor/ #: (content/download/tor/contents+en.lrpage.title) @@ -294,7 +296,7 @@ msgid "" "The Tor Project and its surrounding community develop and distribute some of" " the most popular and widely used free, open source privacy technologies: " "Tor Browser and the Tor network." -msgstr "" +msgstr "Tor 项目及其周围的社区开发和分发了一些最流行和广泛使用的免费开源的隐私技术：Tor 浏览器和 Tor 网络。" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) @@ -379,12 +381,12 @@ msgstr "" #: https//www.torproject.org/about/trademark/ #: (content/about/trademark/contents+en.lrtrademark.body) msgid "# General Statement of Trademark and Copyright" -msgstr "" +msgstr "# 商标和版权总声明" #: https//www.torproject.org/about/trademark/ #: (content/about/trademark/contents+en.lrtrademark.body) msgid "Content on this site is Copyright The Tor Project, Inc.." -msgstr "" +msgstr "本网站的内容的版权由 The Tor Project, Inc. 所有。" #: https//www.torproject.org/about/trademark/ #: (content/about/trademark/contents+en.lrtrademark.body) @@ -392,6 +394,8 @@ msgid "" "Reproduction of content is permitted under a [Creative Commons Attribution " "3.0 United States License](https://creativecommons.org/licenses/by/3.0/us/)." msgstr "" +"根据以下协议，允许复制内容：[知识共享署名 3.0 美国本地化协议（CC BY " +"3.0）](https://creativecommons.org/licenses/by/3.0/us/)。" #: https//www.torproject.org/about/trademark/ #: (content/about/trademark/contents+en.lrtrademark.body) @@ -399,14 +403,14 @@ msgid "" "All use under such license must be accompanied by a clear and prominent " "attribution that identifies The Tor Project, Inc. as the owner and " "originator of such content." -msgstr "" +msgstr "所有使用该协议的用户必须注明清晰明显的来源：The Tor Project, Inc 是该内容的所有者。" #: https//www.torproject.org/about/trademark/ #: (content/about/trademark/contents+en.lrtrademark.body) msgid "" "The Tor Project Inc. reserves the right to change licenses and permissions " "at any time in its sole discretion." -msgstr "" +msgstr "Tor Project Inc. 保留在任何时间独立修改协议与许可的权利。" #: https//www.torproject.org/about/trademark/ #: (content/about/trademark/contents+en.lrtrademark.body) @@ -415,6 +419,8 @@ msgid "" " " "licenses](https://2019.www.torproject.org/docs/faq.html.en#DistributingTor)." msgstr "" +"Tor® " +"软件以各种方式获得许可。了解更多关于[不同许可](https://2019.www.torproject.org/docs/faq.html.en#D…" #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -713,7 +719,7 @@ msgstr "Tor 商标常见问题。" #: lego/templates/banner.html:2 lego/templates/banner.html:4 #: templates/banner.html:2 templates/banner.html:4 msgid "Close banner" -msgstr "" +msgstr "关闭横幅" #: lego/templates/banner.html:10 templates/banner.html:10 msgid "Tracking, surveillance, and censorship are widespread online." @@ -827,7 +833,7 @@ msgstr "Tor" #: lego/templates/secure-connections.html:32 msgid "POTENTIALLY VISIBLE DATA" -msgstr "" +msgstr "潜在可视数据" #: lego/templates/secure-connections.html:37 msgid "Site.com" @@ -965,10 +971,12 @@ msgid "" "infrastructure, please email tor-security(a)lists.torproject.org. If you've " "found a security bug in Tor or Tor Browser, feel free to submit it for our" msgstr "" +"如果您在我们的项目或基础架构中发现了安全问题，请发送电子邮件至 tor-security(a)lists.torproject.org. 如果您在 Tor " +"或 Tor 浏览器中发现了安全漏洞，请随时将其提交到我们的" #: templates/contact.html:80 msgid "bug bounty program." -msgstr "" +msgstr "漏洞赏金计划。" #: templates/contact.html:80 msgid "" @@ -976,6 +984,8 @@ msgid "" "list by contacting tor-security-sendkey(a)lists.torproject.org or from pool" ".sks-keyservers.net. Here is the fingerprint:" msgstr "" +"如果您想要加密您的邮件，可以通过与 tor-security-sendkey(a)lists.torproject.org 联系或从 pool.sks-" +"keyservers.net 获取列表的 GPG 公钥。这是指纹：" #: templates/contact.html:100 msgid "Email us" @@ -988,6 +998,8 @@ msgid "" "email frontdesk(a)torproject.org. For donor-related questions, contact " "giving(a)torproject.org" msgstr "" +"对于有关非营利组织 Tor 的疑问和评论：商标问题，隶属关系和协调，合同查询等，请发送电子邮件至 frontdesk(a)torproject.org. " +"对于与捐助者有关的问题，请联系 giving(a)torproject.org" #: templates/contact.html:107 msgid "Send us Mail" @@ -1028,11 +1040,11 @@ msgstr "Windows" #: templates/download-languages.html:13 msgid "macOS" -msgstr "" +msgstr "macOS" #: templates/download-languages.html:14 templates/download-options.html:14 msgid "GNU/Linux" -msgstr "" +msgstr "GNU/Linux" #: templates/download-options.html:13 msgid "MacOS" @@ -1040,15 +1052,15 @@ msgstr "MacOS" #: templates/download-options.html:43 msgid "Tor Browser for Android Alpha" -msgstr "" +msgstr "Android Alpha 版 Tor 浏览器" #: templates/download-options.html:49 msgid "Google Play" -msgstr "" +msgstr "Google Play" #: templates/download-tor.html:8 msgid "Tor Source" -msgstr "" +msgstr "Tor 来源" #: templates/download-tor.html:12 msgid "Version" @@ -1060,15 +1072,15 @@ msgstr "签名" #: templates/download-tor.html:37 msgid "Windows Expert Bundle" -msgstr "" +msgstr "Windows 专家套件" #: templates/download-tor.html:42 msgid "Windows 10, 8, 7, Vista, XP, 2000, 2003 Server, ME, and Windows 98SE" -msgstr "" +msgstr "Windows 10、8、7、Vista、XP、2000、2003 Server、ME、Windows 98SE" #: templates/download-tor.html:43 msgid "Contains just Tor and nothing else." -msgstr "" +msgstr "仅包含 Tor。" #: templates/download.html:5 msgid "Get Connected" @@ -1231,7 +1243,7 @@ msgstr "防指纹追踪" msgid "" "Tor Browser aims to make all users look the same, making it difficult for " "you to be fingerprinted based on your browser and device information." -msgstr "" +msgstr "Tor 浏览器旨在让所有用户看起来都相同，使得很难根据您的浏览器和设备信息进行指纹识别。" #: templates/home.html:58 msgid "Multi-layered Encryption"

1 0