- tbb-commits - lists.torproject.org

[Git][tpo/applications/fenix][tor-browser-94.1.1-11.5-1] 11 commits: Bug 40002: Add GitLab CI
by Matthew Finkel (＠sysrqb) 15 Dec '21

15 Dec '21

Matthew Finkel pushed to branch tor-browser-94.1.1-11.5-1 at The Tor Project / Applications / fenix Commits: 28945122 by Matthew Finkel at 2021-11-04T19:44:46+01:00 Bug 40002: Add GitLab CI Pin CI builds to runners with 32GB of RAM to avoid OOM conditions. - - - - - 619cdf88 by Matthew Finkel at 2021-11-04T19:46:12+01:00 Rename as Tor Browser Bug 40020: Change applicationId Bug 40020: Change app name Bug 40020: Change deeplink scheme Bug 40020: Change App icons Bug 40073: Use correct branding on About page Bug 40088: Use Tor Browser logo in migration screen - - - - - eb540c7a by Matthew Finkel at 2021-11-04T19:46:15+01:00 Disable features and functionality Bug 33594: Disable data collection by default (Glean) Bug 40019: Adjust is disabled on Release when data collection is disabled Bug 34338: Disable the crash reporter Bug 40014: Neuter Google Advertising ID Bug 40018: Disable Push service Bug 40034: Disable PWA onboading Bug 40072: Disable Tracking Protection Bug 40061: Do not show "Send to device" in sharing menu Bug 40109: Reduce requested permissions Exclude LOCATION and NETWORK_STATE - - - - - d300a5ca by Georg Koppen at 2021-11-04T19:46:17+01:00 Modify build system Bug 40083: Make locale ordering in BuildConfig deterministic Bug 40042: Add option do overwrite timestamp in extension version Bug 40059: Use MOZ_BUILD_DATE for versionCode At the same time we adapt MOZ_BUILD_DATE to our needs where it is actually used and not in tor-browser-build. This gives us more flexibility. See: tor-browser-build#40084. Bug 40067: Fix reproducibility issue in classes2.dex We make sure our MOZ_BUILD_DATE gets used as a source for showing date related information on the Fenix about page. Bug 40071: Show only supported locales Bug 40064: Use Gecko Beta for Nightly and Debug variants Bug 40123: Allow building the instrumented tests apks for variants other than debug This allows to specify the variant of the instrumented tests via a `testBuildType` gradle argument. It also applies a workaround for a R8 issue from https://issuetracker.google.com/issues/140851070. Bug 40143: Use deterministic date in Test apk The build config was using Date() when generating the Test apk's versionName. - - - - - ffe02b33 by Matthew Finkel at 2021-12-10T17:25:36+00:00 Add Tor integration and UI Bug 40001: Start Tor as part of the Fenix initialization Bug 40028: Implement Tor Service controller Bug 40028: Integrate Tor Controller into HomeFragment Bug 40028: Implement Tor connect and logger screens Bug 40028: Implement Tor Onboarding Bug 40028: Implement new home screen Bug 40028: Define bootstrapping events and Quick Start Bug 40041: Implement Tor Network Settings Bug 40041: Integrate Tor Network Settings Bug 40179: Show Snowflake bridge option on Release Bug 40176: Re-render Home fragment on resume - - - - - 2be3f44e by Alex Catarineu at 2021-12-10T17:34:22+00:00 Modify UI/UX Bug 40015: Modify Home menu Bug 40016: Hide unwanted Settings Bug 40016: Modify Default toolbar menu Bug 40016: Add Donate settings button Bug 40016: Move Allow Screenshots under Advanced Bug 40016: Don't install WebCompat webext Bug 40016: Don't onboard Search Suggestions Bug 40094: Do not use MasterPasswordTipProvider in HomeFragment Bug 40095: Hide "Sign in to sync" in bookmarks Bug 40031: Hide Mozilla-specific items on About page Bug 40032: Set usesCleartextTraffic as false Bug 40063: Do not sort search engines alphabetically Bug 34378: Port external helper app prompting With the corresponding android-components patch, this allows all `startActivity` that may open external apps to be replaced by `TorUtils.startActivityPrompt`. Bug 34403: Disable Normal mode by default Bug 40087: Implement a switch for english locale spoofing Bug 40144: Hide Download Manager Bug 40141: Hide EME site permission Bug 40166: Hide "Normal" tab (again) and Sync tab in TabTray Bug 40167: Hide "Save to Collection" in menu Bug 40172: Find the Quit button Bug 40186: Hide Credit Cards in Settings - - - - - 5a42ab5e by Alex Catarineu at 2021-12-10T17:34:23+00:00 Modify Add-on support Bug 40030: Install HTTPS Everywhere and NoScript addons on startup HTTPS Everywhere is installed as a builtin extension and NoScript as a regular AMO addon. To avoid unnecessary I/O we only install NoScript the first time, and rely on the browser addon updating mechanism for keeping up with new versions. This is the same behaviour that was implemented in the Fennec-based Tor Browser, where it was installed as a "distribution addon", which also only occurred once. Bug 40062: HTTPS Everywhere is not shown as installed Also 40070: Consider storing the list of recommended addons This implements our own AddonsProvider, which loads the list of available addons from assets instead of fetching it from an endpoint. In this list, we replace https-everywhere by our https-everywhere-eff, so that the EFF one is shown as installed in the addons list and the AMO one is not displayed. Also, we hide the uninstall button for builtin addons. Bug 40058: Hide option for disallowing addon in private mode - - - - - ffbe0a72 by Matthew Finkel at 2021-12-10T17:34:29+00:00 Add Security Level UI Bug 40026: Implement Security Level settings Bug 40026: Integrate Security Level settings - - - - - b0afc737 by HackerNCoder at 2021-12-10T17:34:30+00:00 Bug 40177: Hide Tor icons in settings - - - - - ce12d399 by Matthew Finkel at 2021-12-10T17:34:32+00:00 Bug 40185: Use NimbusDisabled - - - - - 9180554c by Matthew Finkel at 2021-12-10T17:34:33+00:00 squash! Modify UI/UX Bug 40198: Spoof English toggle now overlaps with locale list - - - - - 30 changed files: - + .gitlab-ci.yml - app/build.gradle - app/proguard-rules.pro - app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAboutRobot.kt - − app/src/beta/res/drawable/ic_launcher_foreground.xml - app/src/beta/res/mipmap-hdpi/ic_launcher.png - app/src/beta/res/mipmap-mdpi/ic_launcher.png - app/src/beta/res/mipmap-xhdpi/ic_launcher.png - app/src/beta/res/mipmap-xxhdpi/ic_launcher.png - app/src/beta/res/mipmap-xxxhdpi/ic_launcher.png - app/src/beta/res/values/static_strings.xml - app/src/beta/res/xml/shortcuts.xml - − app/src/debug/res/drawable/ic_launcher_foreground.xml - app/src/debug/res/xml/shortcuts.xml - app/src/main/AndroidManifest.xml - + app/src/main/assets/allowed_addons.json - app/src/main/java/org/mozilla/fenix/FenixApplication.kt - app/src/main/java/org/mozilla/fenix/HomeActivity.kt - app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt - app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt - app/src/main/java/org/mozilla/fenix/components/Analytics.kt - app/src/main/java/org/mozilla/fenix/components/Components.kt - app/src/main/java/org/mozilla/fenix/components/Core.kt - + app/src/main/java/org/mozilla/fenix/components/TorAddonCollectionProvider.kt - + app/src/main/java/org/mozilla/fenix/components/TorBrowserFeatures.kt - app/src/main/java/org/mozilla/fenix/components/metrics/AdjustMetricsService.kt - app/src/main/java/org/mozilla/fenix/components/metrics/MetricsUtils.kt - app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt - app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt - app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/615b550cdfbc… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/615b550cdfbc… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser/tor-browser-91.4.0esr-11.0-1] Revert "Bug 1728536 - Fix compilation error with `--disable-maintenance-service`. r?#application-update-reviewers"
by boklm＠torproject.org 15 Dec '21

15 Dec '21

