November 2022 - tor-commits - lists.torproject.org

[tor-browser] branch tor-browser-102.4.0esr-12.0-2 updated (fb128239c335 -> afd362e621f5)
by gitolite role 15 Nov '22

15 Nov '22

This is an automated email from the git hooks/post-receive script. pierov pushed a change to branch tor-browser-102.4.0esr-12.0-2 in repository tor-browser. from fb128239c335 fixup! Bug 40925: Implemented the Security Level component new 71f1cec6a9ea fixup! Bug 41369: Improve Firefox language settings for multi-lingual packages new afd362e621f5 squash! Bug 41369: Improve Firefox language settings for multi-lingual packages The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: browser/base/content/browser.xhtml | 2 + browser/base/content/languageNotification.js | 67 ++++++++++++++++++++++ browser/base/jar.mn | 2 + browser/components/preferences/main.inc.xhtml | 2 +- browser/components/preferences/main.js | 2 +- .../locales/en-US/browser/languageNotification.ftl | 10 ++++ 6 files changed, 83 insertions(+), 2 deletions(-) create mode 100644 browser/base/content/languageNotification.js create mode 100644 browser/locales/en-US/browser/languageNotification.ftl -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 2

[tor-browser] branch tor-browser-102.4.0esr-12.0-2 updated (f8d051d6f08f -> fb128239c335)
by gitolite role 15 Nov '22

15 Nov '22

This is an automated email from the git hooks/post-receive script. pierov pushed a change to branch tor-browser-102.4.0esr-12.0-2 in repository tor-browser. from f8d051d6f08f fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser new 03b200a1d401 Bug 41454: Move focus after calling openPreferences for a sub-category. new fb128239c335 fixup! Bug 40925: Implemented the Security Level component The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: browser/components/preferences/preferences.js | 11 +++++++++++ .../securitylevel/content/securityLevelPreferences.inc.xhtml | 7 +++++-- 2 files changed, 16 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 2

[builders/tor-browser-build] branch main updated (3afab9a8 -> 0553b695)
by gitolite role 15 Nov '22

15 Nov '22

This is an automated email from the git hooks/post-receive script. boklm pushed a change to branch main in repository builders/tor-browser-build. from 3afab9a8 Bug 40685: Remove targets/nightly/var/mar_locales from rbm.conf new ea8a1620 Bug 40439: Create universal x86_64/arm64 mac builds new 7431ad67 Bug 40067: Rename osx64 mar and dmg files to macos new d499c3a9 Bug 40067: Update nightly directory for macos new 985480eb Bug 40067: Rename osx targets and configs to macos new 0553b695 Bug 40439: Add option for macos single-arch non-universal testbuild The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: Makefile | 62 +++------ README | 2 +- doc/HACKING.txt | 14 +- doc/MAKEFILE.txt | 19 ++- projects/browser/build | 152 ++++++++++++++++----- projects/browser/config | 41 ++++-- projects/clang/build | 2 +- projects/firefox/build | 16 +-- projects/firefox/config | 8 +- projects/firefox/list_toolchain_updates_checks | 6 +- projects/firefox/mozconfig | 6 +- projects/fonts/build | 4 +- projects/fonts/config | 2 +- projects/go/build | 2 +- projects/go/config | 6 +- projects/libevent/build | 2 +- projects/libevent/config | 2 +- projects/macosx-toolchain/build | 4 +- projects/node/config | 2 +- projects/openssl/build | 2 +- projects/openssl/config | 4 +- projects/release/build | 11 +- projects/release/config | 36 +++-- projects/release/update_responses_config.yml | 8 +- projects/rust/build | 4 +- projects/rust/config | 2 +- projects/tor/build | 10 +- projects/tor/config | 2 +- rbm.conf | 55 ++++---- tools/dmg2mar | 6 +- tools/marsigning_check.sh | 2 +- tools/signing/check_file_counts | 4 +- tools/signing/gatekeeper-bundling.sh | 2 +- tools/signing/macos-signer-gatekeeper-signing | 2 +- tools/signing/nightly/config.yml | 2 +- .../nightly/update-responses-base-config.yml | 11 +- tools/update-responses/update_responses | 6 +- 37 files changed, 320 insertions(+), 201 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 5

[torbutton] branch main updated: Bug 41451: Use app locale rather than requested locale
by gitolite role 14 Nov '22

