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

[tor/master] Print error message we get from socket.connect_ex when it fails
by nickm＠torproject.org 05 Dec '18

05 Dec '18

commit db9ab3754a0a45fb421211ea9b815b4449999c66 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Mon Dec 3 14:49:33 2018 +0200 Print error message we get from socket.connect_ex when it fails --- src/test/test_rebind.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/test/test_rebind.py b/src/test/test_rebind.py index 6f759b717..7d0ccaf62 100644 --- a/src/test/test_rebind.py +++ b/src/test/test_rebind.py @@ -19,9 +19,10 @@ def fail(msg): def try_connecting_to_socksport(): socks_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - if socks_socket.connect_ex(('127.0.0.1', socks_port)): + e = socks_socket.connect_ex(('127.0.0.1', socks_port)) + if e: tor_process.terminate() - fail('Cannot connect to SOCKSPort') + fail('Cannot connect to SOCKSPort: error ' + os.strerror(e)) socks_socket.close() def wait_for_log(s):

1 0

[tor/master] Update ReleasingTor.md to reflect current practice
by nickm＠torproject.org 05 Dec '18

05 Dec '18

commit 1f6d7bc4afb5dd00c84c21c9323c2e2109f2378e Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 16 11:51:58 2018 -0500 Update ReleasingTor.md to reflect current practice See #28479. --- doc/HACKING/ReleasingTor.md | 109 +++++++++++++++++++++++++++----------------- 1 file changed, 68 insertions(+), 41 deletions(-) diff --git a/doc/HACKING/ReleasingTor.md b/doc/HACKING/ReleasingTor.md index b5444afa9..3073cfb10 100644 --- a/doc/HACKING/ReleasingTor.md +++ b/doc/HACKING/ReleasingTor.md @@ -20,30 +20,29 @@ new Tor release: === I. Make sure it works -1. Use it for a while, as a client, as a relay, as a hidden service, - and as a directory authority. See if it has any obvious bugs, and - resolve those. +1. Make sure that CI passes: have a look at Travis, Appveyor, and + Jenkins. Make sure you're looking at the right branches. - As applicable, merge the `maint-X` branch into the `release-X` branch. - But you've been doing that all along, right? + If there are any unexplained failures, try to fix them or figure them + out. -2. Are all of the jenkins builders happy? See jenkins.torproject.org. +2. Verify that there are no big outstanding issues. You might find such + issues -- - What about the bsd buildbots? - See http://buildbot.pixelminers.net/builders/ + * On Trac - What about Coverity Scan? + * On coverity scan - What about clang scan-build? + * On OSS-Fuzz - Does `make distcheck` complain? +3. Run checks that aren't covered above, including: - How about `make test-stem` and `make test-network` and - `make test-network-all`? + * clang scan-build. (See the script in ./scripts/test/scan_build.sh) - - Are all those tests still happy with --enable-expensive-hardening ? + * make test-network and make test-network-all (with + --enable-expensive-hardening) - Any memory leaks? + * Running Tor yourself and making sure that it actually works for you. === II. Write a changelog @@ -55,11 +54,14 @@ new Tor release: of them and reordering to focus on what users and funders would find interesting and understandable. - To do this, first run `./scripts/maint/lintChanges.py changes/*` and - fix as many warnings as you can. Then run `./scripts/maint/sortChanges.py - changes/* > changelog.in` to combine headings and sort the entries. - After that, it's time to hand-edit and fix the issues that lintChanges - can't find: + To do this, run + `./scripts/maint/sortChanges.py changes/* > changelog.in` + to combine headings and sort the entries. Copy the changelog.in file + into the ChangeLog. Run 'format_changelog.py' (see below) to clean + up the line breaks. + + After that, it's time to hand-edit and fix the issues that + lintChanges can't find: 1. Within each section, sort by "version it's a bugfix on", else by numerical ticket order. @@ -68,8 +70,6 @@ new Tor release: Make stuff very terse - Make sure each section name ends with a colon - Describe the user-visible problem right away Mention relevant config options by name. If they're rare or unusual, @@ -81,6 +81,8 @@ new Tor release: "Relays", not "servers" or "nodes" or "Tor relays". + "Onion services", not "hidden services". + "Stop FOOing", not "Fix a bug where we would FOO". Try not to let any given section be longer than about a page. Break up @@ -106,6 +108,8 @@ new Tor release: changelog: instead, look up the corrected versions that were merged into ChangeLog in the master branch, and use those. + Add "backport from X.Y.Z" in the section header for these entries. + 2. Compose a short release blurb to highlight the user-facing changes. Insert said release blurb into the ChangeLog stanza. If it's a stable release, add it to the ReleaseNotes file too. If we're adding @@ -142,33 +146,50 @@ new Tor release: master, merge it with "-s ours" to avoid a needless version bump. 2. Make distcheck, put the tarball up in somewhere (how about your - homedir on your homedir on people.torproject.org?) , and tell `#tor` - about it. Wait a while to see if anybody has problems building it. - (Though jenkins is usually pretty good about catching these things.) + homedir on your homedir on people.torproject.org?) , and tell `#tor-dev` + about it. + + If you want, wait until at least one person has built it + successfully. (We used to say "wait for others to test it", but our + CI has successfully caught these kinds of errors for the last several + years.) + + +3. Make sure that the new version is recommended in the latest consensus. + (Otherwise, users will get confused when it complains to them + about its status.) + + If it is not, you'll need to poke Roger, Weasel, and Sebastian again: see + item 0.1 at the start of this document. === IV. Commit, upload, announce 1. Sign the tarball, then sign and push the git tag: gpg -ba <the_tarball> - git tag -u <keyid> tor-0.3.x.y-status - git push origin tag tor-0.3.x.y-status + git tag -s tor-0.4.x.y-<status> + git push origin tag tor-0.4.x.y-<status> + + (You must do this before you update the website: the website scripts + rely on finding the version by tag.) - (You must do this before you update the website: it relies on finding - the version by tag.) + (If your default PGP key is not the one you want to sign with, then say + "-u <keyid>" instead of "-s".) 2. scp the tarball and its sig to the dist website, i.e. - `/srv/dist-master.torproject.org/htdocs/` on dist-master. When you want - it to go live, you run "static-update-component dist.torproject.org" - on dist-master. + `/srv/dist-master.torproject.org/htdocs/` on dist-master. Run + "static-update-component dist.torproject.org" on dist-master. In the webwml.git repository, `include/versions.wmi` and `Makefile` - to note the new version. + to note the new version. Push these changes to master. (NOTE: Due to #17805, there can only be one stable version listed at once. Nonetheless, do not call your version "alpha" if it is stable, or people will get confused.) + (NOTE: It will take a while for the website update scripts to update + the website.) + 3. Email the packagers (cc'ing tor-team) that a new tarball is up. The current list of packagers is: @@ -186,29 +207,35 @@ new Tor release: Also, email tor-packagers(a)lists.torproject.org. + Mention where to download the tarball (https://dist.torproject.org) + + Include a link to the changelog. + + 4. Add the version number to Trac. To do this, go to Trac, log in, select "Admin" near the top of the screen, then select "Versions" from the menu on the left. At the right, there will be an "Add version" box. By convention, we enter the version in the form "Tor: - 0.2.2.23-alpha" (or whatever the version is), and we select the date as + 0.4.0.1-alpha" (or whatever the version is), and we select the date as the date in the ChangeLog. -5. Double-check: did the version get recommended in the consensus yet? Is - the website updated? If not, don't announce until they have the - up-to-date versions, or people will get confused. +5. Wait for the download page to be updated. (If you don't do this before you + announce, people will be confused.) 6. Mail the release blurb and ChangeLog to tor-talk (development release) or tor-announce (stable). Post the changelog on the blog as well. You can generate a - blog-formatted version of the changelog with the -B option to - format-changelog. + blog-formatted version of the changelog with + `./scripts/maint/format_changelog.py --B` When you post, include an estimate of when the next TorBrowser releases will come out that include this Tor release. This will usually track https://wiki.mozilla.org/RapidRelease/Calendar , but it can vary. + For templates to use when announcing, see: + https://trac.torproject.org/projects/tor/wiki/org/teams/NetworkTeam/Announc… === V. Aftermath and cleanup @@ -216,7 +243,7 @@ new Tor release: `maint-x.y.z` branch to "newversion-dev", and do a `merge -s ours` merge to avoid taking that change into master. -2. Forward-port the ChangeLog (and ReleaseNotes if appropriate). +2. Forward-port the ChangeLog (and ReleaseNotes if appropriate) to the + master branch. 3. Keep an eye on the blog post, to moderate comments and answer questions. -