commit 46759c4b9ea37931f18c0627a82009d704260f68 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Dec 15 19:51:18 2021 +0100 Revert "Bug 1728536 - Fix compilation error with `--disable-maintenance-service`. r?#application-update-reviewers" This reverts commit a21cc727a3f1d94581d777c2499ac2e601852b1a. --- toolkit/mozapps/update/updater/updater.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/toolkit/mozapps/update/updater/updater.cpp b/toolkit/mozapps/update/updater/updater.cpp index 71be78dca2b8..70ca36dcc3d2 100644 --- a/toolkit/mozapps/update/updater/updater.cpp +++ b/toolkit/mozapps/update/updater/updater.cpp @@ -3673,7 +3673,6 @@ int NS_main(int argc, NS_tchar** argv) { # endif } -# ifdef MOZ_MAINTENANCE_SERVICE // If we started the elevated updater, and it finished, check the secure // update status file to make sure that it succeeded, and if it did we // need to launch the PostUpdate process in the unelevated updater which @@ -3691,7 +3690,6 @@ int NS_main(int argc, NS_tchar** argv) { } } } -# endif CloseHandle(elevatedFileHandle);

1 0

[tor-browser/tor-browser-91.4.0esr-11.5-1] Revert "Bug 1728536 - Fix compilation error with `--disable-maintenance-service`. r?#application-update-reviewers"
by boklm＠torproject.org 15 Dec '21

15 Dec '21

commit d069864d14a1574b121ed7cba229ba42e22cfb1f Author: Georg Koppen <gk(a)torproject.org> Date: Fri Dec 10 15:51:43 2021 +0000 Revert "Bug 1728536 - Fix compilation error with `--disable-maintenance-service`. r?#application-update-reviewers" This reverts commit a21cc727a3f1d94581d777c2499ac2e601852b1a. --- toolkit/mozapps/update/updater/updater.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/toolkit/mozapps/update/updater/updater.cpp b/toolkit/mozapps/update/updater/updater.cpp index 71be78dca2b8..70ca36dcc3d2 100644 --- a/toolkit/mozapps/update/updater/updater.cpp +++ b/toolkit/mozapps/update/updater/updater.cpp @@ -3673,7 +3673,6 @@ int NS_main(int argc, NS_tchar** argv) { # endif } -# ifdef MOZ_MAINTENANCE_SERVICE // If we started the elevated updater, and it finished, check the secure // update status file to make sure that it succeeded, and if it did we // need to launch the PostUpdate process in the unelevated updater which @@ -3691,7 +3690,6 @@ int NS_main(int argc, NS_tchar** argv) { } } } -# endif CloseHandle(elevatedFileHandle);

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gitlab-tpo/merge-requests/380'
by boklm＠torproject.org 15 Dec '21

15 Dec '21

commit 7b637e4d2b7d889ebab9f11ecd0ff78f9ad6f697 Merge: 5d2068a 9f7492f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Dec 15 19:28:42 2021 +0100 Merge remote-tracking branch 'gitlab-tpo/merge-requests/380' .../0001-Revert-apple-getentropy-removal.patch | 39 ---------------------- projects/openssl/build | 1 - projects/openssl/config | 6 ++-- 3 files changed, 2 insertions(+), 44 deletions(-)

1 0

[tor-browser-build/master] Bug 40401: Update OpenSSL to 1.1.1m
by boklm＠torproject.org 15 Dec '21

15 Dec '21

commit 9f7492f0101f6ee413834e15c1f93504478b804e Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 15 08:05:00 2021 +0000 Bug 40401: Update OpenSSL to 1.1.1m OpenSSL 1.1.1m includes a fix for our #40358. We have to remove our workaround otherwise compilation breaks. Hence, this commit fixes #40390 as well. --- .../0001-Revert-apple-getentropy-removal.patch | 39 ---------------------- projects/openssl/build | 1 - projects/openssl/config | 6 ++-- 3 files changed, 2 insertions(+), 44 deletions(-) diff --git a/projects/openssl/0001-Revert-apple-getentropy-removal.patch b/projects/openssl/0001-Revert-apple-getentropy-removal.patch deleted file mode 100644 index d101203..0000000 --- a/projects/openssl/0001-Revert-apple-getentropy-removal.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 8b9e95ae8a9d81b1942be28cba95c35f2303ee2d Mon Sep 17 00:00:00 2001 -From: Matthew Finkel <sysrqb(a)torproject.org> -Date: Fri, 3 Sep 2021 20:48:53 +0000 -Subject: [PATCH] Revert "apple getentropy removal" - -This reverts commit b58ac9f1e3f828b5c65c9edd5bb86603a4886a26. ---- - crypto/rand/rand_unix.c | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c -index 43f1069d15..2dfced2052 100644 ---- a/crypto/rand/rand_unix.c -+++ b/crypto/rand/rand_unix.c -@@ -34,9 +34,6 @@ - #if defined(__OpenBSD__) - # include <sys/param.h> - #endif --#if defined(__APPLE__) --# include <CommonCrypto/CommonRandom.h> --#endif - - #if defined(OPENSSL_SYS_UNIX) || defined(__DJGPP__) - # include <sys/types.h> -@@ -381,11 +378,6 @@ static ssize_t syscall_random(void *buf, size_t buflen) - if (errno != ENOSYS) - return -1; - } --# elif defined(__APPLE__) -- if (CCRandomGenerateBytes(buf, buflen) == kCCSuccess) -- return (ssize_t)buflen; -- -- return -1; - # else - union { - void *p; --- -2.25.1 - diff --git a/projects/openssl/build b/projects/openssl/build index bf0b16f..f8c4cbf 100644 --- a/projects/openssl/build +++ b/projects/openssl/build @@ -12,7 +12,6 @@ export CC='gcc -m32' # Tricking OpenSSL into using our clang as cross-compiler ln -s $clangdir/bin/clang $clangdir/bin/x86_64-apple-darwin-cc export CC="cc [% c("var/FLAGS") %]" - patch -p1 < $rootdir/0001-Revert-apple-getentropy-removal.patch [% END -%] export SOURCE_DATE_EPOCH='[% c("timestamp") %]' ./Configure [% c('var/configure_opts') %] diff --git a/projects/openssl/config b/projects/openssl/config index f0f6ef3..fe730c7 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.1.1l +version: 1.1.1m filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: @@ -31,6 +31,4 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz' - sha256sum: 0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1 - - filename: 0001-Revert-apple-getentropy-removal.patch - enable: '[% c("var/osx") %]' + sha256sum: f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96

1 0

[tor-browser-build/master] Bug 40402: Use /bin/bash in list_toolchain_updates
by boklm＠torproject.org 15 Dec '21

15 Dec '21

commit 5d2068aac44fba17083d41164d771762a79e0f29 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 15 09:48:38 2021 +0000 Bug 40402: Use /bin/bash in list_toolchain_updates See: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/merge_re… for the issue we hit. --- projects/common/list_toolchain_updates | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/common/list_toolchain_updates b/projects/common/list_toolchain_updates index 4cfd829..ebbfe6e 100644 --- a/projects/common/list_toolchain_updates +++ b/projects/common/list_toolchain_updates @@ -1,4 +1,4 @@ -#!/usr/bin/bash +#!/bin/bash set -e

1 0

[tor-browser-build/master] Bug 40395: Update how we check node version in list_toolchain_updates_checks
by gk＠torproject.org 14 Dec '21

14 Dec '21

commit f1f4381aaceb2c2c59097bd305ad0307a3dd84f7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Dec 10 12:42:01 2021 +0100 Bug 40395: Update how we check node version in list_toolchain_updates_checks --- projects/firefox/list_toolchain_updates_checks | 28 ++++++++++++++++++++---- projects/geckoview/list_toolchain_updates_checks | 28 ++++++++++++++++++++---- 2 files changed, 48 insertions(+), 8 deletions(-) diff --git a/projects/firefox/list_toolchain_updates_checks b/projects/firefox/list_toolchain_updates_checks index a308468..26ee3a0 100644 --- a/projects/firefox/list_toolchain_updates_checks +++ b/projects/firefox/list_toolchain_updates_checks @@ -89,12 +89,32 @@ check_update_needed clang "$needed" "$current" # node read -d '' p << 'EOF' || true -if (m/^\\s*NODE_MIN_VERSION\\s*=\\s*StrictVersion\$"([^"]+)"\$/) { - print $1; - exit; +sub l { + ref $_[0] eq 'ARRAY' ? $_[0] : [ $_[0] ]; } + +my $d = YAML::XS::LoadFile('taskcluster/ci/toolchain/node.yml'); +my $node_toolchain; +T: foreach my $t (keys %$d) { + foreach my $alias (@{l($d->{$t}{run}{'toolchain-alias'})}) { + if ($alias eq 'linux64-node') { + foreach my $fetch (@{$d->{$t}{fetches}{fetch}}) { + if ($fetch =~ m/^nodejs-.*/) { + $node_toolchain = $fetch; + last T; + } + } + } + } +} + +exit 1 unless $node_toolchain; + +my $fetch = YAML::XS::LoadFile('taskcluster/ci/fetch/toolchains.yml'); +my ($version) = $fetch->{$node_toolchain}{fetch}{url} =~ m|^https://nodejs.org/dist/v([^/]+)/|; +print "$version\\n"; EOF -needed=$(cat python/mozbuild/mozbuild/nodeutil.py | perl -ne "$p") +needed=$(perl -MYAML::XS -e "$p") current='[% pc("node", "version") %]' check_update_needed node "$needed" "$current" diff --git a/projects/geckoview/list_toolchain_updates_checks b/projects/geckoview/list_toolchain_updates_checks index f31fa51..fef9756 100644 --- a/projects/geckoview/list_toolchain_updates_checks +++ b/projects/geckoview/list_toolchain_updates_checks @@ -180,12 +180,32 @@ check_update_needed clang "$needed" "$current" # node read -d '' p << 'EOF' || true -if (m/^\\s*NODE_MIN_VERSION\\s*=\\s*StrictVersion\$"([^"]+)"\$/) { - print $1; - exit; +sub l { + ref $_[0] eq 'ARRAY' ? $_[0] : [ $_[0] ]; } + +my $d = YAML::XS::LoadFile('taskcluster/ci/toolchain/node.yml'); +my $node_toolchain; +T: foreach my $t (keys %$d) { + foreach my $alias (@{l($d->{$t}{run}{'toolchain-alias'})}) { + if ($alias eq 'linux64-node') { + foreach my $fetch (@{$d->{$t}{fetches}{fetch}}) { + if ($fetch =~ m/^nodejs-.*/) { + $node_toolchain = $fetch; + last T; + } + } + } + } +} + +exit 1 unless $node_toolchain; + +my $fetch = YAML::XS::LoadFile('taskcluster/ci/fetch/toolchains.yml'); +my ($version) = $fetch->{$node_toolchain}{fetch}{url} =~ m|^https://nodejs.org/dist/v([^/]+)/|; +print "$version\\n"; EOF -needed=$(cat python/mozbuild/mozbuild/nodeutil.py | perl -ne "$p") +needed=$(perl -MYAML::XS -e "$p") current='[% pc("node", "version") %]' check_update_needed node "$needed" "$current"

1 0

[tor-browser-build/master] Bug 40395: Update node to 12.22.1
by gk＠torproject.org 14 Dec '21

14 Dec '21

commit a0d781d425cd8ff06e6bc10e0320cec06438c6df Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Dec 10 14:37:42 2021 +0100 Bug 40395: Update node to 12.22.1 --- projects/node/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/node/config b/projects/node/config index 041e5d9..300e59c 100644 --- a/projects/node/config +++ b/projects/node/config @@ -2,8 +2,8 @@ version: '[% c("var/node_version") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: - node_version: 10.23.1 - node_hash: 88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa + node_version: 12.22.1 + node_hash: dd650df7773a6ed3e390320ba51ef33cba6499f0e9397709ea3d1debdcbcb989 container: use_container: 1

1 0

[tor-browser/tor-browser-91.4.0esr-11.5-1] Bug 1745715 - Process app-bundled fonts before system fonts when initializing the font list, to ensure their families get the expected Base visibility level. r=emilio
by gk＠torproject.org 14 Dec '21

14 Dec '21

commit 6ebf4b5c74896f0d30c061d6c61e98586ff2ca79 Author: Jonathan Kew <jkew(a)mozilla.com> Date: Mon Dec 13 20:09:36 2021 +0000 Bug 1745715 - Process app-bundled fonts before system fonts when initializing the font list, to ensure their families get the expected Base visibility level. r=emilio Differential Revision: https://phabricator.services.mozilla.com/D133667 --- gfx/thebes/gfxFcPlatformFontList.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gfx/thebes/gfxFcPlatformFontList.cpp b/gfx/thebes/gfxFcPlatformFontList.cpp index 41a305c537c4..3b6029bd4353 100644 --- a/gfx/thebes/gfxFcPlatformFontList.cpp +++ b/gfx/thebes/gfxFcPlatformFontList.cpp @@ -1524,17 +1524,21 @@ nsresult gfxFcPlatformFontList::InitFontListForPlatform() { } #endif - // iterate over available fonts - FcFontSet* systemFonts = FcConfigGetFonts(nullptr, FcSetSystem); - AddFontSetFamilies(systemFonts, policy.get(), /* aAppFonts = */ false); - #ifdef MOZ_BUNDLED_FONTS + // https://bugzilla.mozilla.org/show_bug.cgi?id=1745715: + // It's important to do this *before* processing the standard system fonts, + // so that if a family is present in both font sets, we'll treat it as app- + // bundled and therefore always visible. if (StaticPrefs::gfx_bundled_fonts_activate_AtStartup() != 0) { FcFontSet* appFonts = FcConfigGetFonts(nullptr, FcSetApplication); AddFontSetFamilies(appFonts, policy.get(), /* aAppFonts = */ true); } #endif + // iterate over available fonts + FcFontSet* systemFonts = FcConfigGetFonts(nullptr, FcSetSystem); + AddFontSetFamilies(systemFonts, policy.get(), /* aAppFonts = */ false); + return NS_OK; }

1 0

[tor-browser/tor-browser-91.4.0esr-11.5-1] squash! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 14 Dec '21

14 Dec '21

commit 886c911686d7fbd2d7a36874d6ef5fa8c728fbcf Author: Georg Koppen <gk(a)torproject.org> Date: Mon Dec 13 13:00:02 2021 +0000 squash! TB4: Tor Browser's Firefox preference overrides. Bug 40736: Disable third-party cookies in PBM --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 48005296c6c5..331baa9a6596 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -213,6 +213,7 @@ pref("javascript.options.large_arraybuffers", false); pref("privacy.firstparty.isolate", true); // Always enforce first party isolation pref("privacy.partition.network_state", false); // Disable for now until audit pref("network.cookie.cookieBehavior", 1); +pref("network.cookie.cookieBehavior.pbmode", 1); pref("network.http.spdy.allow-push", false); // Disabled for now. See https://bugs.torproject.org/27127 pref("network.predictor.enabled", false); // Temporarily disabled. See https://bugs.torproject.org/16633 // Bug 40177: Make sure tracker cookie purging is disabled

1 0

[Git][tpo/applications/fenix] Pushed new branch tor-browser-94.1.1-11.5-1
by Matthew Finkel (＠sysrqb) 10 Dec '21

10 Dec '21

Matthew Finkel pushed new branch tor-browser-94.1.1-11.5-1 at The Tor Project / Applications / fenix -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/tree/tor-browser-94.… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser/tor-browser-91.4.0esr-11.5-1] fixup! Bug 26961: New user onboarding.
by gk＠torproject.org 10 Dec '21

10 Dec '21

commit cf8d855642bf0d1348eea7a1d69cd20d0ad907a5 Author: Richard Pospesel <richard(a)torproject.org> Date: Tue Dec 7 14:55:31 2021 +0100 fixup! Bug 26961: New user onboarding. --- browser/extensions/onboarding/content/Onboarding.jsm | 6 ------ browser/extensions/onboarding/content/onboarding.css | 15 --------------- 2 files changed, 21 deletions(-) diff --git a/browser/extensions/onboarding/content/Onboarding.jsm b/browser/extensions/onboarding/content/Onboarding.jsm index 558a94cc35ba..38c78f724b3b 100644 --- a/browser/extensions/onboarding/content/Onboarding.jsm +++ b/browser/extensions/onboarding/content/Onboarding.jsm @@ -1770,12 +1770,6 @@ class Onboarding { defaultImg.src = Services.prefs.getStringPref("browser.onboarding.default-icon-src", "chrome://branding/content/icon64.png"); button.appendChild(defaultImg); - let watermarkImg = this._window.document.createElement("img"); - watermarkImg.id = "onboarding-overlay-button-watermark-icon"; - watermarkImg.setAttribute("role", "presentation"); - watermarkImg.src = Services.prefs.getStringPref("browser.onboarding.watermark-icon-src", - "resource://onboarding/img/tor-watermark.png"); - button.appendChild(watermarkImg); return button; } diff --git a/browser/extensions/onboarding/content/onboarding.css b/browser/extensions/onboarding/content/onboarding.css index 431b73bd148e..e801790bf5a8 100644 --- a/browser/extensions/onboarding/content/onboarding.css +++ b/browser/extensions/onboarding/content/onboarding.css @@ -127,21 +127,6 @@ box-shadow: 2px 0 5px 0 rgba(74, 74, 79, 0.25); } -#onboarding-overlay-button-watermark-icon { - -moz-context-properties: fill; - fill: var(--newtab-icon-tertiary-color, #d7d7db); -} - -#onboarding-overlay-button-watermark-icon, -#onboarding-overlay-button.onboarding-watermark::after, -#onboarding-overlay-button.onboarding-watermark:not(:hover) > #onboarding-overlay-button-icon { - display: none; -} - -#onboarding-overlay-button.onboarding-watermark:not(:hover) > #onboarding-overlay-button-watermark-icon { - display: block; -} - #onboarding-overlay-dialog, .onboarding-hidden, #onboarding-tour-sync-page[data-login-state=logged-in] .show-on-logged-out,

