Pier Angelo Vendrame pushed to branch tor-browser-150.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: 670bdc68 by Damien Carver at 2026-04-23T09:57:05+02:00 !dropme Bug 2024724 - Fix PowerCounters.h because we do not compile PowerCounters-win.cpp against __MINGW32__ r=canaltinova,profiler-reviewers BB 44868: Backport upstream commit to fix Windows builds This commit should be dropped during the 151 rebase as it was reverted as part of https://bugzilla.mozilla.org/show_bug.cgi?id=2026031 in the upstream 151 branch. - - - - - c6701ba6 by Pier Angelo Vendrame at 2026-04-23T09:57:06+02:00 fixup! Firefox preference overrides. BB 44521: Disable widget.wayland.fractional-scale.enabled. It introduces fingerprinting opportunities to users who manually enabled Wayland, so disable it until we decide to make Wayland the default also for our browsers. - - - - - d4623b2a by Nicolas Vigier at 2026-04-23T09:57:06+02:00 fixup! BB 43615: Add Gitlab Issue and Merge Request templates BB 44870: Remove legacy branch from gitlab templates - - - - - 8b69decb by Beatriz Rizental at 2026-04-23T09:57:06+02:00 fixup! Base Browser's .mozconfigs. Bug 44848: Stop overwriting Android toolchain paths. Keep the overwrites only on tor-browser-build. - - - - - 55665b46 by Beatriz Rizental at 2026-04-23T09:57:07+02:00 fixup! TB 43817: Add tests for Tor Browser No bug: Fix Python syntax error in circuit isolation test - - - - - 19407edf by clairehurst at 2026-04-23T09:57:07+02:00 fixup! TB 40041 [android]: Implement Tor Network Settings TB 44842: Replace instances of SwitchPreference with SwitchPreferenceCompat - - - - - 90faa802 by clairehurst at 2026-04-23T09:57:07+02:00 fixup! [android] Modify UI/UX TB 44842: Replace instances of SwitchPreference with SwitchPreferenceCompat - - - - - 14 changed files: - .gitlab/issue_templates/050 Backport.md - .gitlab/issue_templates/080 Security Backports.md - .gitlab/merge_request_templates/Default.md - browser/app/profile/001-base-profile.js - browser/config/mozconfigs/base-browser-android - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/TorBridgeConfigFragment.kt - mobile/android/fenix/app/src/main/res/xml/preferences.xml - mobile/android/fenix/app/src/main/res/xml/tor_bridge_config_preferences.xml - mozconfig-android-all - mozglue/baseprofiler/public/BaseProfilerState.h - testing/tor/test_circuit_isolation.py - tools/profiler/core/PowerCounters.h - tools/profiler/moz.build - tools/profiler/public/ProfilerState.h Changes: ===================================== .gitlab/issue_templates/050 Backport.md ===================================== @@ -24,7 +24,6 @@ please ensure the title has the following format: - [ ] Alpha - [ ] Stable -- [ ] Legacy ## Notes ===================================== .gitlab/issue_templates/080 Security Backports.md ===================================== @@ -20,7 +20,7 @@ ## **Bookkeeping** -- [ ] Link this issue to the appropriate [Release Prep](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/issues/?s...) issues (alpha, stable, and legacy). +- [ ] Link this issue to the appropriate [Release Prep](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/issues/?s...) issues (alpha and stable). ## **Security Vulnerabilities Report**: https://www.mozilla.org/en-US/security/advisories/ ===================================== .gitlab/merge_request_templates/Default.md ===================================== @@ -29,7 +29,6 @@ - [ ] **Alpha**: rapid release, 16.0 - [ ] **Stable**: esr140-15.0 -- [ ] **Legacy**: esr115-13.5 ### Backporting ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -585,6 +585,9 @@ pref("widget.wayland.vsync.enabled", false); // marked with a specific rating is loaded or not. pref("security.restrict_to_adults.always", false); pref("security.restrict_to_adults.respect_platform", false); +// tor-browser#44521: Disable Wayland fractional scaling at least until we keep +// Xwayland as the default. +pref("widget.wayland.fractional-scale.enabled", false); // tor-browser#41943: defense-in-depth, but do not lock anymore (enabled in Firefox 119, http://bugzil.la/1851162) pref("javascript.options.spectre.disable_for_isolated_content", false); ===================================== browser/config/mozconfigs/base-browser-android ===================================== @@ -13,20 +13,6 @@ CC="clang" CXX="clang++" ac_add_options --enable-linker=lld -if test -n "$ANDROID_HOME"; then - ac_add_options --with-android-sdk=$ANDROID_HOME -fi - -if test -n "$ANDROID_NDK_HOME"; then - ac_add_options --with-android-ndk=$ANDROID_NDK_HOME -fi - -if test -n "$GRADLE_HOME"; then - ac_add_options --with-gradle=$GRADLE_HOME/bin/gradle -fi -# Otherwise (as per /mobile/android/gradle.config) a version will be downloaded by the gradle wrapper when needed -# so don't use this override, and let it do it's thing - ac_add_options --enable-strip ac_add_options --enable-install-strip ac_add_options --disable-tests ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/TorBridgeConfigFragment.kt ===================================== @@ -8,7 +8,7 @@ import android.os.Bundle import androidx.preference.EditTextPreference import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat -import androidx.preference.SwitchPreference +import androidx.preference.SwitchPreferenceCompat import org.mozilla.fenix.Config import org.mozilla.fenix.R import org.mozilla.fenix.ext.components @@ -50,7 +50,7 @@ class TorBridgeConfigFragment : PreferenceFragmentCompat() { val bridgesEnabled = requireContext().components.torController.bridgesEnabled val prefBridgeConfig = - requirePreference<SwitchPreference>(R.string.pref_key_tor_network_settings_bridge_config_toggle) + requirePreference<SwitchPreferenceCompat>(R.string.pref_key_tor_network_settings_bridge_config_toggle) prefBridgeConfig.apply { isChecked = bridgesEnabled setOnPreferenceChangeListener<Boolean> { preference, enabled -> ===================================== mobile/android/fenix/app/src/main/res/xml/preferences.xml ===================================== @@ -188,7 +188,7 @@ android:title="@string/preferences_tor_network_settings_bridge_config" android:summary="@string/preferences_tor_network_settings_bridge_config_description" /> - <SwitchPreference + <SwitchPreferenceCompat android:key="@string/pref_key_quick_start" android:title="@string/tor_connect_automatically_label" app:iconSpaceReserved="false" /> @@ -216,7 +216,7 @@ android:key="@string/pref_key_advanced" android:layout="@layout/preference_category_no_icon_style"> - <SwitchPreference + <SwitchPreferenceCompat android:key="@string/pref_key_allow_screenshots_in_private_mode" app:iconSpaceReserved="false" android:title="@string/preferences_allow_screenshots" /> ===================================== mobile/android/fenix/app/src/main/res/xml/tor_bridge_config_preferences.xml ===================================== @@ -7,7 +7,7 @@ android:key="@string/pref_key_tor_network_settings_bridge_config_explanation" android:summary="@string/preferences_tor_network_settings_bridge_config_explanation" app:allowDividerBelow="false" /> - <SwitchPreference + <SwitchPreferenceCompat android:defaultValue="false" android:key="@string/pref_key_tor_network_settings_bridge_config_toggle" android:title="@string/preferences_tor_network_settings_bridge_config_toggle" ===================================== mozconfig-android-all ===================================== @@ -8,10 +8,6 @@ ac_add_options --enable-application=mobile/android ac_add_options --disable-compile-environment -ac_add_options --with-java-bin-path=$JAVA_HOME/bin -ac_add_options --with-android-sdk=$ANDROID_HOME -ac_add_options --with-gradle=$GRADLE_HOME/bin/gradle - ac_add_options --disable-tests ac_add_options --disable-debug ===================================== mozglue/baseprofiler/public/BaseProfilerState.h ===================================== @@ -136,7 +136,7 @@ class MOZ_RAII AutoProfilerStats { "Record the power used by the entire system with each sample. " \ "Only available with Intel CPUs and requires setting " \ "the sysctl kernel.perf_event_paranoid to 0." -#elif defined(GP_OS_windows) +#elif defined(GP_OS_windows) && defined(_MSC_VER) # define POWER_HELP \ "Record the value of every energy meter available on the system with " \ "each sample. Only available on Windows 11 with Intel CPUs." ===================================== testing/tor/test_circuit_isolation.py ===================================== @@ -81,11 +81,11 @@ class TestCircuitIsolation(MarionetteTestCase, TorBrowserMixin): "Some of the IP addresses we got are not unique.", ) - duplicates = set( + duplicates = set([ self.extract_from_header("https://test-01.torproject.org"), self.extract_from_header("https://test-02.torproject.org"), self.extract_from_header("https://test.torproject.org"), - ) + ]) self.logger.info( f"Found the following IP addresses, when checking for duplicates: {duplicates}" ) ===================================== tools/profiler/core/PowerCounters.h ===================================== @@ -10,7 +10,7 @@ #include "mozilla/UniquePtr.h" #include "mozilla/Vector.h" -#if defined(GP_OS_windows) +#if defined(GP_OS_windows) && defined(_MSC_VER) class PowerMeterDevice; #endif #if defined(GP_PLAT_arm64_darwin) @@ -50,20 +50,20 @@ bool GetRailEnergyData(RailEnergyData*, size_t* size_of_arr); class PowerCounters { public: -#if defined(GP_OS_windows) || defined(GP_OS_darwin) || \ +#if (defined(GP_OS_windows) && defined(_MSC_VER)) || defined(GP_OS_darwin) || \ defined(GP_PLAT_amd64_linux) || defined(GP_PLAT_arm64_android) explicit PowerCounters(); #else explicit PowerCounters() {}; #endif -#if defined(GP_OS_windows) || defined(GP_PLAT_amd64_darwin) || \ - defined(GP_PLAT_arm64_android) +#if (defined(GP_OS_windows) && defined(_MSC_VER)) || \ + defined(GP_PLAT_amd64_darwin) || defined(GP_PLAT_arm64_android) ~PowerCounters(); #else ~PowerCounters() = default; #endif -#if defined(GP_OS_windows) || defined(GP_PLAT_amd64_darwin) || \ - defined(GP_PLAT_arm64_android) +#if (defined(GP_OS_windows) && defined(_MSC_VER)) || \ + defined(GP_PLAT_amd64_darwin) || defined(GP_PLAT_arm64_android) void Sample(); #else void Sample() {}; @@ -75,7 +75,7 @@ class PowerCounters { private: CountVector mCounters; -#if defined(GP_OS_windows) +#if defined(GP_OS_windows) && defined(_MSC_VER) mozilla::Vector<mozilla::UniquePtr<PowerMeterDevice>> mPowerMeterDevices; #endif #if defined(GP_PLAT_amd64_darwin) ===================================== tools/profiler/moz.build ===================================== @@ -167,6 +167,7 @@ elif CONFIG["OS_TARGET"] == "WINNT" and CONFIG["TARGET_CPU"] in ( UNIFIED_SOURCES += [ "gecko/nsProfiler.cpp", ] + # Keep in sync with PowerCounters.h, BaseProfilerState.h and ProfilerState.h (see __MINGW32__) if CONFIG["CC_TYPE"] == "clang-cl": UNIFIED_SOURCES += [ "core/PowerCounters-win.cpp", ===================================== tools/profiler/public/ProfilerState.h ===================================== @@ -31,7 +31,7 @@ "Only available with Intel CPUs and requires setting " \ "the sysctl kernel.perf_event_paranoid to 0." -#elif defined(GP_OS_windows) +#elif defined(GP_OS_windows) && defined(_MSC_VER) # define POWER_HELP \ "Record the value of every energy meter available on the system with " \ "each sample. Only available on Windows 11 with Intel CPUs." View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/70be5bc... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/70be5bc... You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help