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

[tor/release-0.4.0] Mark map_anon_nofork test as skipped in 0.4.0
by arma＠torproject.org 20 Feb '19

20 Feb '19

commit c9ff6a7f834e25a93c806d0079b789d26b11695a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 19 13:14:26 2019 -0500 Mark map_anon_nofork test as skipped in 0.4.0 This test fails in some environments; since the code isn't used in 0.4.0, let's disable it for now. Band-aid solution for #29534; bug not in any released Tor. --- src/test/test_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 913c5e289..7a2708c54 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -6360,6 +6360,6 @@ struct testcase_t util_tests[] = { UTIL_TEST(get_unquoted_path, 0), UTIL_TEST(log_mallinfo, 0), UTIL_TEST(map_anon, 0), - UTIL_TEST(map_anon_nofork, 0), + UTIL_TEST(map_anon_nofork, TT_SKIP /* See bug #29535 */), END_OF_TESTCASES };

1 0

[tor/release-0.4.0] Merge remote-tracking branch 'nickm/ticket29534_040' into maint-0.4.0
by arma＠torproject.org 20 Feb '19

20 Feb '19

commit ccab4347e592116fcbc0faa42dcfaf7eaa6fe715 Merge: 249319ec5 c9ff6a7f8 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Feb 20 10:35:56 2019 -0500 Merge remote-tracking branch 'nickm/ticket29534_040' into maint-0.4.0 src/test/test_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/maint-0.4.0] Merge remote-tracking branch 'nickm/ticket29534_040' into maint-0.4.0
by arma＠torproject.org 20 Feb '19

20 Feb '19

commit ccab4347e592116fcbc0faa42dcfaf7eaa6fe715 Merge: 249319ec5 c9ff6a7f8 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Feb 20 10:35:56 2019 -0500 Merge remote-tracking branch 'nickm/ticket29534_040' into maint-0.4.0 src/test/test_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/maint-0.4.0] Mark map_anon_nofork test as skipped in 0.4.0
by arma＠torproject.org 20 Feb '19

20 Feb '19

commit c9ff6a7f834e25a93c806d0079b789d26b11695a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 19 13:14:26 2019 -0500 Mark map_anon_nofork test as skipped in 0.4.0 This test fails in some environments; since the code isn't used in 0.4.0, let's disable it for now. Band-aid solution for #29534; bug not in any released Tor. --- src/test/test_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 913c5e289..7a2708c54 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -6360,6 +6360,6 @@ struct testcase_t util_tests[] = { UTIL_TEST(get_unquoted_path, 0), UTIL_TEST(log_mallinfo, 0), UTIL_TEST(map_anon, 0), - UTIL_TEST(map_anon_nofork, 0), + UTIL_TEST(map_anon_nofork, TT_SKIP /* See bug #29535 */), END_OF_TESTCASES };

1 0

[tor/maint-0.4.0] fix typos from #28614
by arma＠torproject.org 20 Feb '19

20 Feb '19

commit 249319ec5d3a17faf9a6060f1b3109f640874863 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Feb 20 10:32:47 2019 -0500 fix typos from #28614 --- changes/ticket28614 | 2 +- src/feature/nodelist/networkstatus.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/changes/ticket28614 b/changes/ticket28614 index 6c65ce49d..3c9331372 100644 --- a/changes/ticket28614 +++ b/changes/ticket28614 @@ -3,6 +3,6 @@ "binary" mode so that we can safely map it into memory later. Fixes part of bug 28614; bugfix on 0.4.0.1-alpha. - When reading a consensus file from disk, detect whether it - was written in text mode, and re-read it in text mode if it + was written in text mode, and re-read it in text mode if so. Fixes part of bug 28614; bugfix on 0.4.0.1-alpha. diff --git a/src/feature/nodelist/networkstatus.c b/src/feature/nodelist/networkstatus.c index 2c3475462..023115978 100644 --- a/src/feature/nodelist/networkstatus.c +++ b/src/feature/nodelist/networkstatus.c @@ -1743,7 +1743,7 @@ networkstatus_set_current_consensus_from_ns(networkstatus_t *c, #endif /* defined(TOR_UNIT_TESTS) */ /** - * Helper: Read a the current consensus of type flavor from + * Helper: Read the current consensus of type flavor from * fname. Flags and return values are as for * networkstatus_set_current_consensus(). **/

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 20 Feb '19

20 Feb '19