1 0

[tor-browser/tor-browser-91.4.0esr-11.5-1] fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by gk＠torproject.org 10 Dec '21

10 Dec '21

commit 31b119b4e59be206c79541b13e8ccd7e782de349 Author: Richard Pospesel <richard(a)torproject.org> Date: Thu Dec 9 18:07:28 2021 +0100 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser --- browser/components/torconnect/content/onion-slash.svg | 14 +++----------- browser/components/torconnect/content/onion.svg | 12 ++++-------- 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/browser/components/torconnect/content/onion-slash.svg b/browser/components/torconnect/content/onion-slash.svg index d049bcd39cae..93eb24b03905 100644 --- a/browser/components/torconnect/content/onion-slash.svg +++ b/browser/components/torconnect/content/onion-slash.svg @@ -1,13 +1,5 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg viewBox="0 0 16 16" width="16" height="16" xmlns="http://www.w3.org/2000/svg"> - <g fill-opacity="context-fill-opacity" fill="context-fill"> - <path d="m13.3034 13.3032c-1.3572 1.3573-3.2323 2.1968-5.3034 2.1968-4.14214 0-7.5-3.3579-7.5-7.5 0-2.07093.83935-3.94582 2.19643-5.30303l.82867.82861c-1.14502 1.14515-1.85322 2.72708-1.85322 4.47442 0 3.4949 2.83319 6.3281 6.32812 6.3281 1.74752 0 3.3296-.7083 4.4748-1.8536z"/> - <path d="m14.1137 12.3453c.8729-1.226 1.3863-2.72567 1.3863-4.3453 0-4.14214-3.3579-7.5-7.5-7.5-1.61963 0-3.11935.51339-4.34531 1.38631l.84258.84258c1.00297-.66783 2.2074-1.05701 3.50273-1.05701 3.4949 0 6.3281 2.83319 6.3281 6.32812 0 1.29533-.3892 2.4998-1.057 3.5027z"/> - <path d="m12.4902 10.7218c.4822-.79365.7598-1.7253.7598-2.72181 0-2.89949-2.3505-5.25-5.25001-5.25-.9965 0-1.92816.27764-2.72184.75978l.86063.86062c.558-.28671 1.19071-.44852 1.86121-.44852 2.25231 0 4.07811 1.82584 4.07811 4.07812 0 .67051-.1618 1.30322-.4485 1.86122z"/> - <path d="m11.7124 11.7122-.8287-.8286c-.738.738-1.75754 1.1945-2.88371 1.1945-2.25228 0-4.07812-1.8258-4.07812-4.07811 0-1.12605.45639-2.14551 1.19428-2.88349l-.82868-.82861c-.94994.95005-1.53748 2.26246-1.53748 3.7121 0 2.89951 2.35051 5.25001 5.25 5.25001 1.44979 0 2.76231-.5877 3.71241-1.5378z"/> - <path d="m5.87853 5.87883c-.5428.54288-.87853 1.29282-.87853 2.12117 0 1.65686 1.34315 3 3 3 .82844 0 1.57845-.3358 2.1213-.8787l-.82863-.8286c-.33083.33081-.78785.53543-1.29267.53543-1.00964 0-1.82812-.81848-1.82812-1.82813 0-.50476.20457-.96175.53533-1.29256z"/> - <path d="m9.8272 8.05881c.00062-.01952.00093-.03913.00093-.05881 0-1.00964-.81848-1.82812-1.82813-1.82812-.01968 0-.03928.00031-.05881.00093l-.98589-.9859c.32532-.12086.6773-.18691 1.0447-.18691 1.65686 0 3 1.34315 3 3 0 .3674-.066.71938-.1869 1.04471z"/> - <path d="m8 15.5c-4.14214 0-7.5-3.3579-7.5-7.5 0-2.07093.83935-3.94582 2.19643-5.30303l5.30357 5.30316z"/> - <path d="m8 6.23161v-5.73161c-1.61963 0-3.11935.51339-4.34531 1.38631z"/> - </g> - <path d="m14.1161 15.6245c-.0821.0001-.1634-.016-.2393-.0474-.0758-.0314-.1447-.0775-.2027-.1356l-12.749984-12.749c-.109266-.11882-.168406-.27526-.165071-.43666.003335-.16139.068886-.31525.182967-.42946.114078-.11421.267868-.17994.429258-.18345.16139-.00352.3179.05544.43685.16457l12.74998 12.75c.1168.1176.1824.2767.1824.4425s-.0656.3249-.1824.4425c-.058.058-.1269.1039-.2028.1352-.0759.0312-.1571.0471-.2392.0468z" fill="#ff0039"/> + <path d="m14.1161 15.6245c-.0821.0001-.1634-.016-.2393-.0474-.0758-.0314-.1447-.0775-.2027-.1356l-12.749984-12.749c-.109266-.11882-.168406-.27526-.165071-.43666.003335-.16139.068886-.31525.182967-.42946.114078-.11421.267868-.17994.429258-.18345.16139-.00352.3179.05544.43685.16457l12.74998 12.75c.1168.1176.1824.2767.1824.4425s-.0656.3249-.1824.4425c-.058.058-.1269.1039-.2028.1352-.0759.0312-.1571.0471-.2392.0468z" fill-opacity="context-fill-opacity" fill="#ff0039" /> + <path d="m 8,0.5000002 c -1.61963,0 -3.1197431,0.5137987 -4.3457031,1.3867188 l 0.84375,0.8417968 0.7792969,0.78125 0.8613281,0.8613282 0.8164062,0.8164062 0.9863281,0.984375 h 0.058594 c 1.00965,0 1.828125,0.818485 1.828125,1.828125 0,0.01968 6.2e-4,0.039074 0,0.058594 L 10.8125,9.0449221 C 10.9334,8.7195921 11,8.3674002 11,8.0000002 c 0,-1.65685 -1.34314,-3 -3,-3 v -1.078125 c 2.25231,0 4.078125,1.825845 4.078125,4.078125 0,0.67051 -0.162519,1.3033281 -0.449219,1.8613281 l 0.861328,0.8613277 C 12.972434,9.9290067 13.25,8.9965102 13.25,8.0000002 c 0,-2.89949 -2.35049,-5.25 -5.25,-5.25 v -1.078125 c 3.4949,0 6.328125,2.833195 6.328125,6.328125 0,1.29533 -0.388841,2.4990528 -1.056641,3.5019528 l 0.841797,0.84375 C 14.986181,11.119703 15.5,9.6196302 15.5,8.0000002 c 0,-4.14214 -3.3579,-7.5 -7.5,-7.5 z m -6.1113281,3.15625 C 1.0154872,4.8821451 0.5,6.3803304 0.5,8.0000002 0.5,12.1421 3.85786,15.5 8,15.5 c 1.6198027,0 3.117896,-0.515441 4.34375,-1.388672 L 11.501953,13.269531 C 10.498 787,13.937828 9.295838,14.328125 8,14.328125 V 13.25 c 0.9967306,0 1.9287093,-0.277621 2.722656,-0.759766 L 9.859375,11.626953 C 9.3016226,11.913918 8.6705338,12.078125 8,12.078125 V 11 C 8.3664751,11 8.716425,10.93088 9.0410156,10.810547 6.6639891,8.4300416 4.2743195,6.0418993 1.8886719,3.6562502 Z" fill-opacity="context-fill-opacity" fill="context-fill"/> </svg> diff --git a/browser/components/torconnect/content/onion.svg b/browser/components/torconnect/content/onion.svg index 382a061774aa..7655a800d9ee 100644 --- a/browser/components/torconnect/content/onion.svg +++ b/browser/components/torconnect/content/onion.svg @@ -1,8 +1,4 @@ -<svg fill="context-fill" fill-opacity="context-fill-opacity" viewBox="0 0 16 16" width="16" height="16" xmlns="http://www.w3.org/2000/svg"> - <g clip-rule="evenodd" fill-rule="evenodd"> - <path d="m11 8c0 1.65686-1.34314 3-3 3-1.65685 0-3-1.34314-3-3 0-1.65685 1.34315-3 3-3 1.65686 0 3 1.34315 3 3zm-1.17187 0c0 1.00965-.81848 1.82813-1.82813 1.82813-1.00964 0-1.82812-.81848-1.82812-1.82813 0-1.00964.81848-1.82812 1.82812-1.82812 1.00965 0 1.82813.81848 1.82813 1.82812z"/> - <path d="m7.99999 13.25c2.89951 0 5.25001-2.3505 5.25001-5.25001 0-2.89949-2.3505-5.25-5.25001-5.25-2.89949 0-5.25 2.35051-5.25 5.25 0 2.89951 2.35051 5.25001 5.25 5.25001zm0-1.1719c2.25231 0 4.07811-1.8258 4.07811-4.07811 0-2.25228-1.8258-4.07812-4.07811-4.07812-2.25228 0-4.07812 1.82584-4.07812 4.07812 0 2.25231 1.82584 4.07811 4.07812 4.07811z"/> - <path d="m8 15.5c4.1421 0 7.5-3.3579 7.5-7.5 0-4.14214-3.3579-7.5-7.5-7.5-4.14214 0-7.5 3.35786-7.5 7.5 0 4.1421 3.35786 7.5 7.5 7.5zm0-1.1719c3.4949 0 6.3281-2.8332 6.3281-6.3281 0-3.49493-2.8332-6.32812-6.3281-6.32812-3.49493 0-6.32812 2.83319-6.32812 6.32812 0 3.4949 2.83319 6.3281 6.32812 6.3281z"/> - </g> - <path d="m.5 8c0 4.1421 3.35786 7.5 7.5 7.5v-15c-4.14214 0-7.5 3.35786-7.5 7.5z"/> -</svg> \ No newline at end of file +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg viewBox="0 0 16 16" width="16" height="16" xmlns="http://www.w3.org/2000/svg"> + <path d="M 8 0.5 C 3.85786 0.5 0.5 3.85786 0.5 8 C 0.5 12.1421 3.85786 15.5 8 15.5 C 12.1421 15.5 15.5 12.1421 15.5 8 C 15.5 3.85786 12.1421 0.5 8 0.5 z M 8 1.671875 C 11.4949 1.671875 14.328125 4.50507 14.328125 8 C 14.328125 11.4949 11.4949 14.328125 8 14.328125 L 8 13.25 C 10.89951 13.25 13.25 10.89951 13.25 8 C 13.25 5.10051 10.89951 2.75 8 2.75 L 8 1.671875 z M 8 3.921875 C 10.25231 3.921875 12.078125 5.74772 12.078125 8 C 12.078125 10.25231 10.25231 12.078125 8 12.078125 L 8 11 C 9.65686 11 11 9.65686 11 8 C 11 6.34315 9.65686 5 8 5 L 8 3.921875 z M 8 6.171875 C 9.00965 6.171875 9.828125 6.99036 9.828125 8 C 9.828125 9.00965 9.00965 9.828125 8 9.828125 L 8 6.171875 z " clip-rule="evenodd" fill-rule="evenodd" fill="context-fill" fill-opacity="context-fill-opacity"/> +</svg>