1 0

[tor/master] Merge branch 'ticket28479_squashed'
by nickm＠torproject.org 05 Dec '18

05 Dec '18

commit df70bc3a888ac0e746649018202ca84a8615df82 Merge: 8506dcdeb 1f6d7bc4a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 5 07:59:44 2018 -0500 Merge branch 'ticket28479_squashed' doc/HACKING/ReleasingTor.md | 109 +++++++++++++++++++++++++++----------------- 1 file changed, 68 insertions(+), 41 deletions(-)

1 0

[tor-browser-build/maint-8.0] Release preparations for 8.0.4
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit 88491f1d51de13a2431dade85e0a18779ab7a051 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 5 09:22:41 2018 +0000 Release preparations for 8.0.4 Changelog update and versions bump --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 2 +- projects/https-everywhere/config | 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 28 ++++++++++++++++++++++ projects/tor-browser/config | 4 ++-- projects/tor/config | 2 +- projects/torbutton/config | 2 +- rbm.conf | 4 ++-- 8 files changed, 37 insertions(+), 9 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 4e42939..04cd7dd 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' diff --git a/projects/firefox/config b/projects/firefox/config index bad1ac5..831a5fb 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -7,7 +7,7 @@ git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg var: - firefox_platform_version: 60.3.0 + firefox_platform_version: 60.4.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 8.0 torbrowser_update_channel: alpha diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index e189eb9..b0b3ce9 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2018.9.19 +version: 2018.10.31 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index b98edcb..d347684 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,31 @@ +Tor Browser 8.0.4 -- December 11 2018 + * All platforms + * Update Firefox to 60.4.0esr + * Update Tor to 0.3.4.9 + * Update OpenSSL to 1.0.2q + * Update Torbutton to 2.0.9 + * Bug 28540: Use new text for 2018 donation banner + * Bug 28515: Use en-US for english Torbutton strings + * Translations update + * Update HTTPS Everywhere to 2018.10.31 + * Update NoScript to 10.2.0 + * Bug 1623: Block protocol handler enumeration (backport of fix for #680300) + * Bug 25794: Disable pointer events + * Bug 28608: Disable background HTTP response throttling + * Bug 28185: Add smallerRichard to Tor Browser + * Windows + * Bug 26381: about:tor page does not load on first start on Windows + * Bug 28657: Remove broken FTE bridge from Tor Browser + * OS X + * Bug 26263: App icon positioned incorrectly in macOS DMG installer window + * Bug 26475: Fix Stylo related reproducibilitiy issue + * Linux + * Bug 26475: Fix Stylo related reproducibilitiy issue + * Bug 28657: Remove broken FTE bridge from Tor Browser + * Build System + * All Platforms + * Bug 27218: Generate multiple Tor Browser bundles in parallel + Tor Browser 8.0.3 -- October 23 2018 * All platforms * Update Firefox to 60.3.0esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index bb1c259..1a37ea1 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -71,9 +71,9 @@ input_files: name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: e7ec0345c2174e64c7552ab708a59c8efd7c1078fedda64d9c9ad06a899194b9 + sha256sum: 23c7783eecabeb044aa1e38c93d43ce7c41957b1ea031016d39737712729c81d - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/projects/tor/config b/projects/tor/config index 1549369..5dd5206 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.3.4.8 +version: 0.3.4.9 git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1 diff --git a/projects/torbutton/config b/projects/torbutton/config index df0d674..168584a 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.0.8 +version: 2.0.9 git_url: https://git.torproject.org/torbutton.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index b4f58ed..599fe5d 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.0.3' + torbrowser_version: '8.0.4' torbrowser_build: 'build1' torbrowser_incremental_from: - - 8.0.2 + - 8.0.3 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/maint-8.0] Update OpenSSL to 1.0.2q
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit 54423878a373c34519f3ab621aa838306d1f3c24 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Dec 3 08:06:40 2018 +0000 Update OpenSSL to 1.0.2q --- projects/openssl/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/openssl/config b/projects/openssl/config index d3ed959..e91e820 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.0.2p +version: 1.0.2q filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: @@ -26,4 +26,4 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz' - sha256sum: 50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00 + sha256sum: 5744cfcbcec2b1b48629f7354203bc1e5e9b5466998bbccc5b5fcde3b18eb684