commit bdddb91f6e1d8f7ca64fbd52c575b30d8a571fe3 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 20 15:15:54 2019 +0000 Update translations for https_everywhere_completed --- da/https-everywhere.dtd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/da/https-everywhere.dtd b/da/https-everywhere.dtd index d28432ea3..22ab73ce8 100644 --- a/da/https-everywhere.dtd +++ b/da/https-everywhere.dtd @@ -33,8 +33,9 @@ <!ENTITY https-everywhere.prefs.reset_defaults "Nulstil til standardindstillinger"> <!ENTITY https-everywhere.prefs.reset_defaults_message "Dette vil nulstille hvert regelsæt til dets standardtilstand. Fortsæt?"> -<!ENTITY https-everywhere.cancel.he_blocking_explainer "HTTPS Everywhere bemærkede at du navigerede til en side som ikke bruger HTTPS, og prøvede i stedet at sende dig til HTTPS-versionen. HTTPS-versionen er ikke tilgængelig. Stedet understøtter højst sandsynligt ikke HTTPS, men der er også mulighed for at en angriber blokerer HTTPS-versionen. Hvis du ønsker at vise den ukrypterede version af siden, så kan du stadig gøre det ved at deaktivere 'Bloker alle ukrypterede forespørgsler'-valgmuligheden i din HTTPS Everywhere-udvidelse. Vær opmærksom på at deaktivering af valgmuligheden kan gøre din browser sårbar overfor netværksbaserede nedgraderingsangreb på de websteder du besøger."> +<!ENTITY https-everywhere.cancel.he_blocking_explainer "HTTPS Everywhere bemærkede at du navigerede til en side som ikke bruger HTTPS, og prøvede i stedet at sende dig til HTTPS-versionen. HTTPS-versionen er ikke tilgængelig. Stedet understøtter højst sandsynligt ikke HTTPS, men der er også mulighed for at en angriber blokerer HTTPS-versionen. Hvis du ønsker at vise den ukrypterede version af siden, så kan du stadig gøre det ved at deaktivere 'Kryptér alle steder kvalificeret (EASE)'-valgmuligheden i din HTTPS Everywhere-udvidelse. Vær opmærksom på at deaktivering af valgmuligheden kan gøre din browser sårbar overfor netværksbaserede nedgraderingsangreb på de websteder du besøger."> <!ENTITY https-everywhere.cancel.he_blocking_network "netværksbaserede nedgraderingsangreb"> +<!ENTITY https-everywhere.cancel.open_page "Åbn usikker side"> <!ENTITY https-everywhere.chrome.stable_rules "Stabile regler"> <!ENTITY https-everywhere.chrome.stable_rules_description "Sørg for at forbindelserne krypteres til følgende websteder:">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 20 Feb '19

20 Feb '19

commit 82e194171c2014369c4755558dda4e73074277b3 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 20 15:15:47 2019 +0000 Update translations for https_everywhere --- da/https-everywhere.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/da/https-everywhere.dtd b/da/https-everywhere.dtd index 4511f8071..22ab73ce8 100644 --- a/da/https-everywhere.dtd +++ b/da/https-everywhere.dtd @@ -33,9 +33,9 @@ <!ENTITY https-everywhere.prefs.reset_defaults "Nulstil til standardindstillinger"> <!ENTITY https-everywhere.prefs.reset_defaults_message "Dette vil nulstille hvert regelsæt til dets standardtilstand. Fortsæt?"> -<!ENTITY https-everywhere.cancel.he_blocking_explainer "HTTPS Everywhere noticed you were navigating to a non-HTTPS page, and tried to send you to the HTTPS version instead. The HTTPS version is unavailable. Most likely this site does not support HTTPS, but it is also possible that an attacker is blocking the HTTPS version. If you wish to view the unencrypted version of this page, you can still do so by disabling the 'Encrypt All Sites Eligible' (EASE) option in your HTTPS Everywhere extension. Be aware that disabling this option could make your browser vulnerable to network-based downgrade attacks on websites you visit."> +<!ENTITY https-everywhere.cancel.he_blocking_explainer "HTTPS Everywhere bemærkede at du navigerede til en side som ikke bruger HTTPS, og prøvede i stedet at sende dig til HTTPS-versionen. HTTPS-versionen er ikke tilgængelig. Stedet understøtter højst sandsynligt ikke HTTPS, men der er også mulighed for at en angriber blokerer HTTPS-versionen. Hvis du ønsker at vise den ukrypterede version af siden, så kan du stadig gøre det ved at deaktivere 'Kryptér alle steder kvalificeret (EASE)'-valgmuligheden i din HTTPS Everywhere-udvidelse. Vær opmærksom på at deaktivering af valgmuligheden kan gøre din browser sårbar overfor netværksbaserede nedgraderingsangreb på de websteder du besøger."> <!ENTITY https-everywhere.cancel.he_blocking_network "netværksbaserede nedgraderingsangreb"> -<!ENTITY https-everywhere.cancel.open_page "Open insecure page"> +<!ENTITY https-everywhere.cancel.open_page "Åbn usikker side"> <!ENTITY https-everywhere.chrome.stable_rules "Stabile regler"> <!ENTITY https-everywhere.chrome.stable_rules_description "Sørg for at forbindelserne krypteres til følgende websteder:">