1 0

[tor-browser/tor-browser-91.4.0esr-11.5-1] fixup! Bug 2176: Rebrand Firefox to TorBrowser
by gk＠torproject.org 10 Dec '21

10 Dec '21

commit fcc31d8c5ca8663f3d712f28c927795c9dfba07c Author: Richard Pospesel <richard(a)torproject.org> Date: Thu Dec 9 18:08:54 2021 +0100 fixup! Bug 2176: Rebrand Firefox to TorBrowser The fast few commits are all fixes for tor-browser#40684. --- .../extensions/onboarding/content/img/tor-watermark.png | Bin 3064 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/browser/extensions/onboarding/content/img/tor-watermark.png b/browser/extensions/onboarding/content/img/tor-watermark.png deleted file mode 100644 index 4c7885e0235b..000000000000 Binary files a/browser/extensions/onboarding/content/img/tor-watermark.png and /dev/null differ

1 0

[tor-browser/tor-browser-91.4.0esr-11.5-1] fixup! Bug 26961: New user onboarding.
by gk＠torproject.org 10 Dec '21

10 Dec '21

commit 3b980e46bfa36be3e21653f10b17e3e53ae3716e Author: Richard Pospesel <richard(a)torproject.org> Date: Tue Dec 7 16:20:20 2021 +0100 fixup! Bug 26961: New user onboarding. --- browser/base/content/main-popupset.inc.xhtml | 1 + browser/themes/linux/browser.css | 9 ------ browser/themes/shared/UITour.inc.css | 48 +++++++++++++++------------- browser/themes/windows/browser.css | 9 ------ 4 files changed, 27 insertions(+), 40 deletions(-) diff --git a/browser/base/content/main-popupset.inc.xhtml b/browser/base/content/main-popupset.inc.xhtml index f627b97cba3f..a96aaa9c187d 100644 --- a/browser/base/content/main-popupset.inc.xhtml +++ b/browser/base/content/main-popupset.inc.xhtml @@ -242,6 +242,7 @@ <toolbarbutton id="UITourTooltipClose" class="close-icon" tooltiptext="&uiTour.infoPanel.close;"/> </hbox> + <toolbarseparator id="UITourTooltipToolbarSeparator"/> <description id="UITourTooltipDescription" flex="1"/> </vbox> </hbox> diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css index a14abba4c209..03ddd497bb2d 100644 --- a/browser/themes/linux/browser.css +++ b/browser/themes/linux/browser.css @@ -355,15 +355,6 @@ menuitem.bookmark-item { margin-inline-end: -4px; } -/** - * Override the --arrowpanel-padding so the background extends - * to the sides and bottom of the panel. - */ -#UITourTooltipButtons { - margin-inline-start: -10px; - margin-bottom: -10px; -} - %include ../shared/contextmenu.inc.css #context-navigation > .menuitem-iconic > .menu-iconic-left { diff --git a/browser/themes/shared/UITour.inc.css b/browser/themes/shared/UITour.inc.css index cda91243f6d5..730d47ce13af 100644 --- a/browser/themes/shared/UITour.inc.css +++ b/browser/themes/shared/UITour.inc.css @@ -39,7 +39,6 @@ #UITourTooltipTitleContainer { -moz-box-align: start; - margin-bottom: 10px; } #UITourTooltipIcon { @@ -54,17 +53,25 @@ } #UITourTooltipTitle { - color: #420C5D; - font-size: 16px; - font-weight: bold; + font-size: 1.25em; + font-weight: 600; margin: 0; } +#UITourTooltipToolbarSeparator { + appearance: none; + min-height: 0; + border-top: 1px solid var(--panel-separator-color); + border-bottom: none; + margin: var(--panel-separator-margin); + margin-inline: 0; + padding: 0; +} + #UITourTooltipDescription { margin-inline: 0; - color: #4A4A4A; - font-size: 13px; - line-height: 1.8rem; + font-size: 1.11em; + line-height: normal; margin-bottom: 0; /* Override global.css */ } @@ -84,9 +91,7 @@ #UITourTooltipButtons { -moz-box-pack: end; - background-color: var(--arrowpanel-dimmed); - margin: 10px -16px -16px; - padding: 16px; + padding-block-start: 16px; } #UITourTooltipButtons > label, @@ -112,17 +117,14 @@ #UITourTooltipButtons > label, #UITourTooltipButtons > button .button-text { - font-size: 1.15rem; + font-weight: 600; + margin-inline: 0; } #UITourTooltipButtons > button:not(.button-link) { appearance: none; - background-color: rgb(251,251,251); - border-radius: 2px; - color: rgb(71,71,71); - padding: 6px 30px; - transition-property: background-color, border-color; - transition-duration: 150ms; + border-radius: 4px; + padding: 8px 16px; } #UITourTooltipButtons > label, @@ -131,16 +133,18 @@ background: transparent; border: none; box-shadow: none; - color: #4A4A4A; padding-inline: 10px; } #UITourTooltipButtons > button.button-primary { - background-color: #420C5D; - color: white; - padding-inline: 28px; + background-color: var(--button-primary-bgcolor); + color: var(--button-primary-color); +} + +#UITourTooltipButtons > button.button-primary:active { + background-color: var(--button-primary-active-bgcolor); } #UITourTooltipButtons > button.button-primary:not(:active):hover { - background-color: #410A4E; + background-color: var(--button-primary-hover-bgcolor); } diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css index 7f4eb881cc9e..b60e9143fc86 100644 --- a/browser/themes/windows/browser.css +++ b/browser/themes/windows/browser.css @@ -624,15 +624,6 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { %include ../shared/UITour.inc.css -#UITourTooltipButtons { - /** - * Override the --arrowpanel-padding so the background extends - * to the sides and bottom of the panel. - */ - margin-inline: -10px; - margin-bottom: -10px; -} - %include ../shared/contextmenu.inc.css /* Make menu items larger when opened through touch. */