1 0

[tor-browser-build/maint-8.0] Bug 28185: Add smallerRichard to Tor Browser
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit aeab20a433870b5c93acacfebe78666b4f7d585a Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 29 16:15:07 2018 +0000 Bug 28185: Add smallerRichard to Tor Browser --- projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index ec76ce7..f58eb02 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -39,6 +39,7 @@ pref("extensions.torlauncher.default_bridge.obfs4.24", "obfs4 37.218.245.14:3822 pref("extensions.torlauncher.default_bridge.obfs4.25", "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.26", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.27", "obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.28", "obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[torbutton/maint-2.0] Translations update
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit 65b6219be53b32a58125a5a5acdccbd861702d10 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 5 08:46:22 2018 +0000 Translations update --- src/chrome/locale/ar/browserOnboarding.properties | 12 ++++++------ src/chrome/locale/pl/aboutTor.dtd | 2 +- src/chrome/locale/pl/browserOnboarding.properties | 2 +- src/chrome/locale/pt-BR/aboutTor.dtd | 4 ++-- src/chrome/locale/pt-BR/torbutton.dtd | 8 ++++---- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/chrome/locale/ar/browserOnboarding.properties b/src/chrome/locale/ar/browserOnboarding.properties index 0b04e973..448f6a61 100644 --- a/src/chrome/locale/ar/browserOnboarding.properties +++ b/src/chrome/locale/ar/browserOnboarding.properties @@ -8,12 +8,12 @@ onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard onboarding.tour-tor-welcome.button=Start Now onboarding.tour-tor-privacy=الخصوصية -onboarding.tour-tor-privacy.title=Snub trackers and snoopers. -onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level. -onboarding.tour-tor-privacy.button=Go to Tor Network +onboarding.tour-tor-privacy.title=المتلصصون و اكلواسعة اﻹنترنت +onboarding.tour-tor-privacy.description=متصفح تور يعزل ملفات التعريق و يمسح ارشيف اﻹنترنت الخاص بك بعد انتهائك من التصفح. هذه التعديلات تتأكد من امانك و خصوصيتك في المتصفح. اضغط على شبكة تور لتعرف اكثر كيف نحميك على مستوى الشبكه +onboarding.tour-tor-privacy.button=اذهب الى شبكة تور -onboarding.tour-tor-network=Tor Network -onboarding.tour-tor-network.title=Travel a decentralized network. +onboarding.tour-tor-network=شبكة تور +onboarding.tour-tor-network.title=اﻹنتقال لشبكه لا مركزيه onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. onboarding.tour-tor-network.button=Go to Circuit Display @@ -23,7 +23,7 @@ onboarding.tour-tor-circuit-display.description=For each domain you visit, your onboarding.tour-tor-circuit-display.button=See My Path onboarding.tour-tor-security=الأمان -onboarding.tour-tor-security.title=Choose your experience. +onboarding.tour-tor-security.title=اختر مدى خبرتك onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. onboarding.tour-tor-security.button=Review Settings diff --git a/src/chrome/locale/pl/aboutTor.dtd b/src/chrome/locale/pl/aboutTor.dtd index 31df7d7b..b523d30d 100644 --- a/src/chrome/locale/pl/aboutTor.dtd +++ b/src/chrome/locale/pl/aboutTor.dtd @@ -27,7 +27,7 @@ <!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> <!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> -<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> +<!ENTITY aboutTor.donationBanner.line1 "Tor: Siła w liczbach"> <!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> <!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> diff --git a/src/chrome/locale/pl/browserOnboarding.properties b/src/chrome/locale/pl/browserOnboarding.properties index 8c1730b0..f02655f4 100644 --- a/src/chrome/locale/pl/browserOnboarding.properties +++ b/src/chrome/locale/pl/browserOnboarding.properties @@ -12,7 +12,7 @@ onboarding.tour-tor-privacy.title=Snub trackers and snoopers. onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level. onboarding.tour-tor-privacy.button=Go to Tor Network -onboarding.tour-tor-network=Tor Network +onboarding.tour-tor-network=Sieć Tor onboarding.tour-tor-network.title=Travel a decentralized network. onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. onboarding.tour-tor-network.button=Go to Circuit Display diff --git a/src/chrome/locale/pt-BR/aboutTor.dtd b/src/chrome/locale/pt-BR/aboutTor.dtd index 243a012b..02a848a7 100644 --- a/src/chrome/locale/pt-BR/aboutTor.dtd +++ b/src/chrome/locale/pt-BR/aboutTor.dtd @@ -39,10 +39,10 @@ <!ENTITY aboutTor.donationBanner.line2g "Apóie a liberdade na internet."> <!ENTITY aboutTor.donationBanner.line2h "Defenda a web aberta."> <!ENTITY aboutTor.donationBanner.line2i "Apóie a privacidade e liberdade online."> -<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> +<!ENTITY aboutTor.donationBanner.line2j "A Mozilla está combinando cada doação até 2019."> <!ENTITY aboutTor.donationBanner.line3 "Doe hoje, e a Mozilla duplicará a sua doação."> -<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> +<!ENTITY aboutTor.donationBanner.line3b "Dê agora, e seu presente se torna duas vezes mais forte."> <!ENTITY aboutTor.donationBanner.buttonA "Doar Agora"> <!ENTITY aboutTor.donationBanner.buttonB "Estou dentro"> diff --git a/src/chrome/locale/pt-BR/torbutton.dtd b/src/chrome/locale/pt-BR/torbutton.dtd index 415f1517..594b4a62 100644 --- a/src/chrome/locale/pt-BR/torbutton.dtd +++ b/src/chrome/locale/pt-BR/torbutton.dtd @@ -35,12 +35,12 @@ <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider possibilita que você desabilite certas funcionalidades de navegação que podem torná-la mais vulnerável a tentativas de ataque."> <!ENTITY torbutton.prefs.sec_standard_label "Padrão"> <!ENTITY torbutton.prefs.sec_standard_description "Todos os recursos do Navegador Tor e do website estão ativos."> -<!ENTITY torbutton.prefs.sec_safer_label "Mais seguro"> +<!ENTITY torbutton.prefs.sec_safer_label "Seguro"> <!ENTITY torbutton.prefs.sec_safer_description "Desativar recursos geralmente inseguros de websites, o que pode fazer com que alguns sites percam a funcionalidade."> -<!ENTITY torbutton.prefs.sec_safer_list_label "No nível mais seguro:"> -<!ENTITY torbutton.prefs.sec_safest_label "Mais seguro"> +<!ENTITY torbutton.prefs.sec_safer_list_label "No nível seguro:"> +<!ENTITY torbutton.prefs.sec_safest_label "Segurança máxima"> <!ENTITY torbutton.prefs.sec_safest_description "Apenas permitir os recursos dos websites necessários para sites estáticos e serviços básicos. Essas mudanças afetam imagens, mídias e scripts."> -<!ENTITY torbutton.prefs.sec_safest_list_label "No nível mais seguro:"> +<!ENTITY torbutton.prefs.sec_safest_list_label "No nível de segurança máxima:"> <!ENTITY torbutton.prefs.sec_learn_more_label "Aprenda mais"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript está desativado em todos os sites sem HTTPS."> <!ENTITY torbutton.prefs.sec_js_disabled "JavaScript está desativado por padrão em todos os sites.">

1 0

[torbutton/maint-2.0] Release preparation for 2.0.9
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit 0902153ee2fffc3fe80d03a2c25254112774c5c6 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 5 08:53:49 2018 +0000 Release preparation for 2.0.9 CHANGELOG update and version bump --- src/CHANGELOG | 5 +++++ src/install.rdf | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 91f32c9b..361795c2 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,8 @@ +2.0.9 + * Bug 28540: Use new text for 2018 donation banner + * Bug 28515: Use en-US for english Torbutton strings + * Translations update + 2.0.8 * Bug 23925+27959: Donation banner for year end 2018 campaign * Bug 24172: Donation banner clobbers Tor Browser version string diff --git a/src/install.rdf b/src/install.rdf index 544f9468..df90703b 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>2.0.8</em:version> + <em:version>2.0.9</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[torbutton/master] Translations update
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit 07e7b64c89ecc70283aee75f2c4bbe479736e1a1 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 5 08:46:22 2018 +0000 Translations update --- src/chrome/locale/ar/browserOnboarding.properties | 12 ++++++------ src/chrome/locale/pl/aboutTor.dtd | 2 +- src/chrome/locale/pl/browserOnboarding.properties | 2 +- src/chrome/locale/pt-BR/aboutTor.dtd | 4 ++-- src/chrome/locale/pt-BR/torbutton.dtd | 8 ++++---- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/chrome/locale/ar/browserOnboarding.properties b/src/chrome/locale/ar/browserOnboarding.properties index 0b04e973..448f6a61 100644 --- a/src/chrome/locale/ar/browserOnboarding.properties +++ b/src/chrome/locale/ar/browserOnboarding.properties @@ -8,12 +8,12 @@ onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard onboarding.tour-tor-welcome.button=Start Now onboarding.tour-tor-privacy=الخصوصية -onboarding.tour-tor-privacy.title=Snub trackers and snoopers. -onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level. -onboarding.tour-tor-privacy.button=Go to Tor Network +onboarding.tour-tor-privacy.title=المتلصصون و اكلواسعة اﻹنترنت +onboarding.tour-tor-privacy.description=متصفح تور يعزل ملفات التعريق و يمسح ارشيف اﻹنترنت الخاص بك بعد انتهائك من التصفح. هذه التعديلات تتأكد من امانك و خصوصيتك في المتصفح. اضغط على شبكة تور لتعرف اكثر كيف نحميك على مستوى الشبكه +onboarding.tour-tor-privacy.button=اذهب الى شبكة تور -onboarding.tour-tor-network=Tor Network -onboarding.tour-tor-network.title=Travel a decentralized network. +onboarding.tour-tor-network=شبكة تور +onboarding.tour-tor-network.title=اﻹنتقال لشبكه لا مركزيه onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. onboarding.tour-tor-network.button=Go to Circuit Display @@ -23,7 +23,7 @@ onboarding.tour-tor-circuit-display.description=For each domain you visit, your onboarding.tour-tor-circuit-display.button=See My Path onboarding.tour-tor-security=الأمان -onboarding.tour-tor-security.title=Choose your experience. +onboarding.tour-tor-security.title=اختر مدى خبرتك onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. onboarding.tour-tor-security.button=Review Settings diff --git a/src/chrome/locale/pl/aboutTor.dtd b/src/chrome/locale/pl/aboutTor.dtd index 31df7d7b..b523d30d 100644 --- a/src/chrome/locale/pl/aboutTor.dtd +++ b/src/chrome/locale/pl/aboutTor.dtd @@ -27,7 +27,7 @@ <!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> <!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> -<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> +<!ENTITY aboutTor.donationBanner.line1 "Tor: Siła w liczbach"> <!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> <!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> diff --git a/src/chrome/locale/pl/browserOnboarding.properties b/src/chrome/locale/pl/browserOnboarding.properties index 8c1730b0..f02655f4 100644 --- a/src/chrome/locale/pl/browserOnboarding.properties +++ b/src/chrome/locale/pl/browserOnboarding.properties @@ -12,7 +12,7 @@ onboarding.tour-tor-privacy.title=Snub trackers and snoopers. onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level. onboarding.tour-tor-privacy.button=Go to Tor Network -onboarding.tour-tor-network=Tor Network +onboarding.tour-tor-network=Sieć Tor onboarding.tour-tor-network.title=Travel a decentralized network. onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. onboarding.tour-tor-network.button=Go to Circuit Display diff --git a/src/chrome/locale/pt-BR/aboutTor.dtd b/src/chrome/locale/pt-BR/aboutTor.dtd index 243a012b..02a848a7 100644 --- a/src/chrome/locale/pt-BR/aboutTor.dtd +++ b/src/chrome/locale/pt-BR/aboutTor.dtd @@ -39,10 +39,10 @@ <!ENTITY aboutTor.donationBanner.line2g "Apóie a liberdade na internet."> <!ENTITY aboutTor.donationBanner.line2h "Defenda a web aberta."> <!ENTITY aboutTor.donationBanner.line2i "Apóie a privacidade e liberdade online."> -<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> +<!ENTITY aboutTor.donationBanner.line2j "A Mozilla está combinando cada doação até 2019."> <!ENTITY aboutTor.donationBanner.line3 "Doe hoje, e a Mozilla duplicará a sua doação."> -<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> +<!ENTITY aboutTor.donationBanner.line3b "Dê agora, e seu presente se torna duas vezes mais forte."> <!ENTITY aboutTor.donationBanner.buttonA "Doar Agora"> <!ENTITY aboutTor.donationBanner.buttonB "Estou dentro"> diff --git a/src/chrome/locale/pt-BR/torbutton.dtd b/src/chrome/locale/pt-BR/torbutton.dtd index 415f1517..594b4a62 100644 --- a/src/chrome/locale/pt-BR/torbutton.dtd +++ b/src/chrome/locale/pt-BR/torbutton.dtd @@ -35,12 +35,12 @@ <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider possibilita que você desabilite certas funcionalidades de navegação que podem torná-la mais vulnerável a tentativas de ataque."> <!ENTITY torbutton.prefs.sec_standard_label "Padrão"> <!ENTITY torbutton.prefs.sec_standard_description "Todos os recursos do Navegador Tor e do website estão ativos."> -<!ENTITY torbutton.prefs.sec_safer_label "Mais seguro"> +<!ENTITY torbutton.prefs.sec_safer_label "Seguro"> <!ENTITY torbutton.prefs.sec_safer_description "Desativar recursos geralmente inseguros de websites, o que pode fazer com que alguns sites percam a funcionalidade."> -<!ENTITY torbutton.prefs.sec_safer_list_label "No nível mais seguro:"> -<!ENTITY torbutton.prefs.sec_safest_label "Mais seguro"> +<!ENTITY torbutton.prefs.sec_safer_list_label "No nível seguro:"> +<!ENTITY torbutton.prefs.sec_safest_label "Segurança máxima"> <!ENTITY torbutton.prefs.sec_safest_description "Apenas permitir os recursos dos websites necessários para sites estáticos e serviços básicos. Essas mudanças afetam imagens, mídias e scripts."> -<!ENTITY torbutton.prefs.sec_safest_list_label "No nível mais seguro:"> +<!ENTITY torbutton.prefs.sec_safest_list_label "No nível de segurança máxima:"> <!ENTITY torbutton.prefs.sec_learn_more_label "Aprenda mais"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript está desativado em todos os sites sem HTTPS."> <!ENTITY torbutton.prefs.sec_js_disabled "JavaScript está desativado por padrão em todos os sites.">

1 0

[torbutton/maint-2.0] Bug 25013: Make `en` a symlink of `en-US` instead
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit 35112aa867b4657dc5cc0658c673293d6ca08054 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 12 13:14:25 2018 +0000 Bug 25013: Make `en` a symlink of `en-US` instead --- src/chrome/locale/en | 1 + src/chrome/locale/en-US | 1 - src/chrome/locale/{en => en-US}/aboutDialog.dtd | 0 src/chrome/locale/{en => en-US}/aboutTBUpdate.dtd | 0 src/chrome/locale/{en => en-US}/aboutTor.dtd | 0 src/chrome/locale/{en => en-US}/brand.dtd | 0 src/chrome/locale/{en => en-US}/brand.properties | 0 src/chrome/locale/{en => en-US}/browserOnboarding.properties | 0 src/chrome/locale/{en => en-US}/torbutton.dtd | 0 src/chrome/locale/{en => en-US}/torbutton.properties | 0 10 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/locale/en b/src/chrome/locale/en new file mode 120000 index 00000000..f2b0341f --- /dev/null +++ b/src/chrome/locale/en @@ -0,0 +1 @@ +en-US \ No newline at end of file diff --git a/src/chrome/locale/en-US b/src/chrome/locale/en-US deleted file mode 120000 index 2c4c454f..00000000 --- a/src/chrome/locale/en-US +++ /dev/null @@ -1 +0,0 @@ -en \ No newline at end of file diff --git a/src/chrome/locale/en/aboutDialog.dtd b/src/chrome/locale/en-US/aboutDialog.dtd similarity index 100% rename from src/chrome/locale/en/aboutDialog.dtd rename to src/chrome/locale/en-US/aboutDialog.dtd diff --git a/src/chrome/locale/en/aboutTBUpdate.dtd b/src/chrome/locale/en-US/aboutTBUpdate.dtd similarity index 100% rename from src/chrome/locale/en/aboutTBUpdate.dtd rename to src/chrome/locale/en-US/aboutTBUpdate.dtd diff --git a/src/chrome/locale/en/aboutTor.dtd b/src/chrome/locale/en-US/aboutTor.dtd similarity index 100% rename from src/chrome/locale/en/aboutTor.dtd rename to src/chrome/locale/en-US/aboutTor.dtd diff --git a/src/chrome/locale/en/brand.dtd b/src/chrome/locale/en-US/brand.dtd similarity index 100% rename from src/chrome/locale/en/brand.dtd rename to src/chrome/locale/en-US/brand.dtd diff --git a/src/chrome/locale/en/brand.properties b/src/chrome/locale/en-US/brand.properties similarity index 100% rename from src/chrome/locale/en/brand.properties rename to src/chrome/locale/en-US/brand.properties diff --git a/src/chrome/locale/en/browserOnboarding.properties b/src/chrome/locale/en-US/browserOnboarding.properties similarity index 100% rename from src/chrome/locale/en/browserOnboarding.properties rename to src/chrome/locale/en-US/browserOnboarding.properties diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en-US/torbutton.dtd similarity index 100% rename from src/chrome/locale/en/torbutton.dtd rename to src/chrome/locale/en-US/torbutton.dtd diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en-US/torbutton.properties similarity index 100% rename from src/chrome/locale/en/torbutton.properties rename to src/chrome/locale/en-US/torbutton.properties

1 0