14 Nov '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch main in repository torbutton. The following commit(s) were added to refs/heads/main by this push: new f5cbb382 Bug 41451: Use app locale rather than requested locale f5cbb382 is described below commit f5cbb38236e1dd0c1debc8c625833c2b08fd2b9d Author: Henry Wilkes <henry(a)torproject.org> AuthorDate: Mon Nov 14 18:38:53 2022 +0000 Bug 41451: Use app locale rather than requested locale --- chrome/content/aboutTor/aboutTor-content.js | 11 ++++------- modules/utils.js | 9 +++++++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/chrome/content/aboutTor/aboutTor-content.js b/chrome/content/aboutTor/aboutTor-content.js index a35d95b5..6c53dff8 100644 --- a/chrome/content/aboutTor/aboutTor-content.js +++ b/chrome/content/aboutTor/aboutTor-content.js @@ -19,7 +19,7 @@ const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); -const { bindPrefAndInit } = ChromeUtils.import( +const { bindPrefAndInit, getLocale } = ChromeUtils.import( "resource://torbutton/modules/utils.js" ); @@ -65,10 +65,7 @@ var AboutTorListener = { onPageLoad() { // Arrange to update localized text and links. bindPrefAndInit("intl.locale.requested", () => { - const aNewVal = Services.locale.requestedLocale; - if (aNewVal !== null) { - this.onLocaleChange(aNewVal); - } + this.onLocaleChange(); }); // Add message and event listeners. @@ -116,10 +113,10 @@ var AboutTorListener = { body.setAttribute("initialized", "yes"); }, - onLocaleChange(aLocale) { + onLocaleChange() { // Set localized "Get Involved" link. content.document.getElementById("getInvolvedLink").href = - "https://community.torproject.org/" + aLocale; + `https://community.torproject.org/${getLocale()}`; // Display the Tor Browser product name and version. try { diff --git a/modules/utils.js b/modules/utils.js index 49f7c0dc..30947a73 100644 --- a/modules/utils.js +++ b/modules/utils.js @@ -88,9 +88,14 @@ var getEnv = function(name) { }; // __getLocale -// Reads the browser locale, the default locale is en-US. +// Returns the app locale to be used in tor-related urls. var getLocale = function() { - return Services.locale.requestedLocale || "en-US"; + const locale = Services.locale.appLocaleAsBCP47; + if (locale === "ja-JP-macos") { + // We don't want to distinguish the mac locale. + return "ja"; + } + return locale; }; // ## Windows -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-102.4.0esr-12.0-2 updated: fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser
by gitolite role 14 Nov '22

14 Nov '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch tor-browser-102.4.0esr-12.0-2 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-102.4.0esr-12.0-2 by this push: new f8d051d6f08f fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser f8d051d6f08f is described below commit f8d051d6f08fc3d89edd1b69f2e0ebef8dd9aed8 Author: hackademix <giorgio(a)maone.net> AuthorDate: Fri Nov 11 00:28:00 2022 +0100 fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser --- tools/torbrowser/fetch.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/torbrowser/fetch.sh b/tools/torbrowser/fetch.sh index 5b5c627c0c34..f91459530553 100755 --- a/tools/torbrowser/fetch.sh +++ b/tools/torbrowser/fetch.sh @@ -7,7 +7,7 @@ BINARIES_DIR=$1 wget https://aus1.torproject.org/torbrowser/update_3/alpha/downloads.json # get url for latest alpha linux en_US package TOR_BROWSER_VERSION=$(grep -Eo "\"version\":\"[0-9.a]+\"" downloads.json | grep -Eo "[0-9.a]+") -TOR_BROWSER_PACKAGE="tor-browser-linux64-${TOR_BROWSER_VERSION}_en-US.tar.xz" +TOR_BROWSER_PACKAGE="tor-browser-linux64-${TOR_BROWSER_VERSION}_ALL.tar.xz" TOR_BROWSER_PACKAGE_URL="https://dist.torproject.org/torbrowser/${TOR_BROWSER_VERSION}/${TOR_BROWSER…" # remove download manifest @@ -24,7 +24,7 @@ mkdir -p "${BINARIES_DIR}" # and extract tar -xf ${TOR_BROWSER_PACKAGE} -C "${BINARIES_DIR}" -mv "${BINARIES_DIR}/tor-browser_en-US" "${BINARIES_DIR}/dev" +mv "${BINARIES_DIR}/tor-browser" "${BINARIES_DIR}/dev" # cleanup rm -f "${TOR_BROWSER_PACKAGE}" -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-102.4.0esr-12.0-2 updated (e2c53373c56c -> 3c7db5829367)
by gitolite role 11 Nov '22

11 Nov '22

This is an automated email from the git hooks/post-receive script. richard pushed a change to branch tor-browser-102.4.0esr-12.0-2 in repository tor-browser. from e2c53373c56c fixup! Firefox preference overrides. new c33d99d17934 dropme! Bug 41426: temporarily bring back stub installer logic so we can delete it in subsequent new fixup commit; new 3c7db5829367 fixup! Base Browser's .mozconfigs. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 2

[pluggable-transports/snowflake-webext] tag webext-0.7.0 created (now 3d59694)
by gitolite role 11 Nov '22

11 Nov '22