1 0

[tor-browser/tor-browser-91.4.0esr-11.5-1] fixup! Bug 23247: Communicating security expectations for .onion
by gk＠torproject.org 10 Dec '21

10 Dec '21

commit 02b3d8cafa58ada0a3286f2aaf43f3e924be6929 Author: Richard Pospesel <richard(a)torproject.org> Date: Tue Dec 7 11:56:58 2021 +0100 fixup! Bug 23247: Communicating security expectations for .onion --- browser/themes/shared/identity-block/onion-slash.svg | 14 +++----------- browser/themes/shared/identity-block/onion-warning.svg | 11 +++-------- browser/themes/shared/identity-block/onion.svg | 12 ++++-------- 3 files changed, 10 insertions(+), 27 deletions(-) diff --git a/browser/themes/shared/identity-block/onion-slash.svg b/browser/themes/shared/identity-block/onion-slash.svg index d049bcd39cae..93eb24b03905 100644 --- a/browser/themes/shared/identity-block/onion-slash.svg +++ b/browser/themes/shared/identity-block/onion-slash.svg @@ -1,13 +1,5 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg viewBox="0 0 16 16" width="16" height="16" xmlns="http://www.w3.org/2000/svg"> - <g fill-opacity="context-fill-opacity" fill="context-fill"> - <path d="m13.3034 13.3032c-1.3572 1.3573-3.2323 2.1968-5.3034 2.1968-4.14214 0-7.5-3.3579-7.5-7.5 0-2.07093.83935-3.94582 2.19643-5.30303l.82867.82861c-1.14502 1.14515-1.85322 2.72708-1.85322 4.47442 0 3.4949 2.83319 6.3281 6.32812 6.3281 1.74752 0 3.3296-.7083 4.4748-1.8536z"/> - <path d="m14.1137 12.3453c.8729-1.226 1.3863-2.72567 1.3863-4.3453 0-4.14214-3.3579-7.5-7.5-7.5-1.61963 0-3.11935.51339-4.34531 1.38631l.84258.84258c1.00297-.66783 2.2074-1.05701 3.50273-1.05701 3.4949 0 6.3281 2.83319 6.3281 6.32812 0 1.29533-.3892 2.4998-1.057 3.5027z"/> - <path d="m12.4902 10.7218c.4822-.79365.7598-1.7253.7598-2.72181 0-2.89949-2.3505-5.25-5.25001-5.25-.9965 0-1.92816.27764-2.72184.75978l.86063.86062c.558-.28671 1.19071-.44852 1.86121-.44852 2.25231 0 4.07811 1.82584 4.07811 4.07812 0 .67051-.1618 1.30322-.4485 1.86122z"/> - <path d="m11.7124 11.7122-.8287-.8286c-.738.738-1.75754 1.1945-2.88371 1.1945-2.25228 0-4.07812-1.8258-4.07812-4.07811 0-1.12605.45639-2.14551 1.19428-2.88349l-.82868-.82861c-.94994.95005-1.53748 2.26246-1.53748 3.7121 0 2.89951 2.35051 5.25001 5.25 5.25001 1.44979 0 2.76231-.5877 3.71241-1.5378z"/> - <path d="m5.87853 5.87883c-.5428.54288-.87853 1.29282-.87853 2.12117 0 1.65686 1.34315 3 3 3 .82844 0 1.57845-.3358 2.1213-.8787l-.82863-.8286c-.33083.33081-.78785.53543-1.29267.53543-1.00964 0-1.82812-.81848-1.82812-1.82813 0-.50476.20457-.96175.53533-1.29256z"/> - <path d="m9.8272 8.05881c.00062-.01952.00093-.03913.00093-.05881 0-1.00964-.81848-1.82812-1.82813-1.82812-.01968 0-.03928.00031-.05881.00093l-.98589-.9859c.32532-.12086.6773-.18691 1.0447-.18691 1.65686 0 3 1.34315 3 3 0 .3674-.066.71938-.1869 1.04471z"/> - <path d="m8 15.5c-4.14214 0-7.5-3.3579-7.5-7.5 0-2.07093.83935-3.94582 2.19643-5.30303l5.30357 5.30316z"/> - <path d="m8 6.23161v-5.73161c-1.61963 0-3.11935.51339-4.34531 1.38631z"/> - </g> - <path d="m14.1161 15.6245c-.0821.0001-.1634-.016-.2393-.0474-.0758-.0314-.1447-.0775-.2027-.1356l-12.749984-12.749c-.109266-.11882-.168406-.27526-.165071-.43666.003335-.16139.068886-.31525.182967-.42946.114078-.11421.267868-.17994.429258-.18345.16139-.00352.3179.05544.43685.16457l12.74998 12.75c.1168.1176.1824.2767.1824.4425s-.0656.3249-.1824.4425c-.058.058-.1269.1039-.2028.1352-.0759.0312-.1571.0471-.2392.0468z" fill="#ff0039"/> + <path d="m14.1161 15.6245c-.0821.0001-.1634-.016-.2393-.0474-.0758-.0314-.1447-.0775-.2027-.1356l-12.749984-12.749c-.109266-.11882-.168406-.27526-.165071-.43666.003335-.16139.068886-.31525.182967-.42946.114078-.11421.267868-.17994.429258-.18345.16139-.00352.3179.05544.43685.16457l12.74998 12.75c.1168.1176.1824.2767.1824.4425s-.0656.3249-.1824.4425c-.058.058-.1269.1039-.2028.1352-.0759.0312-.1571.0471-.2392.0468z" fill-opacity="context-fill-opacity" fill="#ff0039" /> + <path d="m 8,0.5000002 c -1.61963,0 -3.1197431,0.5137987 -4.3457031,1.3867188 l 0.84375,0.8417968 0.7792969,0.78125 0.8613281,0.8613282 0.8164062,0.8164062 0.9863281,0.984375 h 0.058594 c 1.00965,0 1.828125,0.818485 1.828125,1.828125 0,0.01968 6.2e-4,0.039074 0,0.058594 L 10.8125,9.0449221 C 10.9334,8.7195921 11,8.3674002 11,8.0000002 c 0,-1.65685 -1.34314,-3 -3,-3 v -1.078125 c 2.25231,0 4.078125,1.825845 4.078125,4.078125 0,0.67051 -0.162519,1.3033281 -0.449219,1.8613281 l 0.861328,0.8613277 C 12.972434,9.9290067 13.25,8.9965102 13.25,8.0000002 c 0,-2.89949 -2.35049,-5.25 -5.25,-5.25 v -1.078125 c 3.4949,0 6.328125,2.833195 6.328125,6.328125 0,1.29533 -0.388841,2.4990528 -1.056641,3.5019528 l 0.841797,0.84375 C 14.986181,11.119703 15.5,9.6196302 15.5,8.0000002 c 0,-4.14214 -3.3579,-7.5 -7.5,-7.5 z m -6.1113281,3.15625 C 1.0154872,4.8821451 0.5,6.3803304 0.5,8.0000002 0.5,12.1421 3.85786,15.5 8,15.5 c 1.6198027,0 3.117896,-0.515441 4.34375,-1.388672 L 11.501953,13.269531 C 10.498 787,13.937828 9.295838,14.328125 8,14.328125 V 13.25 c 0.9967306,0 1.9287093,-0.277621 2.722656,-0.759766 L 9.859375,11.626953 C 9.3016226,11.913918 8.6705338,12.078125 8,12.078125 V 11 C 8.3664751,11 8.716425,10.93088 9.0410156,10.810547 6.6639891,8.4300416 4.2743195,6.0418993 1.8886719,3.6562502 Z" fill-opacity="context-fill-opacity" fill="context-fill"/> </svg> diff --git a/browser/themes/shared/identity-block/onion-warning.svg b/browser/themes/shared/identity-block/onion-warning.svg index e078f5ea6e33..f920a93ac410 100644 --- a/browser/themes/shared/identity-block/onion-warning.svg +++ b/browser/themes/shared/identity-block/onion-warning.svg @@ -1,9 +1,4 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg viewBox="0 0 16 16" width="16" height="16" xmlns="http://www.w3.org/2000/svg"> - <g fill-opacity="context-fill-opacity" fill="context-fill"> - <path d="m6.23025 15.393c-3.53742-.6033-6.23025-3.6837-6.23025-7.393 0-4.14214 3.35786-7.5 7.5-7.5 4.1421 0 7.5 3.35786 7.5 7.5 0 .66904-.0876 1.31762-.252 1.9349l-.9277-1.61757c.0052-.10512.0078-.21092.0078-.31733 0-3.49493-2.8332-6.32812-6.3281-6.32812-3.49493 0-6.32812 2.83319-6.32812 6.32812 0 2.9851 2.06684 5.4874 4.84752 6.154-.05998.4351.02161.8644.21085 1.239z"/> - <path d="m6.42277 13.1394c-2.38278-.4969-4.17278-2.6091-4.17278-5.13941 0-2.89949 2.35051-5.25 5.25-5.25 2.48426 0 4.56551 1.72549 5.11071 4.04336-.4001-.23081-.8624-.32542-1.3135-.28382-.5952-1.51508-2.07094-2.58766-3.79721-2.58766-2.25228 0-4.07812 1.82584-4.07812 4.07812 0 2.09871 1.58539 3.82721 3.6239 4.05311z"/> - <path d="m10.2788 6.8674c-.44688-1.09541-1.52269-1.8674-2.7788-1.8674-1.65685 0-3 1.34315-3 3 0 1.65686 1.34315 3 3 3 .05095 0 .10161-.0013.15193-.0038l.83612-1.45782c-.28491.18337-.62405.28975-.98805.28975-1.00964 0-1.82812-.81848-1.82812-1.82813 0-1.00964.81848-1.82812 1.82812-1.82812 1.00965 0 1.82813.81848 1.82813 1.82812 0 .02558-.00053.05104-.00157.07637l.27582-.48091c.17642-.30737.40992-.55005.67642-.72806z"/> - <path d="m6.23025 15.393c-3.53742-.6033-6.23025-3.6837-6.23025-7.393 0-4.14214 3.35786-7.5 7.5-7.5v10.7611l-1.20826 2.1067c-.39168.6811-.36535 1.4237-.06149 2.0252z"/> - <path d="m15.8456 13.8662-3.311-5.77295c-.454-.791-1.615-.791-2.069 0l-3.31095 5.77295c-.446.775.126 1.7341 1.034 1.7341h6.62295c.907 0 1.479-.9591 1.034-1.7341zm-3.721-1.892c0 .1658-.0658.3248-.183.442s-.2762.183-.442.183c-.1657 0-.3247-.0658-.4419-.183s-.1831-.2762-.1831-.442v-1.747c0-.1657.0659-.32468.1831-.44189s.2762-.18306.4419-.18306c.1658 0 .3248.06585.442.18306s.183.27619.183.44189zm-.625 2.626c-.1657 0-.3247-.0658-.4419-.183s-.1831-.2762-.1831-.442c0-.1657.0659-.3247.1831-.4419s.2762-.1831.4419-.1831c.1658 0 .3248.0659.442.1831s.183.2762.183.4419c0 .1658-.0658.3248-.183.442s-.2762.183-.442.183z"/> - </g> -</svg> \ No newline at end of file + <path d="M 7.5,0.5 C 3.35786,0.5 0,3.85786 0,8 c 0,3.7093 2.6930488,6.789278 6.2304688,7.392578 -0.032181,-0.0637 -0.060149,-0.128686 -0.085938,-0.195312 -0.00862,-0.02227 -0.01751,-0.04385 -0.025391,-0.06641 -0.023385,-0.0669 -0.043878,-0.135932 -0.060547,-0.205078 -0.00186,-0.0077 -0.00213,-0.01571 -0.00391,-0.02344 -0.017615,-0.07685 -0.032109,-0.153488 -0.041016,-0.232422 -7.27e-5,-6.44e-4 7.2e-5,-0.0013 0,-0.002 -0.0087,-0.07777 -0.011896,-0.157155 -0.011719,-0.236328 7.71e-5,-0.0337 2.127e-4,-0.06769 0.00195,-0.101563 3.337e-4,-0.0065 -3.955e-4,-0.01303 0,-0.01953 0.00318,-0.05219 0.0084,-0.10381 0.015625,-0.15625 0.03623,-0.263929 0.1235201,-0.529812 0.2714844,-0.787109 L 6.421875,13.138672 C 7.1130865,11.933878 7.8482649,10.654869 8.4882812,9.5390625 8.2033713,9.7224325 7.864,9.828125 7.5,9.828125 v -3.65625 c 1.00965,0 1.828125,0.818485 1.828125,1.828125 0,0.02558 -9.131e-4,0.050842 -0.00195,0.076172 L 9.6015625,7.5957031 C 9.7779825,7.2883331 10.012797,7.0451975 10.27929 7,6.8671875 9.8324169,5.7717775 8.75611,5 7.5,5 V 3.921875 c 1.72627,0 3.201675,1.0728106 3.796875,2.5878906 0.4511,-0.0416 0.914353,0.052393 1.314453,0.2832032 C 12.066128,4.4750988 9.98426,2.75 7.5,2.75 V 1.671875 c 3.4949,0 6.328125,2.833195 6.328125,6.328125 0,0.10641 -0.0026,0.2112863 -0.0078,0.3164062 L 14.74806,9.9355469 C 14.912447,9.3182669 15,8.66904 15,8 15,3.85786 11.6421,0.5 7.5,0.5 Z m 4,7 c -0.40375,0 -0.808156,0.19825 -1.035156,0.59375 l -3.3105471,5.771484 c -0.446,0.775 0.1271562,1.734375 1.0351562,1.734375 H 14.8125 c 0.907,0 1.478203,-0.959375 1.033203,-1.734375 L 12.535156,8.09375 C 12.308156,7.69825 11.90375,7.5 11.5,7.5 Z m 0,2.1015625 c 0.1658,0 0.324206,0.066384 0.441406,0.1835937 0.1172,0.1172101 0.183594,0.2757058 0.183594,0.4414058 v 1.748047 c 0,0.1658 -0.06639,0.324207 -0.183594,0.441407 -0.1172,0.1172 -0.275606,0.183593 -0.441406,0.183593 -0.1657,0 -0.324206,-0.06639 -0.441406,-0.183593 -0.1172,-0.1172 -0.183594,-0.275607 -0.183594,-0.441407 v -1.74804 7 c 0,-0.165699 0.06639,-0.3241957 0.183594,-0.4414058 C 11.175794,9.6679462 11.3343,9.6015625 11.5,9.6015625 Z m 0,3.7480465 c 0.1658,0 0.324206,0.06639 0.441406,0.183594 0.1172,0.1172 0.183594,0.275706 0.183594,0.441406 0,0.1658 -0.06639,0.32616 -0.183594,0.44336 -0.1172,0.1172 -0.275606,0.18164 -0.441406,0.18164 -0.1657,0 -0.324206,-0.06444 -0.441406,-0.18164 -0.1172,-0.1172 -0.183594,-0.27756 -0.183594,-0.44336 0,-0.1657 0.06639,-0.324206 0.183594,-0.441406 0.1172,-0.1172 0.275706,-0.183594 0.441406,-0.183594 z" fill-opacity="context-fill-opacity" fill="context-fill"/> +</svg> diff --git a/browser/themes/shared/identity-block/onion.svg b/browser/themes/shared/identity-block/onion.svg index 382a061774aa..7655a800d9ee 100644 --- a/browser/themes/shared/identity-block/onion.svg +++ b/browser/themes/shared/identity-block/onion.svg @@ -1,8 +1,4 @@ -<svg fill="context-fill" fill-opacity="context-fill-opacity" viewBox="0 0 16 16" width="16" height="16" xmlns="http://www.w3.org/2000/svg"> - <g clip-rule="evenodd" fill-rule="evenodd"> - <path d="m11 8c0 1.65686-1.34314 3-3 3-1.65685 0-3-1.34314-3-3 0-1.65685 1.34315-3 3-3 1.65686 0 3 1.34315 3 3zm-1.17187 0c0 1.00965-.81848 1.82813-1.82813 1.82813-1.00964 0-1.82812-.81848-1.82812-1.82813 0-1.00964.81848-1.82812 1.82812-1.82812 1.00965 0 1.82813.81848 1.82813 1.82812z"/> - <path d="m7.99999 13.25c2.89951 0 5.25001-2.3505 5.25001-5.25001 0-2.89949-2.3505-5.25-5.25001-5.25-2.89949 0-5.25 2.35051-5.25 5.25 0 2.89951 2.35051 5.25001 5.25 5.25001zm0-1.1719c2.25231 0 4.07811-1.8258 4.07811-4.07811 0-2.25228-1.8258-4.07812-4.07811-4.07812-2.25228 0-4.07812 1.82584-4.07812 4.07812 0 2.25231 1.82584 4.07811 4.07812 4.07811z"/> - <path d="m8 15.5c4.1421 0 7.5-3.3579 7.5-7.5 0-4.14214-3.3579-7.5-7.5-7.5-4.14214 0-7.5 3.35786-7.5 7.5 0 4.1421 3.35786 7.5 7.5 7.5zm0-1.1719c3.4949 0 6.3281-2.8332 6.3281-6.3281 0-3.49493-2.8332-6.32812-6.3281-6.32812-3.49493 0-6.32812 2.83319-6.32812 6.32812 0 3.4949 2.83319 6.3281 6.32812 6.3281z"/> - </g> - <path d="m.5 8c0 4.1421 3.35786 7.5 7.5 7.5v-15c-4.14214 0-7.5 3.35786-7.5 7.5z"/> -</svg> \ No newline at end of file +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg viewBox="0 0 16 16" width="16" height="16" xmlns="http://www.w3.org/2000/svg"> + <path d="M 8 0.5 C 3.85786 0.5 0.5 3.85786 0.5 8 C 0.5 12.1421 3.85786 15.5 8 15.5 C 12.1421 15.5 15.5 12.1421 15.5 8 C 15.5 3.85786 12.1421 0.5 8 0.5 z M 8 1.671875 C 11.4949 1.671875 14.328125 4.50507 14.328125 8 C 14.328125 11.4949 11.4949 14.328125 8 14.328125 L 8 13.25 C 10.89951 13.25 13.25 10.89951 13.25 8 C 13.25 5.10051 10.89951 2.75 8 2.75 L 8 1.671875 z M 8 3.921875 C 10.25231 3.921875 12.078125 5.74772 12.078125 8 C 12.078125 10.25231 10.25231 12.078125 8 12.078125 L 8 11 C 9.65686 11 11 9.65686 11 8 C 11 6.34315 9.65686 5 8 5 L 8 3.921875 z M 8 6.171875 C 9.00965 6.171875 9.828125 6.99036 9.828125 8 C 9.828125 9.00965 9.00965 9.828125 8 9.828125 L 8 6.171875 z " clip-rule="evenodd" fill-rule="evenodd" fill="context-fill" fill-opacity="context-fill-opacity"/> +</svg>