1 0

[tpo/staging] Add TBB recommended versions
by hiro＠torproject.org 20 Feb '19

20 Feb '19

commit 782582f1715a65808de8e303cba07eb4f54efbd1 Author: hiro <hiro(a)torproject.org> Date: Wed Feb 20 15:59:03 2019 +0100 Add TBB recommended versions --- content/projects/contents.lr | 5 +++++ .../torbrowser/RecommendedTBBVersions/contents.lr | 16 ++++++++++++++++ content/projects/torbrowser/contents.lr | 5 +++++ models/text.ini | 7 +++++++ templates/empty.html | 7 +++---- 5 files changed, 36 insertions(+), 4 deletions(-) diff --git a/content/projects/contents.lr b/content/projects/contents.lr new file mode 100644 index 0000000..795e5e8 --- /dev/null +++ b/content/projects/contents.lr @@ -0,0 +1,5 @@ +_model: text +--- +_template: empty.html +--- +body: diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr new file mode 100644 index 0000000..14834b2 --- /dev/null +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -0,0 +1,16 @@ +_model: text +--- +_template: empty.html +--- +body: + +[ +"8.0.6", +"8.0.6-MacOS", +"8.0.6-Linux", +"8.0.6-Windows", +"8.5a8", +"8.5a8-MacOS", +"8.5a8-Linux", +"8.5a8-Windows" +] diff --git a/content/projects/torbrowser/contents.lr b/content/projects/torbrowser/contents.lr new file mode 100644 index 0000000..795e5e8 --- /dev/null +++ b/content/projects/torbrowser/contents.lr @@ -0,0 +1,5 @@ +_model: text +--- +_template: empty.html +--- +body: diff --git a/models/text.ini b/models/text.ini new file mode 100644 index 0000000..75e24ba --- /dev/null +++ b/models/text.ini @@ -0,0 +1,7 @@ +[model] +name = Text +label = Text + +[fields.body] +label = Body +type = text diff --git a/templates/empty.html b/templates/empty.html index eb65935..e37c38b 100644 --- a/templates/empty.html +++ b/templates/empty.html @@ -1,4 +1,3 @@ -<!doctype html> -<html lang="en"> - {% block body %}{% endblock %} -</html> +{% block body %} + {{ this.body }} +{% endblock %}

1 0

[tpo/master] Add TBB recommended versions
by hiro＠torproject.org 20 Feb '19

20 Feb '19

commit 782582f1715a65808de8e303cba07eb4f54efbd1 Author: hiro <hiro(a)torproject.org> Date: Wed Feb 20 15:59:03 2019 +0100 Add TBB recommended versions --- content/projects/contents.lr | 5 +++++ .../torbrowser/RecommendedTBBVersions/contents.lr | 16 ++++++++++++++++ content/projects/torbrowser/contents.lr | 5 +++++ models/text.ini | 7 +++++++ templates/empty.html | 7 +++---- 5 files changed, 36 insertions(+), 4 deletions(-) diff --git a/content/projects/contents.lr b/content/projects/contents.lr new file mode 100644 index 0000000..795e5e8 --- /dev/null +++ b/content/projects/contents.lr @@ -0,0 +1,5 @@ +_model: text +--- +_template: empty.html +--- +body: diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr new file mode 100644 index 0000000..14834b2 --- /dev/null +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -0,0 +1,16 @@ +_model: text +--- +_template: empty.html +--- +body: + +[ +"8.0.6", +"8.0.6-MacOS", +"8.0.6-Linux", +"8.0.6-Windows", +"8.5a8", +"8.5a8-MacOS", +"8.5a8-Linux", +"8.5a8-Windows" +] diff --git a/content/projects/torbrowser/contents.lr b/content/projects/torbrowser/contents.lr new file mode 100644 index 0000000..795e5e8 --- /dev/null +++ b/content/projects/torbrowser/contents.lr @@ -0,0 +1,5 @@ +_model: text +--- +_template: empty.html +--- +body: diff --git a/models/text.ini b/models/text.ini new file mode 100644 index 0000000..75e24ba --- /dev/null +++ b/models/text.ini @@ -0,0 +1,7 @@ +[model] +name = Text +label = Text + +[fields.body] +label = Body +type = text diff --git a/templates/empty.html b/templates/empty.html index eb65935..e37c38b 100644 --- a/templates/empty.html +++ b/templates/empty.html @@ -1,4 +1,3 @@ -<!doctype html> -<html lang="en"> - {% block body %}{% endblock %} -</html> +{% block body %} + {{ this.body }} +{% endblock %}