This is an automated email from the git hooks/post-receive script. cohosh pushed a change to tag webext-0.7.0 in repository pluggable-transports/snowflake-webext. at 3d59694 (commit) No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[pluggable-transports/snowflake-webext] branch main updated: bump version to 0.7.0
by gitolite role 11 Nov '22

11 Nov '22

This is an automated email from the git hooks/post-receive script. cohosh pushed a commit to branch main in repository pluggable-transports/snowflake-webext. The following commit(s) were added to refs/heads/main by this push: new 3d59694 bump version to 0.7.0 3d59694 is described below commit 3d5969429e28c4504cfc69fb85ca6fabac040d29 Author: Cecylia Bocovich <cohosh(a)torproject.org> AuthorDate: Fri Nov 11 13:55:11 2022 -0500 bump version to 0.7.0 --- package-lock.json | 4 ++-- package.json | 2 +- translation | 2 +- webext/manifest_base.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 54f2cae..a570f11 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "snowflake-pt", - "version": "0.6.2", + "version": "0.6.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "snowflake-pt", - "version": "0.6.2", + "version": "0.6.3", "license": "BSD-3-Clause", "dependencies": { "wrtc": "^0.4.7", diff --git a/package.json b/package.json index fda82f9..ab0f390 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "snowflake-pt", - "version": "0.6.3", + "version": "0.7.0", "description": "Allow users in censored countries to use your network connection to access the Tor network.", "main": "build/snowflake.js", "directories": { diff --git a/translation b/translation index e8fe49d..20bfbca 160000 --- a/translation +++ b/translation @@ -1 +1 @@ -Subproject commit e8fe49d0ebfe599eeb8c0679c19fd0b7d0a06d7d +Subproject commit 20bfbcac33a40d13a2c3850c84360467dd6f834d diff --git a/webext/manifest_base.json b/webext/manifest_base.json index 6de42ab..192a7c1 100644 --- a/webext/manifest_base.json +++ b/webext/manifest_base.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "name": "Snowflake", - "version": "0.6.3", + "version": "0.7.0", "description": "__MSG_appDesc__", "default_locale": "en_US", "icons": { -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[pluggable-transports/snowflake-webext] branch main updated: feat: show number of clients on the icon badge
by gitolite role 11 Nov '22

11 Nov '22

This is an automated email from the git hooks/post-receive script. cohosh pushed a commit to branch main in repository pluggable-transports/snowflake-webext. The following commit(s) were added to refs/heads/main by this push: new b4743eb feat: show number of clients on the icon badge b4743eb is described below commit b4743eb1c7c48019411e2c26b4e6e31ded836d66 Author: WofWca <wofwca(a)protonmail.com> AuthorDate: Wed Nov 9 13:46:08 2022 +0400 feat: show number of clients on the icon badge Closes #50 --- init-webext.js | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/init-webext.js b/init-webext.js index 0a6c2b9..4bbeff9 100644 --- a/init-webext.js +++ b/init-webext.js @@ -181,25 +181,42 @@ class WebExtUI extends UI { setIcon() { let path = null; + let badgeText = ''; if (!this.enabled) { path = { 48: "assets/toolbar-off-48.png", 96: "assets/toolbar-off-96.png" }; - } else if (this.active) { - path = { - 48: "assets/toolbar-running-48.png", - 96: "assets/toolbar-running-96.png" - }; } else { - path = { - 48: "assets/toolbar-on-48.png", - 96: "assets/toolbar-on-96.png" - }; + if (this.active) { + path = { + 48: "assets/toolbar-running-48.png", + 96: "assets/toolbar-running-96.png" + }; + } else { + path = { + 48: "assets/toolbar-on-48.png", + 96: "assets/toolbar-on-96.png" + }; + } + + const totalClients = this.stats.reduce((t, c) => t + c, 0); + if (totalClients > 0) { + if (config.maxNumClients > 1 && this.clients > 0) { + // Like `19+3` + badgeText = `${totalClients - this.clients}+${this.clients}`; + } else { + badgeText = `${totalClients}`; + } + } } chrome.browserAction.setIcon({ path: path, }); + // Color is taken from Tor Browser (tor-styles.css, `purple-30`, + // with lightness changed to 81%). + chrome.browserAction.setBadgeBackgroundColor({ color: '#d79eff' }); + chrome.browserAction.setBadgeText({ text: badgeText }); } } -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[pluggable-transports/snowflake-webext] branch main updated: Use manually maintained list for availableLangs
by gitolite role 11 Nov '22

11 Nov '22