1 0

[tor-browser-build/master] Prep -build2
by gk＠torproject.org 09 Dec '21

09 Dec '21

commit 6c734ebca875a7027399be761541fa0a006f10e5 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Dec 9 16:24:08 2021 +0000 Prep -build2 --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 + rbm.conf | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 2c6d4b7..a94df84 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -5,6 +5,7 @@ Tor Browser 11.5a1 - December 13 2021 * Bug 40059: YEC activist sign empty in about:tor on RTL locales [torbutton] * Bug 40386: Add new default obfs4 bridge "deusexmachina" [tor-browser-build] * Bug 40393: Point to a forked version of pion/dtls with fingerprinting fix [tor-browser-build] + * Bug 40394: Bump version of Snowflake to 221f1c41 [tor-browser-build] * Bug 40438: Add Blockchair as a search engine [tor-browser] * Bug 40646: Revert tor-browser#40475 and inherit upstream fix [tor-browser] * Bug 40680: Prepare update to localized assets for YEC [tor-browser] diff --git a/rbm.conf b/rbm.conf index e1e6352..5321bc0 100644 --- a/rbm.conf +++ b/rbm.conf @@ -58,7 +58,7 @@ buildconf: var: torbrowser_version: '11.5a1' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 11.0a10 project_name: tor-browser