1 0

[translation/tpo-web_completed] Update translations for tpo-web_completed
by translation＠torproject.org 20 Feb '19

20 Feb '19

commit ed1b1741ee0d67c69accf95b5a4e231195bed98a Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 20 14:50:17 2019 +0000 Update translations for tpo-web_completed --- contents.pot | 103 ++++++++++++++++++++++++++++------------------------------- 1 file changed, 48 insertions(+), 55 deletions(-) diff --git a/contents.pot b/contents.pot index 57d877ad4..ca1ad35d0 100644 --- a/contents.pot +++ b/contents.pot @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-18 12:15+CET\n" +"POT-Creation-Date: 2019-02-20 15:26+CET\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: en <LL(a)li.org>\n" @@ -2467,23 +2467,19 @@ msgstr "" msgid "Tor Project" msgstr "Tor Project" -#: templates/contact.html:7 -msgid "" -"Chat with us on <a href=\"https://webchat.oftc.net/\" title=\"Tor Project " -"IRC\" target=\"_blank\">OFTC IRC</a>" -msgstr "" -"Chat with us on <a href=\"https://webchat.oftc.net/\" title=\"Tor Project " -"IRC\" target=\"_blank\">OFTC IRC</a>" - #: templates/contact.html:8 +msgid "Chat with us on" +msgstr "Chat with us on" + +#: templates/contact.html:9 msgid "Ask questions about using Tor." msgstr "Ask questions about using Tor." -#: templates/contact.html:9 +#: templates/contact.html:10 msgid "Discuss Tor-related coding, protocols, and ideas are all welcome." msgstr "Discuss Tor-related coding, protocols, and ideas are all welcome." -#: templates/contact.html:10 +#: templates/contact.html:11 msgid "" "Discuss organization and community related topics: meetups, outreach, " "translation, or website improvements." @@ -2491,35 +2487,35 @@ msgstr "" "Discuss organization and community related topics: meetups, outreach, " "translation, or website improvements." -#: templates/contact.html:11 +#: templates/contact.html:12 msgid "Watch or join publicly logged team meetings." msgstr "Watch or join publicly logged team meetings." -#: templates/contact.html:12 +#: templates/contact.html:13 msgid "Discuss running a Tor relay." msgstr "Discuss running a Tor relay." -#: templates/contact.html:13 +#: templates/contact.html:14 msgid "Talk with Tor’s global south community." msgstr "Talk with Tor’s global south community." -#: templates/contact.html:19 +#: templates/contact.html:20 msgid "Find us on Social Media" msgstr "Find us on Social Media" -#: templates/contact.html:33 +#: templates/contact.html:34 msgid "Volunteer with Tor" msgstr "Volunteer with Tor" -#: templates/contact.html:36 +#: templates/contact.html:37 msgid "Get Involved" msgstr "Get Involved" -#: templates/contact.html:41 +#: templates/contact.html:42 msgid "Join an email list" msgstr "Join an email list" -#: templates/contact.html:44 +#: templates/contact.html:45 msgid "" "Our teams collaborate in open channels, including email lists, you are " "welcome to join. If you have a question for a specific team not answered on " @@ -2531,11 +2527,11 @@ msgstr "" "our support portal, you can ask the appropriate list. You're welcome to " "subscribe and just watch, too :)" -#: templates/contact.html:57 +#: templates/contact.html:58 msgid "Report a bug or give feedback." msgstr "Report a bug or give feedback." -#: templates/contact.html:58 +#: templates/contact.html:59 msgid "" "Tor relies on the support of users and volunteers around the world to help " "us improve our software and resources, so your feedback is extremely " @@ -2545,11 +2541,11 @@ msgstr "" "us improve our software and resources, so your feedback is extremely " "valuable to us (and to all Tor users)." -#: templates/contact.html:64 +#: templates/contact.html:65 msgid "Tell us about a bad relay." msgstr "Tell us about a bad relay." -#: templates/contact.html:65 +#: templates/contact.html:66 msgid "" "If you find a relay that you think is malicious, misconfigured, or otherwise" " broken, please check out our wiki page and blog post on how to report it." @@ -2557,11 +2553,11 @@ msgstr "" "If you find a relay that you think is malicious, misconfigured, or otherwise" " broken, please check out our wiki page and blog post on how to report it." -#: templates/contact.html:73 +#: templates/contact.html:74 msgid "Report a security issue." msgstr "Report a security issue." -#: templates/contact.html:74 +#: templates/contact.html:75 msgid "" "If you've found a security issue in one of our projects or in our " "infrastructure, please email tor-security(a)lists.torproject.org. If you want " @@ -2575,23 +2571,23 @@ msgstr "" "contacting tor-security-sendkey(a)lists.torproject.org or from pool.sks-" "keyservers.net. Here is the fingerprint:" -#: templates/contact.html:94 +#: templates/contact.html:95 msgid "Email us" msgstr "Email us" -#: templates/contact.html:95 +#: templates/contact.html:96 msgid "" "For questions and comments about Tor the non-profit organization: trademark " "questions, affiliation and coordination, contract inquiries, etc, please " -"email <a href=\"\">frontdesk(a)rt.torproject.org</a>. For donor-related " -"questions, contact <a href=\"\">giving(a)torproject.org</a>" +"email frontdesk(a)rt.torproject.org. For donor-related questions, contact " +"giving(a)torproject.org" msgstr "" "For questions and comments about Tor the non-profit organization: trademark " "questions, affiliation and coordination, contract inquiries, etc, please " -"email <a href=\"\">frontdesk(a)rt.torproject.org</a>. For donor-related " -"questions, contact <a href=\"\">giving(a)torproject.org</a>" +"email frontdesk(a)rt.torproject.org. For donor-related questions, contact " +"giving(a)torproject.org" -#: templates/contact.html:101 +#: templates/contact.html:102 msgid "Send us Mail" msgstr "Send us Mail" @@ -2611,19 +2607,15 @@ msgstr "Download .apk" msgid "Go to Google Play" msgstr "Go to Google Play" -#: templates/download-android.html:20 -msgid "" -"Go to F-droid S00N" -msgstr "" -"Go to F-droid S00N" +#: templates/download-android.html:21 +#, python-format +msgid "Go to F-droid %s" +msgstr "Go to F-droid %s" -#: templates/download-android.html:23 -msgid "" -"Are you a iOS user? We encourage you to try <a class=\"mx-auto\" " -"href=\"\">Onion Browser.</a>" -msgstr "" -"Are you a iOS user? We encourage you to try <a class=\"mx-auto\" " -"href=\"\">Onion Browser.</a>" +#: templates/download-android.html:25 +#, python-format +msgid "Are you a iOS user? We encourage you to try %s" +msgstr "Are you a iOS user? We encourage you to try %s" #: templates/download-languages.html:11 templates/download-options.html:11 msgid "Language" @@ -2685,15 +2677,12 @@ msgstr "" "already comes with HTTPS Everywhere, NoScript, and other patches to protect " "your privacy and security." -#: templates/download.html:35 -msgid "" -"Check out the <a class=\"mx-auto\" href=\"https://manual.torproject.org\" " -"target=\"_blank\">manual</a> for more troubleshooting tips." -msgstr "" -"Check out the <a class=\"mx-auto\" href=\"https://manual.torproject.org\" " -"target=\"_blank\">manual</a> for more troubleshooting tips." +#: templates/download.html:37 +#, python-format +msgid "Check out the %s for more troubleshooting tips." +msgstr "Check out the %s for more troubleshooting tips." -#: templates/download.html:43 +#: templates/download.html:45 msgid "" "Verify Tor Browser signature <a class=\"mx-auto\" " "href=\"https://support.torproject.org/how-to-verify-signature\" " @@ -2732,15 +2721,15 @@ msgstr "" "availability and use, and furthering their scientific and popular " "understanding." -#: templates/footer.html:41 +#: templates/footer.html:47 msgid "Subscribe to our Newsletter" msgstr "Subscribe to our Newsletter" -#: templates/footer.html:42 +#: templates/footer.html:48 msgid "Get monthly updates and opportunities from the Tor Project" msgstr "Get monthly updates and opportunities from the Tor Project" -#: templates/footer.html:49 +#: templates/footer.html:55 msgid "" "Trademark, copyright notices, and rules for use by third parties can be " "found in our " @@ -3042,6 +3031,10 @@ msgstr "Use your skills to" msgid " volunteer." msgstr " volunteer." +#: templates/macros/downloads.html:47 +msgid "tor browser manual" +msgstr "tor browser manual" + #: templates/macros/jobs.html:11 msgid "Read more." msgstr "Read more."

1 0