This is an automated email from the git hooks/post-receive script. cohosh pushed a commit to branch main in repository pluggable-transports/snowflake-webext. The following commit(s) were added to refs/heads/main by this push: new 3e35de8 Use manually maintained list for availableLangs 3e35de8 is described below commit 3e35de884edf47e37d67df72ccba839e96c3ec36 Author: Cecylia Bocovich <cohosh(a)torproject.org> AuthorDate: Tue Nov 1 12:22:25 2022 -0400 Use manually maintained list for availableLangs Since the translation backend software changed, we no longer have the ability to distinguish which locales have completed translations from the git repository. For now we can track and update the supported languages manually. --- README.md | 7 ++++++ make.js | 81 ++++++++++++++++++++++++++++++++++++++++++++++----------------- 2 files changed, 67 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 94569bd..cc6cecb 100644 --- a/README.md +++ b/README.md @@ -124,6 +124,13 @@ git clean -n -d -x # check with the following, git submodule update --remote +# We manage the translations we include manually. These translations are +# tracked separately for the website and the badge. Visit weblate to see +# the percentage completion for each language and update `websiteLangs` +# and `badgeLangs` in `make.js` accordingly. The links for weblate are: +# https://hosted.weblate.org/projects/tor/snowflake-badge/ +# https://hosted.weblate.org/projects/tor/snowflake-website/ + # But note that it's also run as part of the "pack-webext" script, so return # it to previously committed state, git submodule update diff --git a/make.js b/make.js index 0506158..3ab3ab9 100755 --- a/make.js +++ b/make.js @@ -2,7 +2,43 @@ /* global require, process */ -var { writeFileSync, readFileSync, readdirSync, statSync } = require('fs'); +const websiteLangs = [ + 'en_US', + 'sq', + 'zh_CN', + 'cs', + 'ka', + 'de', + 'el', + 'it', + 'fa', + 'pl', + 'ro', + 'es', + 'sv_SE', + 'tr', + 'uk', +]; + +const badgeLangs = [ + 'en_US', + 'sq', + 'zh_CN', + 'cs', + 'ka', + 'de', + 'el', + 'it', + 'fa', + 'pl', + 'ro', + 'es', + 'sv_SE', + 'tr', + 'uk', +]; + +var { writeFileSync, readFileSync } = require('fs'); var { execSync, spawn } = require('child_process'); var cldr = require('cldr'); var domino = require('domino'); @@ -49,9 +85,17 @@ var concatJS = function(outDir, init, outFile, pre) { execSync(`cat ${files.join(' ')} >> ${outPath}`); }; -var copyTranslations = function(outDir) { +var copyTranslations = function(outDir, type) { + var langs = []; + if (type === "badge") { + langs = badgeLangs; + } else { + langs = websiteLangs; + } execSync('git submodule update --init -- translation'); - execSync(`cp -rf translation/* ${outDir}/_locales/`); + for (const lang of langs) { + execSync(`cp -rf translation/${lang} ${outDir}/_locales/`); + } }; var getDisplayName = function(locale) { @@ -68,21 +112,16 @@ var getDisplayName = function(locale) { return name; }; -var getDirs = function() { - let dirs = readdirSync('translation').filter((f) => { - const s = statSync(`translation/${f}`); - return s.isDirectory() && !/^(\.|en)/.test(f); - }); - dirs.push('en_US'); - dirs.sort(); - return dirs; -}; - -var translatedLangs = function() { +var translatedLangs = function(type) { + var langs = []; + if (type === "badge") { + langs = badgeLangs; + } else { + langs = websiteLangs; + } let out = "const availableLangs = new Map([\n"; - let dirs = getDirs(); - dirs = dirs.map(d => `['${d}', '${getDisplayName(d)}'],`); - out += dirs.join("\n"); + langs = langs.map(d => `['${d}', '${getDisplayName(d)}'],`); + out += langs.join("\n"); out += "\n]);\n\n"; return out; }; @@ -155,9 +194,9 @@ task('build', 'build the snowflake proxy', function() { execSync(`rm -rf ${outDir}`); execSync(`cp -r ${STATIC}/ ${outDir}/`); addVersion(outDir); - copyTranslations(outDir); - concatJS(outDir, 'badge', 'embed.js', translatedLangs()); - writeFileSync(`${outDir}/index.js`, translatedLangs(), 'utf8'); + copyTranslations(outDir, "badge"); + concatJS(outDir, 'badge', 'embed.js', translatedLangs("badge")); + writeFileSync(`${outDir}/index.js`, translatedLangs("website"), 'utf8'); execSync(`cat ${STATIC}/index.js >> ${outDir}/index.js`); fillIndex(outDir); console.log('Snowflake prepared.'); @@ -187,7 +226,7 @@ function buildWebext(browserEngine) { ); execSync(`rm ${manfestBasePath}`); } - copyTranslations(outDir); + copyTranslations(outDir, "website"); concatJS(outDir, 'webext', 'snowflake.js', ''); for (const [key, value] of Object.entries(definitions)) { const commandStart = `sed -i "s/${key}/${value}/g" ${outDir}`; -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0