1 0

[tor-browser-build/master] Bug 40394: Bump version of Snowflake to 221f1c41
by gk＠torproject.org 09 Dec '21

09 Dec '21

commit 3762b410afc30c2e21169a18f8f081c783086ad5 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Thu Dec 9 09:34:57 2021 -0500 Bug 40394: Bump version of Snowflake to 221f1c41 This version bump includes the following features/fixes in the Snowflake client: - move client messages to the broker into the HTTP body - fix some race condition bugs - AMP cache rendezvous - add the ability to specify Snowflake command-line arguments through SOCKS - performance tuning for KCP/smux --- projects/goxtext/config | 4 ++-- projects/snowflake/build | 5 +++-- projects/snowflake/config | 4 +++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/projects/goxtext/config b/projects/goxtext/config index fba619f..ddd333c 100644 --- a/projects/goxtext/config +++ b/projects/goxtext/config @@ -1,8 +1,8 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/golang/text -# v0.3.0 -git_hash: f21a4dfb5e38f5895301dc265a8def02365cc3d0 +# v0.3.3 +git_hash: 23ae387dee1f90d29a23c0e87ee0b46038fbed0e filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/snowflake/build b/projects/snowflake/build index 4c99675..a7eae3f 100644 --- a/projects/snowflake/build +++ b/projects/snowflake/build @@ -12,6 +12,7 @@ mkdir -p $PTDIR $DOCSDIR export CGO_ENABLED=1 [% END -%] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxtext') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/goptlib') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/pion-webrtc') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/kcp-go') %] @@ -21,8 +22,8 @@ mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] -mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports" -ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/snowflake.git" +mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports/snowflake.git" +ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/snowflake.git/v2" # Fix gopath location of versioned dependencies ln -sf "$GOPATH/src/github.com/pion/webrtc" "$GOPATH/src/github.com/pion/webrtc/v2" ln -sf "$GOPATH/src/github.com/pion/sdp" "$GOPATH/src/github.com/pion/sdp/v2" diff --git a/projects/snowflake/config b/projects/snowflake/config index 27c43d9..0ca299c 100644 --- a/projects/snowflake/config +++ b/projects/snowflake/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://git.torproject.org/pluggable-transports/snowflake.git -git_hash: ae7cc478fd345a1e588f8315ec980809c6806372 +git_hash: 221f1c41c9618907a022655d1df4eb6eef02ab0a filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: @@ -12,6 +12,8 @@ input_files: - project: container-image - name: go project: go + - name: goxtext + project: goxtext - name: goptlib project: goptlib - name: pion-webrtc

1 0

[tor-browser/tor-browser-91.4.0esr-11.5-1] fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by gk＠torproject.org 09 Dec '21

09 Dec '21

commit 72cd45d8f869090074fec4a4156c8534e5ec5d76 Author: Richard Pospesel <richard(a)torproject.org> Date: Mon Dec 6 17:35:47 2021 +0100 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser --- .../torpreferences/content/torPreferences.css | 35 ++++++++-------------- 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/browser/components/torpreferences/content/torPreferences.css b/browser/components/torpreferences/content/torPreferences.css index a977648f0810..b6eb0a740e5e 100644 --- a/browser/components/torpreferences/content/torPreferences.css +++ b/browser/components/torpreferences/content/torPreferences.css @@ -13,7 +13,7 @@ width: auto; min-height: 32px; border-radius: 4px; - padding: 4px; + padding: 8px; } #torPreferences-connectMessageBox.hidden { @@ -32,27 +32,22 @@ #torPreferences-connectMessageBox table { border-collapse: collapse; - width: 100%; } #torPreferences-connectMessageBox td { - vertical-align: top; - padding: 0px; + vertical-align: middle; } #torPreferences-connectMessageBox td:first-child { - width: 24px; + width: 16px; } #torPreferences-connectMessageBox-icon { - display: block; width: 16px; height: 16px; - padding: 4px; mask-repeat: no-repeat !important; mask-size: 16px !important; - mask-position: 4px 4px !important; } #torPreferences-connectMessageBox.error #torPreferences-connectMessageBox-icon @@ -68,31 +63,25 @@ } #torPreferences-connectMessageBox-message { - display: block; line-height: 16px; - font-size: 1.0em; - margin-right: 8px; - padding-left: 4px!important; - padding-top: 4px!important; + font-size: 1.11em; + padding-left: 8px!important; } #torPreferences-connectMessageBox-button { display: block; width: auto; - height: 24px; - line-height: 24px; - min-height: 24px; - max-height: 24px; - min-width: 0px; - margin: 0px; border-radius: 4px; border: 0; - padding: 0px 1.25em; - margin-left: auto; - margin-right: 0px; - font-size: 0.9em; + padding-inline: 18px; + padding-block: 8px; + margin-block: 0px; + margin-inline-start: 8px; + margin-inline-end: 0px; + + font-size: 1.0em; font-weight: 600; white-space: nowrap;

1 0

[tor-launcher/master] fixup! Bug 27476: about:torconnect fixes and new strings
by gk＠torproject.org 09 Dec '21

09 Dec '21

commit 2ca9746a0a5aab7abc33cbe74d475425797f80f0 Author: Richard Pospesel <richard(a)torproject.org> Date: Thu Dec 9 16:35:55 2021 +0100 fixup! Bug 27476: about:torconnect fixes and new strings string tweak; fixes tor-browser#40687 --- src/chrome/locale/en-US/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/locale/en-US/network-settings.dtd b/src/chrome/locale/en-US/network-settings.dtd index 66c650e..c5844d2 100644 --- a/src/chrome/locale/en-US/network-settings.dtd +++ b/src/chrome/locale/en-US/network-settings.dtd @@ -88,7 +88,7 @@  <!ENTITY torConnect.tryAgain "Try Connecting Again"> <!ENTITY torConnect.offline "Offline"> -<!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect to the Tor Network"> +<!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect"> <!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network"> <!ENTITY torConnect.connectingConcise "Connecting…"> <!ENTITY torConnect.connectedConcise "Connected">

1 0

[tor-browser/tor-browser-91.4.0esr-11.5-1] fixup! Bug 21952: Implement Onion-Location
by gk＠torproject.org 09 Dec '21

09 Dec '21

commit 1bb123b98c06211706d8085ede900677f8e8a8a8 Author: Richard Pospesel <richard(a)torproject.org> Date: Tue Dec 7 14:12:02 2021 +0100 fixup! Bug 21952: Implement Onion-Location --- browser/components/onionservices/content/onionlocation-urlbar.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/components/onionservices/content/onionlocation-urlbar.css b/browser/components/onionservices/content/onionlocation-urlbar.css index 7b7051ace675..581175fdbf6b 100644 --- a/browser/components/onionservices/content/onionlocation-urlbar.css +++ b/browser/components/onionservices/content/onionlocation-urlbar.css @@ -41,7 +41,7 @@ label#onion-label { padding-block: 0; padding-inline: 0.5em; color: white; - font-weight: bold; + font-weight: normal; } /* set appropriate sizes for the non-standard ui densities */

1 0

[tor-browser-build/master] Add gk's new subkey
by gk＠torproject.org 09 Dec '21

09 Dec '21

commit 0e261bd489c2eccd519f1ee2d13b7f8d6474bdef Author: Georg Koppen <gk(a)torproject.org> Date: Thu Dec 9 08:17:47 2021 +0000 Add gk's new subkey --- keyring/torbutton.gpg | Bin 147763 -> 212576 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/torbutton.gpg b/keyring/torbutton.gpg index 7eb3b70..c9b7ea9 100644 Binary files a/keyring/torbutton.gpg and b/keyring/torbutton.gpg differ

1 0

[tor-browser-build/master] Changelog update
by gk＠torproject.org 08 Dec '21

08 Dec '21

commit 0f2d5a3b2fa15b91c951f9c2cbc6ffd194d353bf Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 8 20:11:12 2021 +0000 Changelog update --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index cfff41e..2c6d4b7 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -4,6 +4,7 @@ Tor Browser 11.5a1 - December 13 2021 * Tor Launcher 0.2.32 * Bug 40059: YEC activist sign empty in about:tor on RTL locales [torbutton] * Bug 40386: Add new default obfs4 bridge "deusexmachina" [tor-browser-build] + * Bug 40393: Point to a forked version of pion/dtls with fingerprinting fix [tor-browser-build] * Bug 40438: Add Blockchair as a search engine [tor-browser] * Bug 40646: Revert tor-browser#40475 and inherit upstream fix [tor-browser] * Bug 40680: Prepare update to localized assets for YEC [tor-browser]

1 0

[tor-browser-build/master] Bug 40393: Point to a forked version of pion/dtls with fingerprinting fix
by gk＠torproject.org 08 Dec '21

08 Dec '21

commit 7ffd69a21b8a408a2be9cfdbe7401e1a7f974310 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Wed Dec 8 11:55:43 2021 -0500 Bug 40393: Point to a forked version of pion/dtls with fingerprinting fix This dtls fix removes the supported_groups extension from ServerHello messages of the DTLS handshake. We should make sure we update this later after upstreaming the patch. --- projects/pion-dtls/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/pion-dtls/config b/projects/pion-dtls/config index 16deb46..26d3d3a 100644 --- a/projects/pion-dtls/config +++ b/projects/pion-dtls/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' -git_url: https://github.com/pion/dtls -git_hash: 4879d3479bc9bb4afdb17011d2f19708e0fa2362 #v2.0.8 +git_url: https://github.com/cohosh/dtls +git_hash: 2f8ef4e48879f1129b3432c9ac04d2f4aad8049e #ru fingerprinting fix filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]'

1 0

[tor-browser-build/master] Release preparations for 11.5a1
by gk＠torproject.org 08 Dec '21

08 Dec '21

commit 59b3f6da367bec7cb7f61b921536f5780035ab0e Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 8 16:38:43 2021 +0000 Release preparations for 11.5a1 Versions update, Changelog updates and fixes --- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 35 ++++++++++++++++++++-- projects/tor-launcher/config | 2 +- rbm.conf | 4 +-- 3 files changed, 36 insertions(+), 5 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index d1f8fdd..cfff41e 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 11.5a1 - December 13 2021 + * Windows + OS X + Linux + * Update Firefox to 91.4.0esr + * Tor Launcher 0.2.32 + * Bug 40059: YEC activist sign empty in about:tor on RTL locales [torbutton] + * Bug 40386: Add new default obfs4 bridge "deusexmachina" [tor-browser-build] + * Bug 40438: Add Blockchair as a search engine [tor-browser] + * Bug 40646: Revert tor-browser#40475 and inherit upstream fix [tor-browser] + * Bug 40680: Prepare update to localized assets for YEC [tor-browser] + * Bug 40682: Disable network.proxy.allow_bypass [tor-browser] + * Bug 40684: Misc UI bug fixes in 11.0a10 [tor-browser] + * Bug 40686: Update Onboarding link for 11.0 [tor-browser] + * Bug 40689: Change Blockchair Search provider's HTTP method [tor-browser] + * Bug 40690: Browser chrome breaks when private browsing mode is turned off [tor-browser] + * Bug 40691: Make quickstart checkbox gray when "off" on about:torconnect [tor-browser] + * Bug 40698: Addon menus missing content in TB11 [tor-browser] + * Bug 40700: Switch Firefox recommendations off by default [tor-browser] + * Bug 40705: "visit our website" link on about:tbupdate pointing to different locations [tor-browser] + * Bug 40706: Fix issue in HTTPS-Everywhere WASM [tor-browser] + * Bug 40714: Next button closes "How do circuits work?" onboarding tour [tor-browser] + * Bug 40718: Application Menu items should be sentence case [tor-browser] + * Bug 40721: Tabs crashing on certain pages in TB11 on Win 10 [tor-browser] + * Bug 40725: about:torconnect missing identity block content on TB11 [tor-browser] + * Translations update + * Linux + * Bug 40318: Remove check for DISPLAY env var in start-tor-browser [tor-browser-build] + * Bug 40387: Remove some fonts on Linux [tor-browser-build] + Tor Browser 11.0.2 - December 7 2021 * Windows + OS X + Linux * Update Firefox to 91.4.0esr @@ -34,6 +62,7 @@ Tor Browser 11.0 - November 8 2021 * Bug 40047: New string for Security Level panel [torbutton] * Bug 40048: Protonify Circuit Display Panel [torbutton] * Bug 40053: investigate fingerprinting potential of extended TextMetrics interface [tor-browser] + * Bug 40057: Error popup when using New Identity feature [torbutton] * Bug 40083: Make sure Region.jsm fetching is disabled [tor-browser] * Bug 40177: Clean up obsolete preferences in our 000-tor-browser.js [tor-browser] * Bug 40220: Make sure tracker cookie purging is disabled [tor-browser] @@ -59,9 +88,10 @@ Tor Browser 11.0 - November 8 2021 * Bug 40641: Update Security Level selection in about:preferences to match style as tracking protection option bubbles [tor-browser] * Bug 40648: Replace onion pattern divs/css with tiling SVG [tor-browser] * Bug 40653: Onion Available text not aligned correctly in toolbar in ESR91 [tor-browser] - * Bug 40655: esr91 is suggesting to make Tor Browser the default browse [tor-browser] + * Bug 40655: esr91 is suggesting to make Tor Browser the default browser [tor-browser] * Bug 40657: esr91 is missing "New identity" in hamburger menu [tor-browser] * Bug 40680: Prepare update to localized assets for YEC [tor-browser] + * Bug 40684: Misc UI bug fixes in 11.0a10 * Bug 40686: Update Onboarding link for 11.0 [tor-browser] * Build System * Windows + OS X + Linux @@ -74,7 +104,7 @@ Tor Browser 11.0 - November 8 2021 * Windows + Linux * Bug 40357: Update binutils to 2.35.2 [tor-browser-build] * Windows - * Bug 28240: switch from SJLJ exception handling to Dwarf2 in mingw for win32 [tor-browser-build] + * Bug 28240: Switch from SJLJ exception handling to Dwarf2 in mingw for win32 [tor-browser-build] * Bug 40306: Update Windows toolchain to switch to mozilla91 [tor-browser-build] * Bug 40376: Use python3 for running pe_checksum_fix.py [tor-browser-build] * OS X @@ -92,6 +122,7 @@ Tor Browser 11.0a10 - November 4 2021 * Bug 33125: Remove xpinstall.whitelist.add* as they don't do anything anymore [tor-browser] * Bug 34188: Cleanup extensions.* prefs [tor-browser] * Bug 40053: investigate fingerprinting potential of extended TextMetrics interface [tor-browser] + * Bug 40057: Error popup when using New Identity feature [torbutton] * Bug 40083: Make sure Region.jsm fetching is disabled [tor-browser] * Bug 40177: Clean up obsolete preferences in our 000-tor-browser.js [tor-browser] * Bug 40220: Make sure tracker cookie purging is disabled [tor-browser] diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 8e50211..3fa9cfc 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.31 +version: 0.2.32 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index 51ccfdf..e1e6352 100644 --- a/rbm.conf +++ b/rbm.conf @@ -57,10 +57,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '11.0a10' + torbrowser_version: '11.5a1' torbrowser_build: 'build1' torbrowser_incremental_from: - - 11.0a9 + - 11.0a10 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0