- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser-build][main] Bug 41561: Ship Noto Color Emoji on Linux and Windows.
by Pier Angelo Vendrame (＠pierov) 09 Sep '25

09 Sep '25

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 7be3d4ea by Pier Angelo Vendrame at 2025-09-08T09:35:31+02:00 Bug 41561: Ship Noto Color Emoji on Linux and Windows. - - - - - 2 changed files: - projects/fonts/build - projects/fonts/config Changes: ===================================== projects/fonts/build ===================================== @@ -31,6 +31,10 @@ mv noto-fonts-* noto-fonts cp Arimo-*/fonts/ttf/*.ttf Cousine-* Tinos-* NotoSans{JP,KR,SC,TC}-Regular.otf $distdir/ [% END %] +[% IF c("var/linux") || c("var/windows") %] + cp NotoColorEmoji.ttf $distdir/ +[% END %] + cp "$rootdir/[% c('input_files_by_name/Pyidaungsu') %]" $distdir/ cp README.txt "$distdir/000_README.txt" ===================================== projects/fonts/config ===================================== @@ -188,6 +188,9 @@ input_files: - URL: https://github.com/googlefonts/noto-cjk/raw/523d033d6cb47f4a80c58a35753646f… sha256sum: 5bab0cb3c1cf89dde07c4a95a4054b195afbcfe784d69d75c340780712237537 enable: '[% c("var/linux") %]' + - URL: https://github.com/googlefonts/noto-emoji/raw/b3e3051a088047d19fd4d49b1c3ac… + sha256sum: 3ed77810c203e1a67735dc19d395f32c23f2d7c0c3696690f4f78e15e57ab816 + enable: '[% c("var/linux") || c("var/windows") %]' - URL: https://github.com/stipub/stixfonts/raw/v2.13b171/fonts/static_otf/STIXTwoM… sha256sum: 3a5f3f26f40d5698b3c62dd085d48d6663696a3f80825aab8b553d5097518e8c name: stix View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-140.2.0esr-15.0-1] fixup! Add CI for Base Browser
by brizental (＠brizental) 09 Sep '25

09 Sep '25

brizental pushed to branch mullvad-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 081b9f68 by Beatriz Rizental at 2025-09-09T13:10:41+02:00 fixup! Add CI for Base Browser - - - - - 5 changed files: - .gitlab-ci.yml - .gitlab/ci/jobs/lint/helpers.py → .gitlab/ci/jobs/helpers.py - .gitlab/ci/jobs/lint/lint.yml - + .gitlab/ci/jobs/test/python-test.yml - .gitlab/ci/jobs/update-translations.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -1,5 +1,6 @@ stages: - lint + - test - update-translations variables: @@ -9,4 +10,5 @@ variables: include: - local: '.gitlab/ci/mixins.yml' - local: '.gitlab/ci/jobs/lint/lint.yml' + - local: '.gitlab/ci/jobs/test/python-test.yml' - local: '.gitlab/ci/jobs/update-translations.yml' ===================================== .gitlab/ci/jobs/lint/helpers.py → .gitlab/ci/jobs/helpers.py ===================================== @@ -112,7 +112,7 @@ if __name__ == "__main__": parser.add_argument( "--get-changed-files", help="Get list of changed files." - "When running from a merge request get sthe list of changed files since the merge-base of the current branch." + "When running from a merge request gets the list of changed files since the merge-base of the current branch." "When running from a protected branch i.e. any branch that starts with <something>-browser-, gets the list of files changed since the FIREFOX_ tag.", action="store_true", ) ===================================== .gitlab/ci/jobs/lint/lint.yml ===================================== @@ -18,7 +18,7 @@ lint-all: - firefox script: - ./mach configure --with-base-browser-version=0.0.0 - - .gitlab/ci/jobs/lint/helpers.py --get-changed-files | xargs -0 --no-run-if-empty ./mach lint -v + - .gitlab/ci/jobs/helpers.py --get-changed-files | xargs -0 --no-run-if-empty ./mach lint -v rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' # Run job whenever a commit is merged to a protected branch ===================================== .gitlab/ci/jobs/test/python-test.yml ===================================== @@ -0,0 +1,24 @@ +python-test: + extends: .with-local-repo-bash + stage: test + image: $IMAGE_PATH + interruptible: true + variables: + MOZBUILD_STATE_PATH: "/var/tmp/mozbuild" + cache: + paths: + - node_modules + # Store the cache regardless on job outcome + when: 'always' + # Share the cache throughout all pipelines running for a given branch + key: $CI_COMMIT_REF_SLUG + tags: + # Run these jobs in the browser dedicated runners. + - firefox + script: + - ./mach configure --with-base-browser-version=0.0.0 + - .gitlab/ci/jobs/helpers.py --get-changed-files | xargs -0 --no-run-if-empty ./mach python-test -v + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' || ($CI_COMMIT_BRANCH && $CI_COMMIT_REF_PROTECTED == 'true' && $CI_PIPELINE_SOURCE == 'push') + changes: + - "**/test_*.py" ===================================== .gitlab/ci/jobs/update-translations.yml ===================================== @@ -81,7 +81,7 @@ combine-en-US-translations: # push-en-US-translations job. - echo 'COMBINE_TRANSLATIONS_JOB_ID='"$CI_JOB_ID" >job_id.env - pip install compare_locales - - python ./tools/base-browser/l10n/combine-translation-versions.py "$CI_COMMIT_BRANCH" "$TRANSLATION_FILES" "$COMBINED_FILES_JSON" + - python ./tools/base_browser/l10n/combine-translation-versions.py "$CI_COMMIT_BRANCH" "$TRANSLATION_FILES" "$COMBINED_FILES_JSON" push-en-US-translations: extends: .update-translation-base View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/081… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/081… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.27.0esr-13.5-1] fixup! Bug 43125: Extend the 13.5 EOL expiry date for tor-browser.
by Pier Angelo Vendrame (＠pierov) 09 Sep '25

09 Sep '25

Pier Angelo Vendrame pushed to branch tor-browser-115.27.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 55d160b3 by Henry Wilkes at 2025-09-08T17:57:36+01:00 fixup! Bug 43125: Extend the 13.5 EOL expiry date for tor-browser. TB 43168: Extend the 13.5 EOL to 24th March 2026. - - - - - 1 changed file: - browser/base/content/droppedSupportNotification.js Changes: ===================================== browser/base/content/droppedSupportNotification.js ===================================== @@ -3,8 +3,8 @@ // Show a prompt that a user's system will no longer be supported. window.addEventListener("load", () => { let labelId; - // ESR 115 EOL pushed to 14th October 2025. - const isExpired = Date.now() > Date.UTC(2025, 9, 14); + // ESR 115 EOL pushed to 24th March 2026. + const isExpired = Date.now() > Date.UTC(2026, 2, 24); if ( AppConstants.platform === "macosx" && View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/55d160b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/55d160b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag tor-browser-143.0a1-16.0-1-build1
by brizental (＠brizental) 08 Sep '25

08 Sep '25

brizental pushed new tag tor-browser-143.0a1-16.0-1-build1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-140.2.0esr-15.0-1] 6 commits: BB 43564: Modify ./mach bootstrap for Base Browser
by brizental (＠brizental) 08 Sep '25

08 Sep '25

brizental pushed to branch mullvad-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Mullvad Browser Commits: c3546be5 by Beatriz Rizental at 2025-09-08T19:32:45+02:00 BB 43564: Modify ./mach bootstrap for Base Browser - - - - - 802cceaf by Beatriz Rizental at 2025-09-08T19:32:46+02:00 fixup! BB 43564: Modify ./mach bootstrap for Base Browser EXTRA: Stop asking to configure git during bootstrap. - - - - - 856dc4ee by Beatriz Rizental at 2025-09-08T19:32:47+02:00 fixup! BB 43564: Modify ./mach bootstrap for Base Browser - - - - - a1b3a8cf by Beatriz Rizental at 2025-09-08T19:32:47+02:00 fixup! BB 41803: Add some developer tools for working on tor-browser. - - - - - 4d66d017 by Beatriz Rizental at 2025-09-08T19:32:48+02:00 fixup! BB 43564: Modify ./mach bootstrap for Base Browser - - - - - 642024c9 by Beatriz Rizental at 2025-09-08T19:32:49+02:00 fixup! BB 43564: Modify ./mach bootstrap for Base Browser - - - - - 25 changed files: - + build/moz.configure/basebrowser-resources.configure - build/moz.configure/bootstrap.configure - build/moz.configure/init.configure - moz.configure - python/mozboot/mozboot/bootstrap.py - python/mozbuild/mozbuild/action/tooltool.py - python/mozbuild/mozbuild/artifact_commands.py - python/mozbuild/mozbuild/backend/base.py - + python/mozbuild/mozbuild/tbbutils.py - python/mozbuild/mozbuild/test/python.toml - + python/mozbuild/mozbuild/test/test_tbbutils.py - − tools/base-browser/l10n/combine/tests/README - tools/base-browser/git-rebase-fixup-preprocessor → tools/base_browser/git-rebase-fixup-preprocessor - tools/base-browser/l10n/combine-translation-versions.py → tools/base_browser/l10n/combine-translation-versions.py - tools/base-browser/l10n/combine/__init__.py → tools/base_browser/l10n/combine/__init__.py - tools/base-browser/l10n/combine/combine.py → tools/base_browser/l10n/combine/combine.py - tools/base-browser/l10n/combine/tests/__init__.py → tools/base_browser/l10n/combine/tests/__init__.py - + tools/base_browser/l10n/combine/tests/python.toml - tools/base-browser/l10n/combine/tests/test_android.py → tools/base_browser/l10n/combine/tests/test_android.py - tools/base-browser/l10n/combine/tests/test_dtd.py → tools/base_browser/l10n/combine/tests/test_dtd.py - tools/base-browser/l10n/combine/tests/test_fluent.py → tools/base_browser/l10n/combine/tests/test_fluent.py - tools/base-browser/l10n/combine/tests/test_properties.py → tools/base_browser/l10n/combine/tests/test_properties.py - tools/base-browser/missing-css-variables.py → tools/base_browser/missing-css-variables.py - tools/base-browser/tb-dev → tools/base_browser/tb-dev - tools/moz.build Changes: ===================================== build/moz.configure/basebrowser-resources.configure ===================================== @@ -0,0 +1,88 @@ +# Helpers +# ------------------------------------------------- + + +@depends(build_project) +def is_desktop_build(build_project): + return build_project == "browser" + + +# Bootstrap resources +# ------------------------------------------------- + + +option( + "--with-noscript", + env="NOSCRIPT", + nargs=1, + default=None, + help="Path to noscript .xpi extension archive.", +) + + +@depends( + "--with-noscript", + mozbuild_state_path, + bootstrap_path( + "noscript", no_unpack=True, when=depends("--with-noscript")(lambda x: not x) + ), +) +@checking("for noscript") +@imports(_from="pathlib", _import="Path") +def noscript(value, mozbuild_state_path, _bootstrapped): + if value: + path = Path(value[0]) + if path.is_file() and path.suffix == ".xpi": + return value[0] + else: + die("--with-noscript must be an existing .xpi file") + + bootstrapped_location = Path(mozbuild_state_path) / "browser" + for file in bootstrapped_location.glob(f"*.xpi"): + if "noscript" in file.name: + return str(bootstrapped_location / file) + + # noscript is not required for building. + return None + + +set_config("NOSCRIPT", noscript) + + +option( + "--with-tor-browser-fonts", + env="TOR_BROWSER_FONTS", + nargs=1, + default=None, + help="Path to location of fonts directory.", +) + + +@depends( + "--with-tor-browser-fonts", + mozbuild_state_path, + bootstrap_path( + "fonts", + when=depends("--with-tor-browser-fonts")(lambda x: not x) & is_desktop_build, + ), +) +@checking("for tor-browser fonts directory") +@imports(_from="pathlib", _import="Path") +def tor_browser_fonts(value, mozbuild_state_path, _bootstrapped): + if value: + path = Path(value[0]) + # TODO: Do a more thorough check on the directory. + if path.is_dir(): + return value[0] + else: + die("--with-tor-browser-fonts must point to a real directory.") + + bootstrapped_location = Path(mozbuild_state_path) / "fonts" + if bootstrapped_location.is_dir(): + return str(bootstrapped_location) + + # tor browser fonts directory is not required for building. + return None + + +set_config("TOR_BROWSER_FONTS", tor_browser_fonts) ===================================== build/moz.configure/bootstrap.configure ===================================== @@ -4,6 +4,29 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +option( + "--with-tor-browser-build-out", + env="TOR_BROWSER_BUILD_OUT", + nargs=1, + default="https://tb-build-06.torproject.org/~tb-builder/tor-browser-build/out", + help="URL pointing to a Tor Browser Build out folder, served over HTTP[S].", +) + + +@depends("--with-tor-browser-build-out") +def tor_browser_build_out(value): + if value: + return value[0] + + +option( + "--enable-tor-browser-build-only-bootstrap", + env="TBB_ONLY_BOOTSTRAP", + default=False, + help="Flag that disables bootstrapping any artifact from Mozilla's Taskcluster. Will only bootstrap artifacts from tor-browser-build.", +) + + option( env="MOZ_FETCHES_DIR", nargs=1, @@ -115,9 +138,10 @@ def bootstrap_toolchain_tasks(host): def bootstrap_path(path, **kwargs): when = kwargs.pop("when", None) allow_failure = kwargs.pop("allow_failure", None) + no_unpack = kwargs.pop("no_unpack", False) if kwargs: configure_error( - "bootstrap_path only takes `when` and `allow_failure` as a keyword argument" + "bootstrap_path only takes `when`, `allow_failure` and `no_unpack` as keyword arguments" ) @depends( @@ -129,11 +153,16 @@ def bootstrap_path(path, **kwargs): build_environment, dependable(path), dependable(allow_failure), + dependable(no_unpack), + tor_browser_build_out, + "--enable-tor-browser-build-only-bootstrap", + target, when=when, ) @imports("os") @imports("subprocess") @imports("sys") + @imports("mozbuild.tbbutils") @imports(_from="mozbuild.dirutils", _import="ensureParentDir") @imports(_from="importlib", _import="import_module") @imports(_from="shutil", _import="rmtree") @@ -148,6 +177,10 @@ def bootstrap_path(path, **kwargs): build_env, path, allow_failure, + no_unpack, + tor_browser_build_out, + tbb_only_bootstrap, + target, ): if not path: return @@ -158,6 +191,83 @@ def bootstrap_path(path, **kwargs): if path_parts[0] == "clang-tools": path_prefix = path_parts.pop(0) + # Small hack because noscript is inside the browser folder. + if path_parts[0] == "noscript": + path_prefix = "browser" + + def try_tbb_bootstrap(exists): + if not tor_browser_build_out: + return False + + # Tor browser build doesn't have artifacts for all targets supported + # by the Firefox build system. When this is empty it means we are + # building for a platform which tbb doesn't support. + if not target.tor_browser_build_alias: + return False + + artifact = mozbuild.tbbutils.get_artifact_name(path_parts[0], tasks.prefix) + if not artifact: + log.info("%s is not mapped to a tbb artifact", path_parts[0]) + return False + + artifact_path = mozbuild.tbbutils.get_artifact_path( + tor_browser_build_out, + artifact, + target, + prefix=path_prefix, + log=log.warning, + ) + if not artifact_path: + log.info("no path found in tbb/out for %s", artifact) + return False + + # We will use the name of the artifact as the index. + # + # It's usually unique to the artifact version, but each artifact follows + # a different naming convention, so we can't really get more specific here. + artifact_index = artifact_path.rsplit("/", 1)[-1] + index_file = os.path.join(toolchains_base_dir, "indices", artifact) + try: + with open(index_file) as fh: + index = fh.read().strip() + except Exception: + index = None + if index == artifact_index and exists: + log.debug("%s is up-to-date", artifact) + return True + + command = ["artifact", "toolchain", "--from-url", artifact_path] + + if no_unpack: + command.append("--no-unpack") + + # Note to rebasers: + # From here on, it's a slightly modified copy/paste + # from the end of the try_bootstrap function + log.info( + "%s bootstrapped toolchain from TBB in %s", + "Updating" if exists else "Installing", + os.path.join(toolchains_base_dir, path_prefix, artifact), + ) + os.makedirs(os.path.join(toolchains_base_dir, path_prefix), exist_ok=True) + proc = subprocess.run( + [ + sys.executable, + os.path.join(build_env.topsrcdir, "mach"), + "--log-no-times", + ] + + command, + cwd=os.path.join(toolchains_base_dir, path_prefix), + check=not allow_failure, + ) + if proc.returncode != 0 and allow_failure: + return False + ensureParentDir(index_file) + with open(index_file, "w") as fh: + fh.write(artifact_index) + + return True + def try_bootstrap(exists): if not tasks: return False @@ -280,9 +390,10 @@ def bootstrap_path(path, **kwargs): try: # With --enable-bootstrap=no-update, we don't `try_bootstrap`, except # when the toolchain can't be found. - if ( - "no-update" not in enable_bootstrap or not exists - ) and not try_bootstrap(exists): + if ("no-update" not in enable_bootstrap or not exists) and not ( + try_tbb_bootstrap(exists) + or (not tbb_only_bootstrap and try_bootstrap(exists)) + ): # If there aren't toolchain artifacts to use for this build, # don't return a path. return None ===================================== build/moz.configure/init.configure ===================================== @@ -590,6 +590,21 @@ def split_triplet(triplet, allow_wasi=False): else: toolchain = "%s-%s" % (cpu, os) + # In tor-browser-build we use slightly different terminology for + # the supported platforms. Let's prepare that OS string here. + # + # Not all possible platforms listed here are supported in tbb, + # so this value will be empty sometimes. + tor_browser_build_alias = None + if canonical_os == "Android" and canonical_kernel == "Linux": + tor_browser_build_alias = f"android" + elif canonical_os == "GNU" and canonical_kernel == "Linux": + tor_browser_build_alias = f"linux" + elif canonical_os == "OSX" and canonical_kernel == "Darwin": + tor_browser_build_alias = f"macos" + elif canonical_os == "WINNT" and canonical_kernel == "WINNT": + tor_browser_build_alias = f"windows" + return namespace( alias=triplet, cpu=CPU(canonical_cpu), @@ -604,6 +619,7 @@ def split_triplet(triplet, allow_wasi=False): toolchain=toolchain, vendor=vendor, sub_configure_alias=sub_configure_alias, + tor_browser_build_alias=tor_browser_build_alias, ) ===================================== moz.configure ===================================== @@ -229,6 +229,7 @@ check_prog("WGET", ("wget",), allow_missing=True) include("build/moz.configure/toolchain.configure", when="--enable-compile-environment") +include("build/moz.configure/basebrowser-resources.configure") include("build/moz.configure/pkg.configure") include("build/moz.configure/memory.configure", when="--enable-compile-environment") ===================================== python/mozboot/mozboot/bootstrap.py ===================================== @@ -52,21 +52,28 @@ Note on Artifact Mode: Artifact builds download prebuilt C++ components rather than building them locally. Artifact builds are faster! -Artifact builds are recommended for people working on Firefox or -Firefox for Android frontends, or the GeckoView Java API. They are unsuitable +Artifact builds are recommended for people working on Tor Browser or +Base Browser for Android frontends, or the GeckoView Java API. They are unsuitable for those working on C++ code. For more information see: https://firefox-source-docs.mozilla.org/contributing/build/artifact_builds.…. -Please choose the version of Firefox you want to build (see note above): +# Note to Base Browser developers + +This is still highly experimental. Expect bugs! + +Please choose the version of Base Browser you want to build (see note above): %s Your choice: """ APPLICATIONS = OrderedDict( [ - ("Firefox for Desktop Artifact Mode", "browser_artifact_mode"), - ("Firefox for Desktop", "browser"), - ("GeckoView/Firefox for Android Artifact Mode", "mobile_android_artifact_mode"), - ("GeckoView/Firefox for Android", "mobile_android"), + ("Base Browser for Desktop Artifact Mode", "browser_artifact_mode"), + ("Base Browser for Desktop", "browser"), + ( + "GeckoView/Base Browser for Android Artifact Mode", + "mobile_android_artifact_mode", + ), + ("GeckoView/Base Browser for Android", "mobile_android"), ("SpiderMonkey JavaScript engine", "js"), ] ) @@ -360,6 +367,8 @@ class Bootstrapper: getattr(self.instance, "ensure_%s_packages" % application)() def check_code_submission(self, checkout_root: Path): + return + if self.instance.no_interactive or which("moz-phab"): return @@ -474,8 +483,7 @@ class Bootstrapper: configure_mercurial(hg, state_dir) # Offer to configure Git, if the current checkout or repo type is Git. - elif git and checkout_type == "git": - should_configure_git = False + elif False and git and checkout_type == "git": if not self.instance.no_interactive: should_configure_git = self.instance.prompt_yesno(prompt=CONFIGURE_GIT) else: ===================================== python/mozbuild/mozbuild/action/tooltool.py ===================================== @@ -1029,14 +1029,29 @@ def unpack_file(filename): """Untar `filename`, assuming it is uncompressed or compressed with bzip2, xz, gzip, zst, or unzip a zip file. The file is assumed to contain a single directory with a name matching the base of the given filename. - Xz support is handled by shelling out to 'tar'.""" + Xz support is handled by shelling out to 'tar'. + + tor-browser#41564 - For supporting tor-browser-build artifacts that contain + multiple directories, the archive is extracted into a directory with the + same name as the base of the filename. This modification is only applied to + tar archives, because that is all that was necessary. + """ if os.path.isfile(filename) and tarfile.is_tarfile(filename): tar_file, zip_ext = os.path.splitext(filename) base_file, tar_ext = os.path.splitext(tar_file) clean_path(base_file) log.info('untarring "%s"' % filename) with TarFile.open(filename) as tar: - safe_extract(tar) + top_level_directories = set() + for name in tar.getnames(): + dir = name.split("/", 1)[0] + top_level_directories.add(dir) + if len(top_level_directories) == 1: + safe_extract(tar) + else: + safe_extract( + tar, path=os.path.join(os.path.dirname(filename), base_file) + ) elif os.path.isfile(filename) and filename.endswith(".tar.zst"): import zstandard ===================================== python/mozbuild/mozbuild/artifact_commands.py ===================================== @@ -244,6 +244,12 @@ def artifact_clear_cache(command_context, tree=None, job=None, verbose=False): nargs="+", help="Download toolchain artifact from a given task.", ) +@CommandArgument( + "--from-url", + metavar="URL", + nargs="+", + help="Download toolchain artifact from an arbitrary address.", +) @CommandArgument( "--tooltool-manifest", metavar="MANIFEST", @@ -273,6 +279,7 @@ def artifact_toolchain( skip_cache=False, from_build=(), from_task=(), + from_url=[], tooltool_manifest=None, no_unpack=False, retry=0, @@ -504,6 +511,13 @@ def artifact_toolchain( record = ArtifactRecord(task_id, name) records[record.filename] = record + if from_url: + for file in from_url: + record = DownloadRecord( + file, file.rsplit("/", 1)[-1], None, None, None, True + ) + records[record.filename] = record + for record in records.values(): command_context.log( logging.INFO, ===================================== python/mozbuild/mozbuild/backend/base.py ===================================== @@ -2,11 +2,14 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +import errno import itertools +import logging import os import time from abc import ABCMeta, abstractmethod from contextlib import contextmanager +from pathlib import Path import mozpack.path as mozpath from mach.mixin.logging import LoggingMixin @@ -239,6 +242,72 @@ class BuildBackend(LoggingMixin): with open(mozpath.join(dir, ".purgecaches"), "w") as f: f.write("\n") + def _setup_tor_browser_environment(self, config): + app = config.substs["MOZ_BUILD_APP"] + + noscript_target_filename = "{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" + noscript_location = config.substs.get("NOSCRIPT") + + def _infallible_symlink(src, dst): + try: + os.symlink(src, dst) + except OSError as e: + if e.errno == errno.EEXIST: + # If the symlink already exists, remove it and try again. + os.remove(dst) + os.symlink(src, dst) + else: + return + + if app == "browser": + tbdir = Path(config.topobjdir) / "dist" / "bin" + + if config.substs.get("OS_TARGET") == "Darwin": + tbdir = next(tbdir.glob("*.app")) + paths = { + "docs": tbdir / "Contents/Resources/TorBrowser/Docs", + "exts": tbdir / "Contents/Resources/distribution/extensions", + "fonts": tbdir / "Resources/fonts", + } + else: + paths = { + "docs": tbdir / "TorBrowser/Docs", + "exts": tbdir / "distribution/extensions", + "fonts": tbdir / "fonts", + } + + fonts_location = config.substs.get("TOR_BROWSER_FONTS") + if fonts_location: + self.log( + logging.INFO, + "_setup_tor_browser_environment", + { + "fonts_location": fonts_location, + "fonts_target": str(paths["fonts"]), + }, + "Creating symlink for fonts files from {fonts_location} to {fonts_target}", + ) + + for file in Path(fonts_location).iterdir(): + target = paths["fonts"] / file.name + _infallible_symlink(file, target) + + # Set up NoScript extension + if noscript_location: + noscript_target = paths["exts"] / noscript_target_filename + self.log( + logging.INFO, + "_setup_tor_browser_environment", + { + "noscript_location": noscript_location, + "noscript_target": str(noscript_target), + }, + "Creating symlink for NoScript from {noscript_location} to {noscript_target}", + ) + + paths["exts"].mkdir(parents=True, exist_ok=True) + _infallible_symlink(noscript_location, noscript_target) + def post_build(self, config, output, jobs, verbose, status): """Called late during 'mach build' execution, after `build(...)` has finished. @@ -257,6 +326,9 @@ class BuildBackend(LoggingMixin): """ self._write_purgecaches(config) + if status == 0: + self._setup_tor_browser_environment(config) + return status @contextmanager ===================================== python/mozbuild/mozbuild/tbbutils.py ===================================== @@ -0,0 +1,103 @@ +import re +from urllib.request import Request, urlopen + + +def list_files_http(url): + try: + req = Request(url, method="GET") + with urlopen(req) as response: + if response.status != 200: + return [] + html = response.read().decode() + except Exception: + return [] + + links = [] + for href in re.findall(r'<a href="([^"]+)"', html): + if href == "../": + continue + + links.append(href) + + return links + + +TOR_BROWSER_BUILD_ARTIFACTS = [ + # Tor Browser Build-only artifacts, these artifacts are not common with Firefox. + "noscript", + "fonts", +] + +# Mapping of artifacts from taskcluster to tor-browser-build. +ARTIFACT_NAME_MAP = { + "cbindgen": "cbindgen", + # FIXME (tor-browser-build#41471): nasm is more or less ready to go, but it needs to have the + # executable in the root of the artifact folder instead of nasm/bin. + # "nasm": "nasm", + # FIXME (tor-browser-build#41421): the clang project as is, is not ready to use. It needs + # to be repackaged with a bunch of things that differ per platform. Fun stuff. + # "clang": "clang", + "node": "node", +} + + +def get_artifact_name(original_artifact_name, host): + # These are not build artifacts, they are pre-built artifacts to be added to the final build, + # therefore this check can come before the host check. + if original_artifact_name in TOR_BROWSER_BUILD_ARTIFACTS: + return original_artifact_name + + if host != "linux64": + # Tor browser build only has development artifacts for linux64 host systems. + return None + + return ARTIFACT_NAME_MAP.get(original_artifact_name) + + +def get_artifact_path(url, artifact, target, prefix="", log=lambda *args, **kwargs: {}): + if prefix: + path = prefix + else: + path = artifact + + # The `?C=M;O=D` parameters make it so links are ordered by + # the last modified date. This here to make us get the latest + # version of file in the case there are multiple and we just + # grab the first one. + files = list_files_http(f"{url}/{path}?C=M;O=D") + + if not files: + log(f"No files found in {url} for {artifact}.") + return None + + def filter_files(files, keyword): + return [file for file in files if keyword in file] + + artifact_files = [file for file in files if file.startswith(artifact)] + + if len(artifact_files) == 0: + log(f"No files found in {url} for {artifact}.") + return None + + if len(artifact_files) == 1: + return f"{url}/{path}/{artifact_files[0]}" + + files_per_os = filter_files(artifact_files, target.tor_browser_build_alias) + + # If there are files in the folder, but they don't have the OS in the name + # it probably means we can get any of them because they can be used to build + # for any OS. So let's just get the first one. + # + # Note: It could be the case that the artifact _is_ OS dependant, but there + # just are no files for the OS we are looking for. In that case, this will + # return an incorrect artifact. This should not happen often though and is + # something we cannot address until artifact names are standardized on tbb. + if len(files_per_os) == 0: + return f"{url}/{artifact}/{artifact_files[0]}" + + elif len(files_per_os) == 1: + return f"{url}/{artifact}/{files_per_os[0]}" + + matches = filter_files(files_per_os, target.cpu) + + return f"{url}/{artifact}/{matches[0]}" if matches else None ===================================== python/mozbuild/mozbuild/test/python.toml ===================================== @@ -111,6 +111,9 @@ subsuite = "mozbuild" ["test_rewrite_mozbuild.py"] +["test_tbbutils.py"] +subsuite = "base-browser" + ["test_telemetry.py"] ["test_telemetry_settings.py"] ===================================== python/mozbuild/mozbuild/test/test_tbbutils.py ===================================== @@ -0,0 +1,139 @@ +import unittest +from types import SimpleNamespace +from unittest.mock import MagicMock, patch + +import mozunit + +from mozbuild.tbbutils import get_artifact_path, list_files_http + + +class TestGetArtifactName(unittest.TestCase): + def setUp(self): + self.artifact = "artifact" + self.host = "linux64" + + @patch("mozbuild.tbbutils.TOR_BROWSER_BUILD_ARTIFACTS", new=["artifact"]) + def test_artifact_in_tbb_artifacts(self): + from mozbuild.tbbutils import get_artifact_name + + result = get_artifact_name(self.artifact, self.host) + self.assertEqual(result, self.artifact) + + @patch("mozbuild.tbbutils.ARTIFACT_NAME_MAP", new={"artifact": "tcafitra"}) + def test_host_is_not_linux64(self): + from mozbuild.tbbutils import get_artifact_name + + result = get_artifact_name(self.artifact, "linux64-aarch64") + self.assertIsNone(result) + + @patch("mozbuild.tbbutils.ARTIFACT_NAME_MAP", new={"artifact": "tcafitra"}) + def test_mapped_artifact(self): + from mozbuild.tbbutils import get_artifact_name + + result = get_artifact_name(self.artifact, self.host) + self.assertEqual(result, self.artifact[::-1]) + + +class TestGetArtifactPath(unittest.TestCase): + def setUp(self): + self.url = "http://example.com" + self.artifact = "artifact" + # This is just an example target which is valid. But it doesn't make + # any difference and could be anything for these tests. + self.target = SimpleNamespace(tor_browser_build_alias="linux", cpu="x86_64") + + @patch("mozbuild.tbbutils.list_files_http") + def test_no_files_returns_none(self, mock_list_files): + mock_list_files.return_value = [] + result = get_artifact_path(self.url, self.artifact, self.target) + self.assertIsNone(result) + + @patch("mozbuild.tbbutils.list_files_http") + def test_no_matching_files_returns_none(self, mock_list_files): + mock_list_files.return_value = ["somethingelse.zip", "yetanotherthing.zip"] + result = get_artifact_path(self.url, self.artifact, self.target) + self.assertIsNone(result) + + @patch("mozbuild.tbbutils.list_files_http") + def test_single_artifact_match(self, mock_list_files): + mock_list_files.return_value = ["artifact-1.zip"] + result = get_artifact_path(self.url, self.artifact, self.target) + self.assertEqual(result, f"{self.url}/{self.artifact}/artifact-1.zip") + + @patch("mozbuild.tbbutils.list_files_http") + def test_artifact_without_os_returns_first(self, mock_list_files): + mock_list_files.return_value = ["artifact-1.zip", "artifact-2.zip"] + result = get_artifact_path(self.url, self.artifact, self.target) + self.assertTrue(result.startswith(f"{self.url}/{self.artifact}/")) + self.assertIn("artifact-", result) + + @patch("mozbuild.tbbutils.list_files_http") + def test_artifact_with_os_match(self, mock_list_files): + mock_list_files.return_value = [ + "artifact-windows.zip", + "artifact-linux.zip", + ] + result = get_artifact_path(self.url, self.artifact, self.target) + self.assertEqual(result, f"{self.url}/{self.artifact}/artifact-linux.zip") + + @patch("mozbuild.tbbutils.list_files_http") + def test_artifact_with_cpu_match(self, mock_list_files): + mock_list_files.return_value = [ + "artifact-linux-arm.zip", + "artifact-linux-x86_64.zip", + ] + result = get_artifact_path(self.url, self.artifact, self.target) + self.assertEqual( + result, f"{self.url}/{self.artifact}/artifact-linux-x86_64.zip" + ) + + @patch("mozbuild.tbbutils.list_files_http") + def test_artifact_with_prefix(self, mock_list_files): + mock_list_files.return_value = ["artifact-1.zip"] + + prefix = "prefix" + result = get_artifact_path(self.url, self.artifact, self.target, prefix=prefix) + self.assertEqual(result, f"{self.url}/{prefix}/artifact-1.zip") + mock_list_files.assert_called_with(f"{self.url}/{prefix}?C=M;O=D") + + +class TestListFilesHttp(unittest.TestCase): + def setUp(self): + self.url = "http://example.com" + + @patch("mozbuild.tbbutils.urlopen") + def test_non_200_status_returns_empty(self, mock_urlopen): + mock_resp = MagicMock() + mock_resp.status = 404 + mock_resp.read.return_value = b"" + mock_urlopen.return_value.__enter__.return_value = mock_resp + + result = list_files_http(self.url) + self.assertEqual(result, []) + + @patch("mozbuild.tbbutils.urlopen") + def test_exception_returns_empty(self, mock_urlopen): + mock_urlopen.side_effect = Exception("network error") + result = list_files_http(self.url) + self.assertEqual(result, []) + + @patch("mozbuild.tbbutils.urlopen") + def test_regular_links(self, mock_urlopen): + html = b""" + <html><body> + <a href="../">Parent</a> + <a href="file1.zip">file1</a> + <a href="file2.zip">file2</a> + </body></html> + """ + mock_resp = MagicMock() + mock_resp.status = 200 + mock_resp.read.return_value = html + mock_urlopen.return_value.__enter__.return_value = mock_resp + + result = list_files_http(self.url) + self.assertEqual(result, ["file1.zip", "file2.zip"]) + + +if __name__ == "__main__": + mozunit.main() ===================================== tools/base-browser/l10n/combine/tests/README deleted ===================================== @@ -1,2 +0,0 @@ -python tests to be run with pytest. -Requires the compare-locales package. ===================================== tools/base-browser/git-rebase-fixup-preprocessor → tools/base_browser/git-rebase-fixup-preprocessor ===================================== ===================================== tools/base-browser/l10n/combine-translation-versions.py → tools/base_browser/l10n/combine-translation-versions.py ===================================== ===================================== tools/base-browser/l10n/combine/__init__.py → tools/base_browser/l10n/combine/__init__.py ===================================== ===================================== tools/base-browser/l10n/combine/combine.py → tools/base_browser/l10n/combine/combine.py ===================================== ===================================== tools/base-browser/l10n/combine/tests/__init__.py → tools/base_browser/l10n/combine/tests/__init__.py ===================================== ===================================== tools/base_browser/l10n/combine/tests/python.toml ===================================== @@ -0,0 +1,10 @@ +[DEFAULT] +subsuite = "base-browser" + +["test_android.py"] + +["test_dtd.py"] + +["test_fluent.py"] + +["test_properties.py"] ===================================== tools/base-browser/l10n/combine/tests/test_android.py → tools/base_browser/l10n/combine/tests/test_android.py ===================================== @@ -1,6 +1,7 @@ import textwrap -from combine import combine_files +import mozunit +from base_browser.l10n.combine import combine_files def wrap_in_xml(content): @@ -413,3 +414,7 @@ def test_alternatives(): <string name="string_4_alt">Other string</string> """, ) + + +if __name__ == "__main__": + mozunit.main() ===================================== tools/base-browser/l10n/combine/tests/test_dtd.py → tools/base_browser/l10n/combine/tests/test_dtd.py ===================================== @@ -1,6 +1,7 @@ import textwrap -from combine import combine_files +import mozunit +from base_browser.l10n.combine import combine_files def assert_result(new_content, old_content, expect): @@ -411,3 +412,7 @@ def test_alternatives(): <!ENTITY string.4.alt "Other string"> """, ) + + +if __name__ == "__main__": + mozunit.main() ===================================== tools/base-browser/l10n/combine/tests/test_fluent.py → tools/base_browser/l10n/combine/tests/test_fluent.py ===================================== @@ -1,6 +1,7 @@ import textwrap -from combine import combine_files +import mozunit +from base_browser.l10n.combine import combine_files def assert_result(new_content, old_content, expect): @@ -475,3 +476,7 @@ def test_alternatives(): -string-4-alt = Other string """, ) + + +if __name__ == "__main__": + mozunit.main() ===================================== tools/base-browser/l10n/combine/tests/test_properties.py → tools/base_browser/l10n/combine/tests/test_properties.py ===================================== @@ -1,6 +1,7 @@ import textwrap -from combine import combine_files +import mozunit +from base_browser.l10n.combine import combine_files def assert_result(new_content, old_content, expect): @@ -408,3 +409,7 @@ def test_alternatives(): string.4.alt = Other string """, ) + + +if __name__ == "__main__": + mozunit.main() ===================================== tools/base-browser/missing-css-variables.py → tools/base_browser/missing-css-variables.py ===================================== ===================================== tools/base-browser/tb-dev → tools/base_browser/tb-dev ===================================== ===================================== tools/moz.build ===================================== @@ -71,6 +71,7 @@ with Files("tryselect/docs/**"): SCHEDULES.exclusive = ["docs"] PYTHON_UNITTEST_MANIFESTS += [ + "base_browser/l10n/combine/tests/python.toml", "fuzzing/smoke/python.toml", "lint/test/python.toml", "tryselect/test/python.toml", View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/a5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/a5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-140.2.0esr-15.0-1] 6 commits: BB 43564: Modify ./mach bootstrap for Base Browser
by brizental (＠brizental) 08 Sep '25

08 Sep '25

brizental pushed to branch base-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 85b4d8d5 by Beatriz Rizental at 2025-09-08T19:22:50+02:00 BB 43564: Modify ./mach bootstrap for Base Browser - - - - - 02a18b4d by Beatriz Rizental at 2025-09-08T19:22:58+02:00 fixup! BB 43564: Modify ./mach bootstrap for Base Browser EXTRA: Stop asking to configure git during bootstrap. - - - - - 4937c1b6 by Beatriz Rizental at 2025-09-08T19:23:06+02:00 fixup! BB 43564: Modify ./mach bootstrap for Base Browser - - - - - 98a01dbd by Beatriz Rizental at 2025-09-08T19:23:32+02:00 fixup! BB 41803: Add some developer tools for working on tor-browser. - - - - - 10ce4ee0 by Beatriz Rizental at 2025-09-08T19:28:44+02:00 fixup! BB 43564: Modify ./mach bootstrap for Base Browser - - - - - e841a083 by Beatriz Rizental at 2025-09-08T19:28:49+02:00 fixup! BB 43564: Modify ./mach bootstrap for Base Browser - - - - - 25 changed files: - + build/moz.configure/basebrowser-resources.configure - build/moz.configure/bootstrap.configure - build/moz.configure/init.configure - moz.configure - python/mozboot/mozboot/bootstrap.py - python/mozbuild/mozbuild/action/tooltool.py - python/mozbuild/mozbuild/artifact_commands.py - python/mozbuild/mozbuild/backend/base.py - + python/mozbuild/mozbuild/tbbutils.py - python/mozbuild/mozbuild/test/python.toml - + python/mozbuild/mozbuild/test/test_tbbutils.py - − tools/base-browser/l10n/combine/tests/README - tools/base-browser/git-rebase-fixup-preprocessor → tools/base_browser/git-rebase-fixup-preprocessor - tools/base-browser/l10n/combine-translation-versions.py → tools/base_browser/l10n/combine-translation-versions.py - tools/base-browser/l10n/combine/__init__.py → tools/base_browser/l10n/combine/__init__.py - tools/base-browser/l10n/combine/combine.py → tools/base_browser/l10n/combine/combine.py - tools/base-browser/l10n/combine/tests/__init__.py → tools/base_browser/l10n/combine/tests/__init__.py - + tools/base_browser/l10n/combine/tests/python.toml - tools/base-browser/l10n/combine/tests/test_android.py → tools/base_browser/l10n/combine/tests/test_android.py - tools/base-browser/l10n/combine/tests/test_dtd.py → tools/base_browser/l10n/combine/tests/test_dtd.py - tools/base-browser/l10n/combine/tests/test_fluent.py → tools/base_browser/l10n/combine/tests/test_fluent.py - tools/base-browser/l10n/combine/tests/test_properties.py → tools/base_browser/l10n/combine/tests/test_properties.py - tools/base-browser/missing-css-variables.py → tools/base_browser/missing-css-variables.py - tools/base-browser/tb-dev → tools/base_browser/tb-dev - tools/moz.build Changes: ===================================== build/moz.configure/basebrowser-resources.configure ===================================== @@ -0,0 +1,88 @@ +# Helpers +# ------------------------------------------------- + + +@depends(build_project) +def is_desktop_build(build_project): + return build_project == "browser" + + +# Bootstrap resources +# ------------------------------------------------- + + +option( + "--with-noscript", + env="NOSCRIPT", + nargs=1, + default=None, + help="Path to noscript .xpi extension archive.", +) + + +@depends( + "--with-noscript", + mozbuild_state_path, + bootstrap_path( + "noscript", no_unpack=True, when=depends("--with-noscript")(lambda x: not x) + ), +) +@checking("for noscript") +@imports(_from="pathlib", _import="Path") +def noscript(value, mozbuild_state_path, _bootstrapped): + if value: + path = Path(value[0]) + if path.is_file() and path.suffix == ".xpi": + return value[0] + else: + die("--with-noscript must be an existing .xpi file") + + bootstrapped_location = Path(mozbuild_state_path) / "browser" + for file in bootstrapped_location.glob(f"*.xpi"): + if "noscript" in file.name: + return str(bootstrapped_location / file) + + # noscript is not required for building. + return None + + +set_config("NOSCRIPT", noscript) + + +option( + "--with-tor-browser-fonts", + env="TOR_BROWSER_FONTS", + nargs=1, + default=None, + help="Path to location of fonts directory.", +) + + +@depends( + "--with-tor-browser-fonts", + mozbuild_state_path, + bootstrap_path( + "fonts", + when=depends("--with-tor-browser-fonts")(lambda x: not x) & is_desktop_build, + ), +) +@checking("for tor-browser fonts directory") +@imports(_from="pathlib", _import="Path") +def tor_browser_fonts(value, mozbuild_state_path, _bootstrapped): + if value: + path = Path(value[0]) + # TODO: Do a more thorough check on the directory. + if path.is_dir(): + return value[0] + else: + die("--with-tor-browser-fonts must point to a real directory.") + + bootstrapped_location = Path(mozbuild_state_path) / "fonts" + if bootstrapped_location.is_dir(): + return str(bootstrapped_location) + + # tor browser fonts directory is not required for building. + return None + + +set_config("TOR_BROWSER_FONTS", tor_browser_fonts) ===================================== build/moz.configure/bootstrap.configure ===================================== @@ -4,6 +4,29 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +option( + "--with-tor-browser-build-out", + env="TOR_BROWSER_BUILD_OUT", + nargs=1, + default="https://tb-build-06.torproject.org/~tb-builder/tor-browser-build/out", + help="URL pointing to a Tor Browser Build out folder, served over HTTP[S].", +) + + +@depends("--with-tor-browser-build-out") +def tor_browser_build_out(value): + if value: + return value[0] + + +option( + "--enable-tor-browser-build-only-bootstrap", + env="TBB_ONLY_BOOTSTRAP", + default=False, + help="Flag that disables bootstrapping any artifact from Mozilla's Taskcluster. Will only bootstrap artifacts from tor-browser-build.", +) + + option( env="MOZ_FETCHES_DIR", nargs=1, @@ -115,9 +138,10 @@ def bootstrap_toolchain_tasks(host): def bootstrap_path(path, **kwargs): when = kwargs.pop("when", None) allow_failure = kwargs.pop("allow_failure", None) + no_unpack = kwargs.pop("no_unpack", False) if kwargs: configure_error( - "bootstrap_path only takes `when` and `allow_failure` as a keyword argument" + "bootstrap_path only takes `when`, `allow_failure` and `no_unpack` as keyword arguments" ) @depends( @@ -129,11 +153,16 @@ def bootstrap_path(path, **kwargs): build_environment, dependable(path), dependable(allow_failure), + dependable(no_unpack), + tor_browser_build_out, + "--enable-tor-browser-build-only-bootstrap", + target, when=when, ) @imports("os") @imports("subprocess") @imports("sys") + @imports("mozbuild.tbbutils") @imports(_from="mozbuild.dirutils", _import="ensureParentDir") @imports(_from="importlib", _import="import_module") @imports(_from="shutil", _import="rmtree") @@ -148,6 +177,10 @@ def bootstrap_path(path, **kwargs): build_env, path, allow_failure, + no_unpack, + tor_browser_build_out, + tbb_only_bootstrap, + target, ): if not path: return @@ -158,6 +191,83 @@ def bootstrap_path(path, **kwargs): if path_parts[0] == "clang-tools": path_prefix = path_parts.pop(0) + # Small hack because noscript is inside the browser folder. + if path_parts[0] == "noscript": + path_prefix = "browser" + + def try_tbb_bootstrap(exists): + if not tor_browser_build_out: + return False + + # Tor browser build doesn't have artifacts for all targets supported + # by the Firefox build system. When this is empty it means we are + # building for a platform which tbb doesn't support. + if not target.tor_browser_build_alias: + return False + + artifact = mozbuild.tbbutils.get_artifact_name(path_parts[0], tasks.prefix) + if not artifact: + log.info("%s is not mapped to a tbb artifact", path_parts[0]) + return False + + artifact_path = mozbuild.tbbutils.get_artifact_path( + tor_browser_build_out, + artifact, + target, + prefix=path_prefix, + log=log.warning, + ) + if not artifact_path: + log.info("no path found in tbb/out for %s", artifact) + return False + + # We will use the name of the artifact as the index. + # + # It's usually unique to the artifact version, but each artifact follows + # a different naming convention, so we can't really get more specific here. + artifact_index = artifact_path.rsplit("/", 1)[-1] + index_file = os.path.join(toolchains_base_dir, "indices", artifact) + try: + with open(index_file) as fh: + index = fh.read().strip() + except Exception: + index = None + if index == artifact_index and exists: + log.debug("%s is up-to-date", artifact) + return True + + command = ["artifact", "toolchain", "--from-url", artifact_path] + + if no_unpack: + command.append("--no-unpack") + + # Note to rebasers: + # From here on, it's a slightly modified copy/paste + # from the end of the try_bootstrap function + log.info( + "%s bootstrapped toolchain from TBB in %s", + "Updating" if exists else "Installing", + os.path.join(toolchains_base_dir, path_prefix, artifact), + ) + os.makedirs(os.path.join(toolchains_base_dir, path_prefix), exist_ok=True) + proc = subprocess.run( + [ + sys.executable, + os.path.join(build_env.topsrcdir, "mach"), + "--log-no-times", + ] + + command, + cwd=os.path.join(toolchains_base_dir, path_prefix), + check=not allow_failure, + ) + if proc.returncode != 0 and allow_failure: + return False + ensureParentDir(index_file) + with open(index_file, "w") as fh: + fh.write(artifact_index) + + return True + def try_bootstrap(exists): if not tasks: return False @@ -280,9 +390,10 @@ def bootstrap_path(path, **kwargs): try: # With --enable-bootstrap=no-update, we don't `try_bootstrap`, except # when the toolchain can't be found. - if ( - "no-update" not in enable_bootstrap or not exists - ) and not try_bootstrap(exists): + if ("no-update" not in enable_bootstrap or not exists) and not ( + try_tbb_bootstrap(exists) + or (not tbb_only_bootstrap and try_bootstrap(exists)) + ): # If there aren't toolchain artifacts to use for this build, # don't return a path. return None ===================================== build/moz.configure/init.configure ===================================== @@ -590,6 +590,21 @@ def split_triplet(triplet, allow_wasi=False): else: toolchain = "%s-%s" % (cpu, os) + # In tor-browser-build we use slightly different terminology for + # the supported platforms. Let's prepare that OS string here. + # + # Not all possible platforms listed here are supported in tbb, + # so this value will be empty sometimes. + tor_browser_build_alias = None + if canonical_os == "Android" and canonical_kernel == "Linux": + tor_browser_build_alias = f"android" + elif canonical_os == "GNU" and canonical_kernel == "Linux": + tor_browser_build_alias = f"linux" + elif canonical_os == "OSX" and canonical_kernel == "Darwin": + tor_browser_build_alias = f"macos" + elif canonical_os == "WINNT" and canonical_kernel == "WINNT": + tor_browser_build_alias = f"windows" + return namespace( alias=triplet, cpu=CPU(canonical_cpu), @@ -604,6 +619,7 @@ def split_triplet(triplet, allow_wasi=False): toolchain=toolchain, vendor=vendor, sub_configure_alias=sub_configure_alias, + tor_browser_build_alias=tor_browser_build_alias, ) ===================================== moz.configure ===================================== @@ -229,6 +229,7 @@ check_prog("WGET", ("wget",), allow_missing=True) include("build/moz.configure/toolchain.configure", when="--enable-compile-environment") +include("build/moz.configure/basebrowser-resources.configure") include("build/moz.configure/pkg.configure") include("build/moz.configure/memory.configure", when="--enable-compile-environment") ===================================== python/mozboot/mozboot/bootstrap.py ===================================== @@ -52,21 +52,28 @@ Note on Artifact Mode: Artifact builds download prebuilt C++ components rather than building them locally. Artifact builds are faster! -Artifact builds are recommended for people working on Firefox or -Firefox for Android frontends, or the GeckoView Java API. They are unsuitable +Artifact builds are recommended for people working on Tor Browser or +Base Browser for Android frontends, or the GeckoView Java API. They are unsuitable for those working on C++ code. For more information see: https://firefox-source-docs.mozilla.org/contributing/build/artifact_builds.…. -Please choose the version of Firefox you want to build (see note above): +# Note to Base Browser developers + +This is still highly experimental. Expect bugs! + +Please choose the version of Base Browser you want to build (see note above): %s Your choice: """ APPLICATIONS = OrderedDict( [ - ("Firefox for Desktop Artifact Mode", "browser_artifact_mode"), - ("Firefox for Desktop", "browser"), - ("GeckoView/Firefox for Android Artifact Mode", "mobile_android_artifact_mode"), - ("GeckoView/Firefox for Android", "mobile_android"), + ("Base Browser for Desktop Artifact Mode", "browser_artifact_mode"), + ("Base Browser for Desktop", "browser"), + ( + "GeckoView/Base Browser for Android Artifact Mode", + "mobile_android_artifact_mode", + ), + ("GeckoView/Base Browser for Android", "mobile_android"), ("SpiderMonkey JavaScript engine", "js"), ] ) @@ -360,6 +367,8 @@ class Bootstrapper: getattr(self.instance, "ensure_%s_packages" % application)() def check_code_submission(self, checkout_root: Path): + return + if self.instance.no_interactive or which("moz-phab"): return @@ -474,8 +483,7 @@ class Bootstrapper: configure_mercurial(hg, state_dir) # Offer to configure Git, if the current checkout or repo type is Git. - elif git and checkout_type == "git": - should_configure_git = False + elif False and git and checkout_type == "git": if not self.instance.no_interactive: should_configure_git = self.instance.prompt_yesno(prompt=CONFIGURE_GIT) else: ===================================== python/mozbuild/mozbuild/action/tooltool.py ===================================== @@ -1029,14 +1029,29 @@ def unpack_file(filename): """Untar `filename`, assuming it is uncompressed or compressed with bzip2, xz, gzip, zst, or unzip a zip file. The file is assumed to contain a single directory with a name matching the base of the given filename. - Xz support is handled by shelling out to 'tar'.""" + Xz support is handled by shelling out to 'tar'. + + tor-browser#41564 - For supporting tor-browser-build artifacts that contain + multiple directories, the archive is extracted into a directory with the + same name as the base of the filename. This modification is only applied to + tar archives, because that is all that was necessary. + """ if os.path.isfile(filename) and tarfile.is_tarfile(filename): tar_file, zip_ext = os.path.splitext(filename) base_file, tar_ext = os.path.splitext(tar_file) clean_path(base_file) log.info('untarring "%s"' % filename) with TarFile.open(filename) as tar: - safe_extract(tar) + top_level_directories = set() + for name in tar.getnames(): + dir = name.split("/", 1)[0] + top_level_directories.add(dir) + if len(top_level_directories) == 1: + safe_extract(tar) + else: + safe_extract( + tar, path=os.path.join(os.path.dirname(filename), base_file) + ) elif os.path.isfile(filename) and filename.endswith(".tar.zst"): import zstandard ===================================== python/mozbuild/mozbuild/artifact_commands.py ===================================== @@ -244,6 +244,12 @@ def artifact_clear_cache(command_context, tree=None, job=None, verbose=False): nargs="+", help="Download toolchain artifact from a given task.", ) +@CommandArgument( + "--from-url", + metavar="URL", + nargs="+", + help="Download toolchain artifact from an arbitrary address.", +) @CommandArgument( "--tooltool-manifest", metavar="MANIFEST", @@ -273,6 +279,7 @@ def artifact_toolchain( skip_cache=False, from_build=(), from_task=(), + from_url=[], tooltool_manifest=None, no_unpack=False, retry=0, @@ -504,6 +511,13 @@ def artifact_toolchain( record = ArtifactRecord(task_id, name) records[record.filename] = record + if from_url: + for file in from_url: + record = DownloadRecord( + file, file.rsplit("/", 1)[-1], None, None, None, True + ) + records[record.filename] = record + for record in records.values(): command_context.log( logging.INFO, ===================================== python/mozbuild/mozbuild/backend/base.py ===================================== @@ -2,11 +2,14 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +import errno import itertools +import logging import os import time from abc import ABCMeta, abstractmethod from contextlib import contextmanager +from pathlib import Path import mozpack.path as mozpath from mach.mixin.logging import LoggingMixin @@ -239,6 +242,72 @@ class BuildBackend(LoggingMixin): with open(mozpath.join(dir, ".purgecaches"), "w") as f: f.write("\n") + def _setup_tor_browser_environment(self, config): + app = config.substs["MOZ_BUILD_APP"] + + noscript_target_filename = "{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" + noscript_location = config.substs.get("NOSCRIPT") + + def _infallible_symlink(src, dst): + try: + os.symlink(src, dst) + except OSError as e: + if e.errno == errno.EEXIST: + # If the symlink already exists, remove it and try again. + os.remove(dst) + os.symlink(src, dst) + else: + return + + if app == "browser": + tbdir = Path(config.topobjdir) / "dist" / "bin" + + if config.substs.get("OS_TARGET") == "Darwin": + tbdir = next(tbdir.glob("*.app")) + paths = { + "docs": tbdir / "Contents/Resources/TorBrowser/Docs", + "exts": tbdir / "Contents/Resources/distribution/extensions", + "fonts": tbdir / "Resources/fonts", + } + else: + paths = { + "docs": tbdir / "TorBrowser/Docs", + "exts": tbdir / "distribution/extensions", + "fonts": tbdir / "fonts", + } + + fonts_location = config.substs.get("TOR_BROWSER_FONTS") + if fonts_location: + self.log( + logging.INFO, + "_setup_tor_browser_environment", + { + "fonts_location": fonts_location, + "fonts_target": str(paths["fonts"]), + }, + "Creating symlink for fonts files from {fonts_location} to {fonts_target}", + ) + + for file in Path(fonts_location).iterdir(): + target = paths["fonts"] / file.name + _infallible_symlink(file, target) + + # Set up NoScript extension + if noscript_location: + noscript_target = paths["exts"] / noscript_target_filename + self.log( + logging.INFO, + "_setup_tor_browser_environment", + { + "noscript_location": noscript_location, + "noscript_target": str(noscript_target), + }, + "Creating symlink for NoScript from {noscript_location} to {noscript_target}", + ) + + paths["exts"].mkdir(parents=True, exist_ok=True) + _infallible_symlink(noscript_location, noscript_target) + def post_build(self, config, output, jobs, verbose, status): """Called late during 'mach build' execution, after `build(...)` has finished. @@ -257,6 +326,9 @@ class BuildBackend(LoggingMixin): """ self._write_purgecaches(config) + if status == 0: + self._setup_tor_browser_environment(config) + return status @contextmanager ===================================== python/mozbuild/mozbuild/tbbutils.py ===================================== @@ -0,0 +1,103 @@ +import re +from urllib.request import Request, urlopen + + +def list_files_http(url): + try: + req = Request(url, method="GET") + with urlopen(req) as response: + if response.status != 200: + return [] + html = response.read().decode() + except Exception: + return [] + + links = [] + for href in re.findall(r'<a href="([^"]+)"', html): + if href == "../": + continue + + links.append(href) + + return links + + +TOR_BROWSER_BUILD_ARTIFACTS = [ + # Tor Browser Build-only artifacts, these artifacts are not common with Firefox. + "noscript", + "fonts", +] + +# Mapping of artifacts from taskcluster to tor-browser-build. +ARTIFACT_NAME_MAP = { + "cbindgen": "cbindgen", + # FIXME (tor-browser-build#41471): nasm is more or less ready to go, but it needs to have the + # executable in the root of the artifact folder instead of nasm/bin. + # "nasm": "nasm", + # FIXME (tor-browser-build#41421): the clang project as is, is not ready to use. It needs + # to be repackaged with a bunch of things that differ per platform. Fun stuff. + # "clang": "clang", + "node": "node", +} + + +def get_artifact_name(original_artifact_name, host): + # These are not build artifacts, they are pre-built artifacts to be added to the final build, + # therefore this check can come before the host check. + if original_artifact_name in TOR_BROWSER_BUILD_ARTIFACTS: + return original_artifact_name + + if host != "linux64": + # Tor browser build only has development artifacts for linux64 host systems. + return None + + return ARTIFACT_NAME_MAP.get(original_artifact_name) + + +def get_artifact_path(url, artifact, target, prefix="", log=lambda *args, **kwargs: {}): + if prefix: + path = prefix + else: + path = artifact + + # The `?C=M;O=D` parameters make it so links are ordered by + # the last modified date. This here to make us get the latest + # version of file in the case there are multiple and we just + # grab the first one. + files = list_files_http(f"{url}/{path}?C=M;O=D") + + if not files: + log(f"No files found in {url} for {artifact}.") + return None + + def filter_files(files, keyword): + return [file for file in files if keyword in file] + + artifact_files = [file for file in files if file.startswith(artifact)] + + if len(artifact_files) == 0: + log(f"No files found in {url} for {artifact}.") + return None + + if len(artifact_files) == 1: + return f"{url}/{path}/{artifact_files[0]}" + + files_per_os = filter_files(artifact_files, target.tor_browser_build_alias) + + # If there are files in the folder, but they don't have the OS in the name + # it probably means we can get any of them because they can be used to build + # for any OS. So let's just get the first one. + # + # Note: It could be the case that the artifact _is_ OS dependant, but there + # just are no files for the OS we are looking for. In that case, this will + # return an incorrect artifact. This should not happen often though and is + # something we cannot address until artifact names are standardized on tbb. + if len(files_per_os) == 0: + return f"{url}/{artifact}/{artifact_files[0]}" + + elif len(files_per_os) == 1: + return f"{url}/{artifact}/{files_per_os[0]}" + + matches = filter_files(files_per_os, target.cpu) + + return f"{url}/{artifact}/{matches[0]}" if matches else None ===================================== python/mozbuild/mozbuild/test/python.toml ===================================== @@ -111,6 +111,9 @@ subsuite = "mozbuild" ["test_rewrite_mozbuild.py"] +["test_tbbutils.py"] +subsuite = "base-browser" + ["test_telemetry.py"] ["test_telemetry_settings.py"] ===================================== python/mozbuild/mozbuild/test/test_tbbutils.py ===================================== @@ -0,0 +1,139 @@ +import unittest +from types import SimpleNamespace +from unittest.mock import MagicMock, patch + +import mozunit + +from mozbuild.tbbutils import get_artifact_path, list_files_http + + +class TestGetArtifactName(unittest.TestCase): + def setUp(self): + self.artifact = "artifact" + self.host = "linux64" + + @patch("mozbuild.tbbutils.TOR_BROWSER_BUILD_ARTIFACTS", new=["artifact"]) + def test_artifact_in_tbb_artifacts(self): + from mozbuild.tbbutils import get_artifact_name + + result = get_artifact_name(self.artifact, self.host) + self.assertEqual(result, self.artifact) + + @patch("mozbuild.tbbutils.ARTIFACT_NAME_MAP", new={"artifact": "tcafitra"}) + def test_host_is_not_linux64(self): + from mozbuild.tbbutils import get_artifact_name + + result = get_artifact_name(self.artifact, "linux64-aarch64") + self.assertIsNone(result) + + @patch("mozbuild.tbbutils.ARTIFACT_NAME_MAP", new={"artifact": "tcafitra"}) + def test_mapped_artifact(self): + from mozbuild.tbbutils import get_artifact_name + + result = get_artifact_name(self.artifact, self.host) + self.assertEqual(result, self.artifact[::-1]) + + +class TestGetArtifactPath(unittest.TestCase): + def setUp(self): + self.url = "http://example.com" + self.artifact = "artifact" + # This is just an example target which is valid. But it doesn't make + # any difference and could be anything for these tests. + self.target = SimpleNamespace(tor_browser_build_alias="linux", cpu="x86_64") + + @patch("mozbuild.tbbutils.list_files_http") + def test_no_files_returns_none(self, mock_list_files): + mock_list_files.return_value = [] + result = get_artifact_path(self.url, self.artifact, self.target) + self.assertIsNone(result) + + @patch("mozbuild.tbbutils.list_files_http") + def test_no_matching_files_returns_none(self, mock_list_files): + mock_list_files.return_value = ["somethingelse.zip", "yetanotherthing.zip"] + result = get_artifact_path(self.url, self.artifact, self.target) + self.assertIsNone(result) + + @patch("mozbuild.tbbutils.list_files_http") + def test_single_artifact_match(self, mock_list_files): + mock_list_files.return_value = ["artifact-1.zip"] + result = get_artifact_path(self.url, self.artifact, self.target) + self.assertEqual(result, f"{self.url}/{self.artifact}/artifact-1.zip") + + @patch("mozbuild.tbbutils.list_files_http") + def test_artifact_without_os_returns_first(self, mock_list_files): + mock_list_files.return_value = ["artifact-1.zip", "artifact-2.zip"] + result = get_artifact_path(self.url, self.artifact, self.target) + self.assertTrue(result.startswith(f"{self.url}/{self.artifact}/")) + self.assertIn("artifact-", result) + + @patch("mozbuild.tbbutils.list_files_http") + def test_artifact_with_os_match(self, mock_list_files): + mock_list_files.return_value = [ + "artifact-windows.zip", + "artifact-linux.zip", + ] + result = get_artifact_path(self.url, self.artifact, self.target) + self.assertEqual(result, f"{self.url}/{self.artifact}/artifact-linux.zip") + + @patch("mozbuild.tbbutils.list_files_http") + def test_artifact_with_cpu_match(self, mock_list_files): + mock_list_files.return_value = [ + "artifact-linux-arm.zip", + "artifact-linux-x86_64.zip", + ] + result = get_artifact_path(self.url, self.artifact, self.target) + self.assertEqual( + result, f"{self.url}/{self.artifact}/artifact-linux-x86_64.zip" + ) + + @patch("mozbuild.tbbutils.list_files_http") + def test_artifact_with_prefix(self, mock_list_files): + mock_list_files.return_value = ["artifact-1.zip"] + + prefix = "prefix" + result = get_artifact_path(self.url, self.artifact, self.target, prefix=prefix) + self.assertEqual(result, f"{self.url}/{prefix}/artifact-1.zip") + mock_list_files.assert_called_with(f"{self.url}/{prefix}?C=M;O=D") + + +class TestListFilesHttp(unittest.TestCase): + def setUp(self): + self.url = "http://example.com" + + @patch("mozbuild.tbbutils.urlopen") + def test_non_200_status_returns_empty(self, mock_urlopen): + mock_resp = MagicMock() + mock_resp.status = 404 + mock_resp.read.return_value = b"" + mock_urlopen.return_value.__enter__.return_value = mock_resp + + result = list_files_http(self.url) + self.assertEqual(result, []) + + @patch("mozbuild.tbbutils.urlopen") + def test_exception_returns_empty(self, mock_urlopen): + mock_urlopen.side_effect = Exception("network error") + result = list_files_http(self.url) + self.assertEqual(result, []) + + @patch("mozbuild.tbbutils.urlopen") + def test_regular_links(self, mock_urlopen): + html = b""" + <html><body> + <a href="../">Parent</a> + <a href="file1.zip">file1</a> + <a href="file2.zip">file2</a> + </body></html> + """ + mock_resp = MagicMock() + mock_resp.status = 200 + mock_resp.read.return_value = html + mock_urlopen.return_value.__enter__.return_value = mock_resp + + result = list_files_http(self.url) + self.assertEqual(result, ["file1.zip", "file2.zip"]) + + +if __name__ == "__main__": + mozunit.main() ===================================== tools/base-browser/l10n/combine/tests/README deleted ===================================== @@ -1,2 +0,0 @@ -python tests to be run with pytest. -Requires the compare-locales package. ===================================== tools/base-browser/git-rebase-fixup-preprocessor → tools/base_browser/git-rebase-fixup-preprocessor ===================================== ===================================== tools/base-browser/l10n/combine-translation-versions.py → tools/base_browser/l10n/combine-translation-versions.py ===================================== ===================================== tools/base-browser/l10n/combine/__init__.py → tools/base_browser/l10n/combine/__init__.py ===================================== ===================================== tools/base-browser/l10n/combine/combine.py → tools/base_browser/l10n/combine/combine.py ===================================== ===================================== tools/base-browser/l10n/combine/tests/__init__.py → tools/base_browser/l10n/combine/tests/__init__.py ===================================== ===================================== tools/base_browser/l10n/combine/tests/python.toml ===================================== @@ -0,0 +1,10 @@ +[DEFAULT] +subsuite = "base-browser" + +["test_android.py"] + +["test_dtd.py"] + +["test_fluent.py"] + +["test_properties.py"] ===================================== tools/base-browser/l10n/combine/tests/test_android.py → tools/base_browser/l10n/combine/tests/test_android.py ===================================== @@ -1,6 +1,7 @@ import textwrap -from combine import combine_files +import mozunit +from base_browser.l10n.combine import combine_files def wrap_in_xml(content): @@ -413,3 +414,7 @@ def test_alternatives(): <string name="string_4_alt">Other string</string> """, ) + + +if __name__ == "__main__": + mozunit.main() ===================================== tools/base-browser/l10n/combine/tests/test_dtd.py → tools/base_browser/l10n/combine/tests/test_dtd.py ===================================== @@ -1,6 +1,7 @@ import textwrap -from combine import combine_files +import mozunit +from base_browser.l10n.combine import combine_files def assert_result(new_content, old_content, expect): @@ -411,3 +412,7 @@ def test_alternatives(): <!ENTITY string.4.alt "Other string"> """, ) + + +if __name__ == "__main__": + mozunit.main() ===================================== tools/base-browser/l10n/combine/tests/test_fluent.py → tools/base_browser/l10n/combine/tests/test_fluent.py ===================================== @@ -1,6 +1,7 @@ import textwrap -from combine import combine_files +import mozunit +from base_browser.l10n.combine import combine_files def assert_result(new_content, old_content, expect): @@ -475,3 +476,7 @@ def test_alternatives(): -string-4-alt = Other string """, ) + + +if __name__ == "__main__": + mozunit.main() ===================================== tools/base-browser/l10n/combine/tests/test_properties.py → tools/base_browser/l10n/combine/tests/test_properties.py ===================================== @@ -1,6 +1,7 @@ import textwrap -from combine import combine_files +import mozunit +from base_browser.l10n.combine import combine_files def assert_result(new_content, old_content, expect): @@ -408,3 +409,7 @@ def test_alternatives(): string.4.alt = Other string """, ) + + +if __name__ == "__main__": + mozunit.main() ===================================== tools/base-browser/missing-css-variables.py → tools/base_browser/missing-css-variables.py ===================================== ===================================== tools/base-browser/tb-dev → tools/base_browser/tb-dev ===================================== ===================================== tools/moz.build ===================================== @@ -71,6 +71,7 @@ with Files("tryselect/docs/**"): SCHEDULES.exclusive = ["docs"] PYTHON_UNITTEST_MANIFESTS += [ + "base_browser/l10n/combine/tests/python.toml", "fuzzing/smoke/python.toml", "lint/test/python.toml", "tryselect/test/python.toml", View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/53201c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/53201c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.2.0esr-15.0-1] fixup! BB 43564: Modify ./mach bootstrap for Base Browser
by brizental (＠brizental) 08 Sep '25

08 Sep '25

brizental pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: e3afce24 by Beatriz Rizental at 2025-09-08T18:43:45+02:00 fixup! BB 43564: Modify ./mach bootstrap for Base Browser - - - - - 3 changed files: - build/moz.configure/bootstrap.configure - python/mozbuild/mozbuild/tbbutils.py - python/mozbuild/mozbuild/test/test_tbbutils.py Changes: ===================================== build/moz.configure/bootstrap.configure ===================================== @@ -211,7 +211,11 @@ def bootstrap_path(path, **kwargs): return False artifact_path = mozbuild.tbbutils.get_artifact_path( - tor_browser_build_out, artifact, target, prefix=path_prefix + tor_browser_build_out, + artifact, + target, + prefix=path_prefix, + log=log.warning, ) if not artifact_path: log.info("no path found in tbb/out for %s", artifact) ===================================== python/mozbuild/mozbuild/tbbutils.py ===================================== @@ -58,7 +58,7 @@ def get_artifact_name(original_artifact_name, host): return ARTIFACT_NAME_MAP.get(original_artifact_name) -def get_artifact_path(url, artifact, target, prefix=""): +def get_artifact_path(url, artifact, target, prefix="", log=lambda *args, **kwargs: {}): if prefix: path = prefix else: @@ -71,6 +71,7 @@ def get_artifact_path(url, artifact, target, prefix=""): files = list_files_http(f"{url}/{path}?C=M;O=D") if not files: + log(f"No files found in {url} for {artifact}.") return None def filter_files(files, keyword): @@ -78,6 +79,10 @@ def get_artifact_path(url, artifact, target, prefix=""): artifact_files = [file for file in files if file.startswith(artifact)] + if len(artifact_files) == 0: + log(f"No files found in {url} for {artifact}.") + return None + if len(artifact_files) == 1: return f"{url}/{path}/{artifact_files[0]}" ===================================== python/mozbuild/mozbuild/test/test_tbbutils.py ===================================== @@ -48,6 +48,12 @@ class TestGetArtifactPath(unittest.TestCase): result = get_artifact_path(self.url, self.artifact, self.target) self.assertIsNone(result) + @patch("mozbuild.tbbutils.list_files_http") + def test_no_matching_files_returns_none(self, mock_list_files): + mock_list_files.return_value = ["somethingelse.zip", "yetanotherthing.zip"] + result = get_artifact_path(self.url, self.artifact, self.target) + self.assertIsNone(result) + @patch("mozbuild.tbbutils.list_files_http") def test_single_artifact_match(self, mock_list_files): mock_list_files.return_value = ["artifact-1.zip"] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e3afce2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e3afce2… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-140.2.0esr-15.0-1] fixup! MB 419: Mullvad Browser migration procedures.
by Pier Angelo Vendrame (＠pierov) 08 Sep '25

08 Sep '25

Pier Angelo Vendrame pushed to branch mullvad-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Mullvad Browser Commits: a5709ed4 by Pier Angelo Vendrame at 2025-09-08T16:07:32+02:00 fixup! MB 419: Mullvad Browser migration procedures. BB 43770: Follow upstream's BrowserGlue simplifications. - - - - - 2 changed files: - browser/components/BrowserGlue.sys.mjs - browser/components/ProfileDataUpgrader.sys.mjs Changes: ===================================== browser/components/BrowserGlue.sys.mjs ===================================== @@ -430,9 +430,7 @@ BrowserGlue.prototype = { // handle any UI migration this._migrateUI(); lazy.ProfileDataUpgrader.upgradeBB(this._isNewProfile); - - // Mullvad Browser-specific version of _migrateUI. - this._migrateUIMB(); + lazy.ProfileDataUpgrader.upgradeMB(this._isNewProfile); if (!Services.prefs.prefHasUserValue(PREF_PDFJS_ISDEFAULT_CACHE_STATE)) { lazy.PdfJs.checkIsDefault(this._isNewProfile); @@ -1654,58 +1652,6 @@ BrowserGlue.prototype = { } }, - // Use this method for any MB migration that can be run just before showing - // the UI. - // Anything that critically needs to be migrated earlier should not use this. - async _migrateUIMB() { - // Version 1: Mullvad Browser 14.5a6: Clear home page update url preference - // (mullvad-browser#411). - // Version 2: Mullvad Browser 15.0a2: Remove legacy search addons - // (tor-browser#43111). - const MB_MIGRATION_VERSION = 2; - const MIGRATION_PREF = "mullvadbrowser.migration.version"; - - // If we decide to force updating users to pass through any version - // following 14.5, we can remove this check, and check only whether - // MIGRATION_PREF has a user value, like Mozilla does. - if (this._isNewProfile) { - // Do not migrate fresh profiles - Services.prefs.setIntPref(MIGRATION_PREF, MB_MIGRATION_VERSION); - return; - } else if (this._isNewProfile === undefined) { - // If this happens, check if upstream updated their function and do not - // set this member anymore! - console.error("_migrateUIMB: this._isNewProfile is undefined."); - } - - const currentVersion = Services.prefs.getIntPref(MIGRATION_PREF, 0); - - if (currentVersion < 1) { - Services.prefs.clearUserPref("mullvadbrowser.post_update.url"); - } - const dropAddons = async list => { - for (const id of list) { - try { - const engine = await lazy.AddonManager.getAddonByID(id); - await engine?.uninstall(); - } catch {} - } - }; - if (currentVersion < 2) { - await dropAddons([ - "brave(a)search.mozilla.org", - "ddg(a)search.mozilla.org", - "ddg-html(a)search.mozilla.org", - "metager(a)search.mozilla.org", - "mojeek(a)search.mozilla.org", - "mullvad-leta(a)search.mozilla.org", - "startpage(a)search.mozilla.org", - ]); - } - - Services.prefs.setIntPref(MIGRATION_PREF, MB_MIGRATION_VERSION); - }, - async _showUpgradeDialog() { const data = await lazy.OnboardingMessageProvider.getUpgradeMessage(); const { gBrowser } = lazy.BrowserWindowTracker.getTopWindow(); ===================================== browser/components/ProfileDataUpgrader.sys.mjs ===================================== @@ -974,4 +974,50 @@ export let ProfileDataUpgrader = { } Services.prefs.setIntPref(MIGRATION_PREF, MIGRATION_VERSION); }, + + async upgradeMB(isNewProfile) { + // Version 1: Mullvad Browser 14.5a6: Clear home page update url preference + // (mullvad-browser#411). + // Version 2: Mullvad Browser 15.0a2: Remove legacy search addons + // (tor-browser#43111). + const MB_MIGRATION_VERSION = 2; + const MIGRATION_PREF = "mullvadbrowser.migration.version"; + + if (isNewProfile) { + // Do not migrate fresh profiles + Services.prefs.setIntPref(MIGRATION_PREF, MB_MIGRATION_VERSION); + return; + } else if (isNewProfile === undefined) { + // If this happens, check if upstream updated their function and do not + // set this member anymore! + console.error("upgradeTB: isNewProfile is undefined."); + } + + const currentVersion = Services.prefs.getIntPref(MIGRATION_PREF, 0); + + if (currentVersion < 1) { + Services.prefs.clearUserPref("mullvadbrowser.post_update.url"); + } + const dropAddons = async list => { + for (const id of list) { + try { + const engine = await lazy.AddonManager.getAddonByID(id); + await engine?.uninstall(); + } catch {} + } + }; + if (currentVersion < 2) { + await dropAddons([ + "brave(a)search.mozilla.org", + "ddg(a)search.mozilla.org", + "ddg-html(a)search.mozilla.org", + "metager(a)search.mozilla.org", + "mojeek(a)search.mozilla.org", + "mullvad-leta(a)search.mozilla.org", + "startpage(a)search.mozilla.org", + ]); + } + + Services.prefs.setIntPref(MIGRATION_PREF, MB_MIGRATION_VERSION); + }, }; View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/a57… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/a57… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.2.0esr-15.0-1] fixup! TB 43006: Disable RFP for Font Visibility on Android
by morgan (＠morgan) 08 Sep '25

08 Sep '25

morgan pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: dc42afa4 by Pier Angelo Vendrame at 2025-09-08T13:51:04+00:00 fixup! TB 43006: Disable RFP for Font Visibility on Android TB 43943: Refactor fontvis exclusion on Android. Rather than updating Document, we can use nsRFPService::HandleExeptionalRFPTargets. - - - - - 2 changed files: - dom/base/Document.cpp - toolkit/components/resistfingerprinting/nsRFPService.cpp Changes: ===================================== dom/base/Document.cpp ===================================== @@ -17308,12 +17308,6 @@ bool Document::RecomputeResistFingerprinting(bool aForceRefreshRTPCallerType) { } bool Document::ShouldResistFingerprinting(RFPTarget aTarget) const { -#ifdef ANDROID - if (aTarget == RFPTarget::FontVisibilityBaseSystem || - aTarget == RFPTarget::FontVisibilityLangPack) { - return false; - } -#endif return mShouldResistFingerprinting && nsRFPService::IsRFPEnabledFor(this->IsInPrivateBrowsing(), aTarget, mOverriddenFingerprintingSettings); ===================================== toolkit/components/resistfingerprinting/nsRFPService.cpp ===================================== @@ -310,6 +310,13 @@ Maybe<bool> nsRFPService::HandleExeptionalRFPTargets( } #endif +#ifdef ANDROID + if (aTarget == RFPTarget::FontVisibilityBaseSystem || + aTarget == RFPTarget::FontVisibilityLangPack) { + return Some(false); + } +#endif + return Nothing(); } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/dc42afa… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/dc42afa… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-140.2.0esr-15.0-1] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 08 Sep '25

08 Sep '25

Pier Angelo Vendrame pushed to branch mullvad-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Mullvad Browser Commits: c735c7ed by Pier Angelo Vendrame at 2025-09-08T15:51:22+02:00 fixup! Firefox preference overrides. BB 43950: Disable HEVC. HEVC support can be used for fingerprinting, as it's hardware-dependent on some systems, or depends on distribution support/installed packages for Linux. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -483,6 +483,9 @@ pref("gfx.offscreencanvas.enabled", false); pref("dom.disable_window_move_resize", true); // Set video VP9 to 0 for everyone (bug 22548) pref("media.benchmark.vp9.threshold", 0); +// tor-browser#43950: Disable HEVC, as it will reveal lacking hardware support, +// or differences in installed codec for Linux systems. +pref("media.hevc.enabled", false); pref("privacy.resistFingerprinting.block_mozAddonManager", true); // Bug 26114 pref("dom.webmidi.enabled", false); // Bug 41398: Disable Web MIDI API // tor-browser#42043: Stop reporting device IDs (and spoof their number without View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/c73… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/c73… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-140.2.0esr-15.0-1] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 08 Sep '25

08 Sep '25

Pier Angelo Vendrame pushed to branch base-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 53201cbe by Pier Angelo Vendrame at 2025-09-08T15:49:55+02:00 fixup! Firefox preference overrides. BB 43950: Disable HEVC. HEVC support can be used for fingerprinting, as it's hardware-dependent on some systems, or depends on distribution support/installed packages for Linux. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -483,6 +483,9 @@ pref("gfx.offscreencanvas.enabled", false); pref("dom.disable_window_move_resize", true); // Set video VP9 to 0 for everyone (bug 22548) pref("media.benchmark.vp9.threshold", 0); +// tor-browser#43950: Disable HEVC, as it will reveal lacking hardware support, +// or differences in installed codec for Linux systems. +pref("media.hevc.enabled", false); pref("privacy.resistFingerprinting.block_mozAddonManager", true); // Bug 26114 pref("dom.webmidi.enabled", false); // Bug 41398: Disable Web MIDI API // tor-browser#42043: Stop reporting device IDs (and spoof their number without View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/53201cb… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/53201cb… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.2.0esr-15.0-1] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 08 Sep '25

08 Sep '25

Pier Angelo Vendrame pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: c02477fa by Pier Angelo Vendrame at 2025-09-08T13:44:13+00:00 fixup! Firefox preference overrides. BB 43950: Disable HEVC. HEVC support can be used for fingerprinting, as it's hardware-dependent on some systems, or depends on distribution support/installed packages for Linux. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -483,6 +483,9 @@ pref("gfx.offscreencanvas.enabled", false); pref("dom.disable_window_move_resize", true); // Set video VP9 to 0 for everyone (bug 22548) pref("media.benchmark.vp9.threshold", 0); +// tor-browser#43950: Disable HEVC, as it will reveal lacking hardware support, +// or differences in installed codec for Linux systems. +pref("media.hevc.enabled", false); pref("privacy.resistFingerprinting.block_mozAddonManager", true); // Bug 26114 pref("dom.webmidi.enabled", false); // Bug 41398: Disable Web MIDI API // tor-browser#42043: Stop reporting device IDs (and spoof their number without View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c02477f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c02477f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-140.2.0esr-15.0-1] 3 commits: fixup! BB 42019: Empty browser's clipboard on browser shutdown
by Pier Angelo Vendrame (＠pierov) 08 Sep '25

08 Sep '25

Pier Angelo Vendrame pushed to branch mullvad-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 4c83f2db by Pier Angelo Vendrame at 2025-09-08T12:32:21+02:00 fixup! BB 42019: Empty browser's clipboard on browser shutdown BB 43770: Follow upstream's BrowserGlue simplifications. ClipboardPrivacy to its own file and initialize it from the manifest, rather than from BrowserGlue. - - - - - 4b7d805c by Pier Angelo Vendrame at 2025-09-08T12:32:32+02:00 fixup! BB 40925: Implemented the Security Level component BB 43770: Follow upstream's BrowserGlue simplifications. Initialize the security level notification from the manifest. Also, since it was the only occurrence of the file path, move it to the moz-src:// scheme. - - - - - 7a6cc7a1 by Pier Angelo Vendrame at 2025-09-08T12:35:10+02:00 fixup! BB 42027: Base Browser migration procedures. BB 43770: Follow upstream's BrowserGlue simplifications. - - - - - 5 changed files: - browser/components/BrowserComponents.manifest - browser/components/BrowserGlue.sys.mjs - browser/components/ProfileDataUpgrader.sys.mjs - + browser/modules/ClipboardPrivacy.sys.mjs - browser/modules/moz.build Changes: ===================================== browser/components/BrowserComponents.manifest ===================================== @@ -50,6 +50,8 @@ category browser-first-window-ready resource://gre/modules/CaptchaDetectionPingU category browser-first-window-ready resource://gre/modules/SandboxUtils.sys.mjs SandboxUtils.maybeWarnAboutMissingUserNamespaces #endif #endif +category browser-first-window-ready moz-src:///browser/modules/ClipboardPrivacy.sys.mjs ClipboardPrivacy.init +category browser-first-window-ready moz-src:///browser/modules/SecurityLevelRestartNotification.sys.mjs SecurityLevelRestartNotification.ready category browser-idle-startup resource:///modules/PlacesUIUtils.sys.mjs PlacesUIUtils.unblockToolbars category browser-idle-startup resource:///modules/BuiltInThemes.sys.mjs BuiltInThemes.ensureBuiltInThemes ===================================== browser/components/BrowserGlue.sys.mjs ===================================== @@ -12,7 +12,6 @@ ChromeUtils.defineESModuleGetters(lazy, { AWToolbarButton: "resource:///modules/aboutwelcome/AWToolbarUtils.sys.mjs", ASRouter: "resource:///modules/asrouter/ASRouter.sys.mjs", AddonManager: "resource://gre/modules/AddonManager.sys.mjs", - AsyncShutdown: "resource://gre/modules/AsyncShutdown.sys.mjs", BackupService: "resource:///modules/backup/BackupService.sys.mjs", BrowserSearchTelemetry: "moz-src:///browser/components/search/BrowserSearchTelemetry.sys.mjs", @@ -61,8 +60,6 @@ ChromeUtils.defineESModuleGetters(lazy, { ScreenshotsUtils: "resource:///modules/ScreenshotsUtils.sys.mjs", SearchSERPTelemetry: "moz-src:///browser/components/search/SearchSERPTelemetry.sys.mjs", - SecurityLevelRestartNotification: - "resource:///modules/SecurityLevelRestartNotification.sys.mjs", SessionStartup: "resource:///modules/sessionstore/SessionStartup.sys.mjs", SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs", ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs", @@ -106,170 +103,6 @@ if (AppConstants.ENABLE_WEBDRIVER) { const PREF_PDFJS_ISDEFAULT_CACHE_STATE = "pdfjs.enabledCache.state"; -// Empty clipboard content from private windows on exit -// (tor-browser#42154) -const ClipboardPrivacy = { - _lastClipboardHash: null, - _globalActivation: false, - _isPrivateClipboard: false, - _hasher: null, - _shuttingDown: false, - _log: null, - - _createTransferable() { - const trans = Cc["@mozilla.org/widget/transferable;1"].createInstance( - Ci.nsITransferable - ); - trans.init(null); - return trans; - }, - _computeClipboardHash() { - const flavors = ["text/x-moz-url", "text/plain"]; - if ( - !Services.clipboard.hasDataMatchingFlavors( - flavors, - Ci.nsIClipboard.kGlobalClipboard - ) - ) { - return null; - } - const trans = this._createTransferable(); - flavors.forEach(trans.addDataFlavor); - try { - Services.clipboard.getData(trans, Ci.nsIClipboard.kGlobalClipboard); - const clipboardContent = {}; - trans.getAnyTransferData({}, clipboardContent); - const { data } = clipboardContent.value.QueryInterface( - Ci.nsISupportsString - ); - const bytes = new TextEncoder().encode(data); - const hasher = (this._hasher ||= Cc[ - "@mozilla.org/security/hash;1" - ].createInstance(Ci.nsICryptoHash)); - hasher.init(hasher.SHA256); - hasher.update(bytes, bytes.length); - return hasher.finish(true); - } catch (e) {} - return null; - }, - - startup() { - this._log = console.createInstance({ - prefix: "ClipboardPrivacy", - }); - this._lastClipboardHash = this._computeClipboardHash(); - - // Here we track changes in active window / application, - // by filtering focus events and window closures. - const handleActivation = (win, activation) => { - if (activation) { - if (!this._globalActivation) { - // focus changed within this window, bail out. - return; - } - this._globalActivation = false; - } else if (!Services.focus.activeWindow) { - // focus is leaving this window: - // let's track whether it remains within the browser. - lazy.setTimeout(() => { - this._globalActivation = !Services.focus.activeWindow; - }, 100); - } - - const checkClipboardContent = () => { - const clipboardHash = this._computeClipboardHash(); - if (clipboardHash !== this._lastClipboardHash) { - this._isPrivateClipboard = - !activation && - (lazy.PrivateBrowsingUtils.permanentPrivateBrowsing || - lazy.PrivateBrowsingUtils.isWindowPrivate(win)); - this._lastClipboardHash = clipboardHash; - this._log.debug( - `Clipboard changed: private ${this._isPrivateClipboard}, hash ${clipboardHash}.` - ); - } - }; - - if (win.closed) { - checkClipboardContent(); - } else { - // defer clipboard access on DOM events to work-around tor-browser#42306 - lazy.setTimeout(checkClipboardContent, 0); - } - }; - const focusListener = e => - e.isTrusted && handleActivation(e.currentTarget, e.type === "focusin"); - const initWindow = win => { - for (const e of ["focusin", "focusout"]) { - win.addEventListener(e, focusListener); - } - }; - for (const w of Services.ww.getWindowEnumerator()) { - initWindow(w); - } - Services.ww.registerNotification((win, event) => { - switch (event) { - case "domwindowopened": - initWindow(win); - break; - case "domwindowclosed": - handleActivation(win, false); - if ( - this._isPrivateClipboard && - lazy.PrivateBrowsingUtils.isWindowPrivate(win) && - (this._shuttingDown || - !Array.from(Services.ww.getWindowEnumerator()).find( - w => - lazy.PrivateBrowsingUtils.isWindowPrivate(w) && - // We need to filter out the HIDDEN WebExtensions window, - // which might be private as well but is not UI-relevant. - !w.location.href.startsWith("chrome://extensions/") - )) - ) { - // no more private windows, empty private content if needed - this.emptyPrivate(); - } - } - }); - - lazy.AsyncShutdown.quitApplicationGranted.addBlocker( - "ClipboardPrivacy: removing private data", - () => { - this._shuttingDown = true; - this.emptyPrivate(); - } - ); - }, - emptyPrivate() { - if ( - this._isPrivateClipboard && - !Services.prefs.getBoolPref( - "browser.privatebrowsing.preserveClipboard", - false - ) && - this._lastClipboardHash === this._computeClipboardHash() - ) { - // nsIClipboard.emptyClipboard() does nothing in Wayland: - // we'll set an empty string as a work-around. - const trans = this._createTransferable(); - const flavor = "text/plain"; - trans.addDataFlavor(flavor); - const emptyString = Cc["@mozilla.org/supports-string;1"].createInstance( - Ci.nsISupportsString - ); - emptyString.data = ""; - trans.setTransferData(flavor, emptyString); - const { clipboard } = Services, - { kGlobalClipboard } = clipboard; - clipboard.setData(trans, null, kGlobalClipboard); - clipboard.emptyClipboard(kGlobalClipboard); - this._lastClipboardHash = null; - this._isPrivateClipboard = false; - this._log.info("Private clipboard emptied."); - } - }, -}; - ChromeUtils.defineLazyGetter( lazy, "WeaveService", @@ -596,9 +429,7 @@ BrowserGlue.prototype = { // handle any UI migration this._migrateUI(); - - // Base Browser-specific version of _migrateUI. - this._migrateUIBB(); + lazy.ProfileDataUpgrader.upgradeBB(this._isNewProfile); // Mullvad Browser-specific version of _migrateUI. this._migrateUIMB(); @@ -987,10 +818,6 @@ BrowserGlue.prototype = { lazy.WeaveService.init(); } - lazy.SecurityLevelRestartNotification.ready(); - - ClipboardPrivacy.startup(); - lazy.BrowserUtils.callModulesFromCategory( { categoryName: "browser-first-window-ready", @@ -1827,83 +1654,6 @@ BrowserGlue.prototype = { } }, - _migrateUIBB() { - // Version 1: 13.0a3. Reset layout.css.prefers-color-scheme.content-override - // for tor-browser#41739. - // Version 2: 14.0a5: Reset the privacy tracking headers preferences since - // the UI is hidden. tor-browser#42777. - // Also, do not set - // dom.security.https_only_mode_send_http_background_request in - // the security level anymore (tor-browser#42149). - // Also, reset security.xfocsp.errorReporting.automatic since we - // hid its neterror checkbox. tor-browser#42653. - // Version 3: 14.0a7: Reset general.smoothScroll. tor-browser#42070. - // Version 4: 15.0a2: Drop ML components. tor-browser#44045. - const MIGRATION_VERSION = 4; - const MIGRATION_PREF = "basebrowser.migration.version"; - if (this._isNewProfile) { - // Do not migrate fresh profiles - Services.prefs.setIntPref(MIGRATION_PREF, MIGRATION_VERSION); - return; - } else if (this._isNewProfile === undefined) { - // If this happens, check if upstream updated their function and do not - // set this member anymore! - console.error("_migrateUIBB: this._isNewProfile is undefined."); - } - // We do not care whether this is a new or old profile, since in version 1 - // we just quickly clear a user preference, which should not do anything to - // new profiles. - // Shall we ever raise the version number and have a watershed, we can add - // a check easily (any version > 0 will be an old profile). - const currentVersion = Services.prefs.getIntPref(MIGRATION_PREF, 0); - if (currentVersion < 1) { - Services.prefs.clearUserPref( - "layout.css.prefers-color-scheme.content-override" - ); - } - if (currentVersion < 2) { - for (const prefName of [ - "privacy.globalprivacycontrol.enabled", - "privacy.donottrackheader.enabled", - // Telemetry preference for if the user changed the value. - "privacy.globalprivacycontrol.was_ever_enabled", - // The next two preferences have no corresponding UI, but are related. - "privacy.globalprivacycontrol.functionality.enabled", - "privacy.globalprivacycontrol.pbmode.enabled", - "dom.security.https_only_mode_send_http_background_request", - "security.xfocsp.errorReporting.automatic", - ]) { - Services.prefs.clearUserPref(prefName); - } - } - if (currentVersion < 3) { - Services.prefs.clearUserPref("general.smoothScroll"); - } - if (currentVersion < 4) { - for (const prefName of [ - "browser.translations.enable", - "browser.ml.enable", - "browser.ml.chat.enabled", - "browser.ml.linkPreview.enabled", - "browser.tabs.groups.smart.enabled", - "browser.tabs.groups.smart.userEnabled", - "extensions.ml.enabled", - "pdfjs.enableAltText", - "pdfjs.enableAltTextForEnglish", - "pdfjs.enableGuessAltText", - "pdfjs.enableAltTextModelDownload", - "browser.urlbar.quicksuggest.mlEnabled", - "places.semanticHistory.featureGate", - ]) { - // Preferences are locked. Do not want user values to linger in the - // user's profile and become active if these preferences become unlocked - // in the future. - Services.prefs.clearUserPref(prefName); - } - } - Services.prefs.setIntPref(MIGRATION_PREF, MIGRATION_VERSION); - }, - // Use this method for any MB migration that can be run just before showing // the UI. // Anything that critically needs to be migrated earlier should not use this. ===================================== browser/components/ProfileDataUpgrader.sys.mjs ===================================== @@ -900,4 +900,78 @@ export let ProfileDataUpgrader = { // Update the migration version. Services.prefs.setIntPref("browser.migration.version", newVersion); }, + + upgradeBB(isNewProfile) { + // Version 1: 13.0a3. Reset layout.css.prefers-color-scheme.content-override + // for tor-browser#41739. + // Version 2: 14.0a5: Reset the privacy tracking headers preferences since + // the UI is hidden. tor-browser#42777. + // Also, do not set + // dom.security.https_only_mode_send_http_background_request in + // the security level anymore (tor-browser#42149). + // Also, reset security.xfocsp.errorReporting.automatic since we + // hid its neterror checkbox. tor-browser#42653. + // Version 3: 14.0a7: Reset general.smoothScroll. tor-browser#42070. + // Version 4: 15.0a2: Drop ML components. tor-browser#44045. + const MIGRATION_VERSION = 4; + const MIGRATION_PREF = "basebrowser.migration.version"; + + if (isNewProfile) { + // Do not migrate fresh profiles + Services.prefs.setIntPref(MIGRATION_PREF, MIGRATION_VERSION); + return; + } else if (isNewProfile === undefined) { + // If this happens, check if upstream updated their function and do not + // set this member anymore! + console.error("upgradeBB: isNewProfile is undefined."); + } + + const currentVersion = Services.prefs.getIntPref(MIGRATION_PREF, 0); + if (currentVersion < 1) { + Services.prefs.clearUserPref( + "layout.css.prefers-color-scheme.content-override" + ); + } + if (currentVersion < 2) { + for (const prefName of [ + "privacy.globalprivacycontrol.enabled", + "privacy.donottrackheader.enabled", + // Telemetry preference for if the user changed the value. + "privacy.globalprivacycontrol.was_ever_enabled", + // The next two preferences have no corresponding UI, but are related. + "privacy.globalprivacycontrol.functionality.enabled", + "privacy.globalprivacycontrol.pbmode.enabled", + "dom.security.https_only_mode_send_http_background_request", + "security.xfocsp.errorReporting.automatic", + ]) { + Services.prefs.clearUserPref(prefName); + } + } + if (currentVersion < 3) { + Services.prefs.clearUserPref("general.smoothScroll"); + } + if (currentVersion < 4) { + for (const prefName of [ + "browser.translations.enable", + "browser.ml.enable", + "browser.ml.chat.enabled", + "browser.ml.linkPreview.enabled", + "browser.tabs.groups.smart.enabled", + "browser.tabs.groups.smart.userEnabled", + "extensions.ml.enabled", + "pdfjs.enableAltText", + "pdfjs.enableAltTextForEnglish", + "pdfjs.enableGuessAltText", + "pdfjs.enableAltTextModelDownload", + "browser.urlbar.quicksuggest.mlEnabled", + "places.semanticHistory.featureGate", + ]) { + // Preferences are locked. Do not want user values to linger in the + // user's profile and become active if these preferences become unlocked + // in the future. + Services.prefs.clearUserPref(prefName); + } + } + Services.prefs.setIntPref(MIGRATION_PREF, MIGRATION_VERSION); + }, }; ===================================== browser/modules/ClipboardPrivacy.sys.mjs ===================================== @@ -0,0 +1,178 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +const lazy = {}; + +ChromeUtils.defineESModuleGetters(lazy, { + AsyncShutdown: "resource://gre/modules/AsyncShutdown.sys.mjs", + PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs", + setTimeout: "resource://gre/modules/Timer.sys.mjs", +}); + +/** + * Empty clipboard content from private windows on exit. + * + * See tor-browser#42154. + */ +export const ClipboardPrivacy = { + _lastClipboardHash: null, + _globalActivation: false, + _isPrivateClipboard: false, + _hasher: null, + _shuttingDown: false, + _log: null, + + _createTransferable() { + const trans = Cc["@mozilla.org/widget/transferable;1"].createInstance( + Ci.nsITransferable + ); + trans.init(null); + return trans; + }, + _computeClipboardHash() { + const flavors = ["text/x-moz-url", "text/plain"]; + if ( + !Services.clipboard.hasDataMatchingFlavors( + flavors, + Ci.nsIClipboard.kGlobalClipboard + ) + ) { + return null; + } + const trans = this._createTransferable(); + flavors.forEach(trans.addDataFlavor); + try { + Services.clipboard.getData(trans, Ci.nsIClipboard.kGlobalClipboard); + const clipboardContent = {}; + trans.getAnyTransferData({}, clipboardContent); + const { data } = clipboardContent.value.QueryInterface( + Ci.nsISupportsString + ); + const bytes = new TextEncoder().encode(data); + const hasher = (this._hasher ||= Cc[ + "@mozilla.org/security/hash;1" + ].createInstance(Ci.nsICryptoHash)); + hasher.init(hasher.SHA256); + hasher.update(bytes, bytes.length); + return hasher.finish(true); + } catch (e) {} + return null; + }, + + init() { + this._log = console.createInstance({ + prefix: "ClipboardPrivacy", + }); + this._lastClipboardHash = this._computeClipboardHash(); + + // Here we track changes in active window / application, + // by filtering focus events and window closures. + const handleActivation = (win, activation) => { + if (activation) { + if (!this._globalActivation) { + // focus changed within this window, bail out. + return; + } + this._globalActivation = false; + } else if (!Services.focus.activeWindow) { + // focus is leaving this window: + // let's track whether it remains within the browser. + lazy.setTimeout(() => { + this._globalActivation = !Services.focus.activeWindow; + }, 100); + } + + const checkClipboardContent = () => { + const clipboardHash = this._computeClipboardHash(); + if (clipboardHash !== this._lastClipboardHash) { + this._isPrivateClipboard = + !activation && + (lazy.PrivateBrowsingUtils.permanentPrivateBrowsing || + lazy.PrivateBrowsingUtils.isWindowPrivate(win)); + this._lastClipboardHash = clipboardHash; + this._log.debug( + `Clipboard changed: private ${this._isPrivateClipboard}, hash ${clipboardHash}.` + ); + } + }; + + if (win.closed) { + checkClipboardContent(); + } else { + // defer clipboard access on DOM events to work-around tor-browser#42306 + lazy.setTimeout(checkClipboardContent, 0); + } + }; + const focusListener = e => + e.isTrusted && handleActivation(e.currentTarget, e.type === "focusin"); + const initWindow = win => { + for (const e of ["focusin", "focusout"]) { + win.addEventListener(e, focusListener); + } + }; + for (const w of Services.ww.getWindowEnumerator()) { + initWindow(w); + } + Services.ww.registerNotification((win, event) => { + switch (event) { + case "domwindowopened": + initWindow(win); + break; + case "domwindowclosed": + handleActivation(win, false); + if ( + this._isPrivateClipboard && + lazy.PrivateBrowsingUtils.isWindowPrivate(win) && + (this._shuttingDown || + !Array.from(Services.ww.getWindowEnumerator()).find( + w => + lazy.PrivateBrowsingUtils.isWindowPrivate(w) && + // We need to filter out the HIDDEN WebExtensions window, + // which might be private as well but is not UI-relevant. + !w.location.href.startsWith("chrome://extensions/") + )) + ) { + // no more private windows, empty private content if needed + this.emptyPrivate(); + } + } + }); + + lazy.AsyncShutdown.quitApplicationGranted.addBlocker( + "ClipboardPrivacy: removing private data", + () => { + this._shuttingDown = true; + this.emptyPrivate(); + } + ); + }, + emptyPrivate() { + if ( + this._isPrivateClipboard && + !Services.prefs.getBoolPref( + "browser.privatebrowsing.preserveClipboard", + false + ) && + this._lastClipboardHash === this._computeClipboardHash() + ) { + // nsIClipboard.emptyClipboard() does nothing in Wayland: + // we'll set an empty string as a work-around. + const trans = this._createTransferable(); + const flavor = "text/plain"; + trans.addDataFlavor(flavor); + const emptyString = Cc["@mozilla.org/supports-string;1"].createInstance( + Ci.nsISupportsString + ); + emptyString.data = ""; + trans.setTransferData(flavor, emptyString); + const { clipboard } = Services, + { kGlobalClipboard } = clipboard; + clipboard.setData(trans, null, kGlobalClipboard); + clipboard.emptyClipboard(kGlobalClipboard); + this._lastClipboardHash = null; + this._isPrivateClipboard = false; + this._log.info("Private clipboard emptied."); + } + }, +}; ===================================== browser/modules/moz.build ===================================== @@ -136,7 +136,6 @@ EXTRA_JS_MODULES += [ "PopupBlockerObserver.sys.mjs", "ProcessHangMonitor.sys.mjs", "Sanitizer.sys.mjs", - "SecurityLevelRestartNotification.sys.mjs", "SelectionChangedMenulist.sys.mjs", "SharingUtils.sys.mjs", "SiteDataManager.sys.mjs", @@ -149,6 +148,8 @@ EXTRA_JS_MODULES += [ MOZ_SRC_FILES += [ "ContextId.sys.mjs", + "ClipboardPrivacy.sys.mjs", + "SecurityLevelRestartNotification.sys.mjs", ] if CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows": View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/b8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/b8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-140.2.0esr-15.0-1] 3 commits: fixup! BB 42019: Empty browser's clipboard on browser shutdown
by Pier Angelo Vendrame (＠pierov) 08 Sep '25

08 Sep '25

Pier Angelo Vendrame pushed to branch base-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 24214f3e by Pier Angelo Vendrame at 2025-09-08T12:12:36+02:00 fixup! BB 42019: Empty browser's clipboard on browser shutdown BB 43770: Follow upstream's BrowserGlue simplifications. ClipboardPrivacy to its own file and initialize it from the manifest, rather than from BrowserGlue. - - - - - 92770da8 by Pier Angelo Vendrame at 2025-09-08T12:16:00+02:00 fixup! BB 40925: Implemented the Security Level component BB 43770: Follow upstream's BrowserGlue simplifications. Initialize the security level notification from the manifest. Also, since it was the only occurrence of the file path, move it to the moz-src:// scheme. - - - - - 88bb3bc2 by Pier Angelo Vendrame at 2025-09-08T12:25:21+02:00 fixup! BB 42027: Base Browser migration procedures. BB 43770: Follow upstream's BrowserGlue simplifications. - - - - - 5 changed files: - browser/components/BrowserComponents.manifest - browser/components/BrowserGlue.sys.mjs - browser/components/ProfileDataUpgrader.sys.mjs - + browser/modules/ClipboardPrivacy.sys.mjs - browser/modules/moz.build Changes: ===================================== browser/components/BrowserComponents.manifest ===================================== @@ -50,6 +50,8 @@ category browser-first-window-ready resource://gre/modules/CaptchaDetectionPingU category browser-first-window-ready resource://gre/modules/SandboxUtils.sys.mjs SandboxUtils.maybeWarnAboutMissingUserNamespaces #endif #endif +category browser-first-window-ready moz-src:///browser/modules/ClipboardPrivacy.sys.mjs ClipboardPrivacy.init +category browser-first-window-ready moz-src:///browser/modules/SecurityLevelRestartNotification.sys.mjs SecurityLevelRestartNotification.ready category browser-idle-startup resource:///modules/PlacesUIUtils.sys.mjs PlacesUIUtils.unblockToolbars category browser-idle-startup resource:///modules/BuiltInThemes.sys.mjs BuiltInThemes.ensureBuiltInThemes ===================================== browser/components/BrowserGlue.sys.mjs ===================================== @@ -12,7 +12,6 @@ ChromeUtils.defineESModuleGetters(lazy, { AWToolbarButton: "resource:///modules/aboutwelcome/AWToolbarUtils.sys.mjs", ASRouter: "resource:///modules/asrouter/ASRouter.sys.mjs", AddonManager: "resource://gre/modules/AddonManager.sys.mjs", - AsyncShutdown: "resource://gre/modules/AsyncShutdown.sys.mjs", BackupService: "resource:///modules/backup/BackupService.sys.mjs", BrowserSearchTelemetry: "moz-src:///browser/components/search/BrowserSearchTelemetry.sys.mjs", @@ -61,8 +60,6 @@ ChromeUtils.defineESModuleGetters(lazy, { ScreenshotsUtils: "resource:///modules/ScreenshotsUtils.sys.mjs", SearchSERPTelemetry: "moz-src:///browser/components/search/SearchSERPTelemetry.sys.mjs", - SecurityLevelRestartNotification: - "resource:///modules/SecurityLevelRestartNotification.sys.mjs", SessionStartup: "resource:///modules/sessionstore/SessionStartup.sys.mjs", SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs", ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs", @@ -106,170 +103,6 @@ if (AppConstants.ENABLE_WEBDRIVER) { const PREF_PDFJS_ISDEFAULT_CACHE_STATE = "pdfjs.enabledCache.state"; -// Empty clipboard content from private windows on exit -// (tor-browser#42154) -const ClipboardPrivacy = { - _lastClipboardHash: null, - _globalActivation: false, - _isPrivateClipboard: false, - _hasher: null, - _shuttingDown: false, - _log: null, - - _createTransferable() { - const trans = Cc["@mozilla.org/widget/transferable;1"].createInstance( - Ci.nsITransferable - ); - trans.init(null); - return trans; - }, - _computeClipboardHash() { - const flavors = ["text/x-moz-url", "text/plain"]; - if ( - !Services.clipboard.hasDataMatchingFlavors( - flavors, - Ci.nsIClipboard.kGlobalClipboard - ) - ) { - return null; - } - const trans = this._createTransferable(); - flavors.forEach(trans.addDataFlavor); - try { - Services.clipboard.getData(trans, Ci.nsIClipboard.kGlobalClipboard); - const clipboardContent = {}; - trans.getAnyTransferData({}, clipboardContent); - const { data } = clipboardContent.value.QueryInterface( - Ci.nsISupportsString - ); - const bytes = new TextEncoder().encode(data); - const hasher = (this._hasher ||= Cc[ - "@mozilla.org/security/hash;1" - ].createInstance(Ci.nsICryptoHash)); - hasher.init(hasher.SHA256); - hasher.update(bytes, bytes.length); - return hasher.finish(true); - } catch (e) {} - return null; - }, - - startup() { - this._log = console.createInstance({ - prefix: "ClipboardPrivacy", - }); - this._lastClipboardHash = this._computeClipboardHash(); - - // Here we track changes in active window / application, - // by filtering focus events and window closures. - const handleActivation = (win, activation) => { - if (activation) { - if (!this._globalActivation) { - // focus changed within this window, bail out. - return; - } - this._globalActivation = false; - } else if (!Services.focus.activeWindow) { - // focus is leaving this window: - // let's track whether it remains within the browser. - lazy.setTimeout(() => { - this._globalActivation = !Services.focus.activeWindow; - }, 100); - } - - const checkClipboardContent = () => { - const clipboardHash = this._computeClipboardHash(); - if (clipboardHash !== this._lastClipboardHash) { - this._isPrivateClipboard = - !activation && - (lazy.PrivateBrowsingUtils.permanentPrivateBrowsing || - lazy.PrivateBrowsingUtils.isWindowPrivate(win)); - this._lastClipboardHash = clipboardHash; - this._log.debug( - `Clipboard changed: private ${this._isPrivateClipboard}, hash ${clipboardHash}.` - ); - } - }; - - if (win.closed) { - checkClipboardContent(); - } else { - // defer clipboard access on DOM events to work-around tor-browser#42306 - lazy.setTimeout(checkClipboardContent, 0); - } - }; - const focusListener = e => - e.isTrusted && handleActivation(e.currentTarget, e.type === "focusin"); - const initWindow = win => { - for (const e of ["focusin", "focusout"]) { - win.addEventListener(e, focusListener); - } - }; - for (const w of Services.ww.getWindowEnumerator()) { - initWindow(w); - } - Services.ww.registerNotification((win, event) => { - switch (event) { - case "domwindowopened": - initWindow(win); - break; - case "domwindowclosed": - handleActivation(win, false); - if ( - this._isPrivateClipboard && - lazy.PrivateBrowsingUtils.isWindowPrivate(win) && - (this._shuttingDown || - !Array.from(Services.ww.getWindowEnumerator()).find( - w => - lazy.PrivateBrowsingUtils.isWindowPrivate(w) && - // We need to filter out the HIDDEN WebExtensions window, - // which might be private as well but is not UI-relevant. - !w.location.href.startsWith("chrome://extensions/") - )) - ) { - // no more private windows, empty private content if needed - this.emptyPrivate(); - } - } - }); - - lazy.AsyncShutdown.quitApplicationGranted.addBlocker( - "ClipboardPrivacy: removing private data", - () => { - this._shuttingDown = true; - this.emptyPrivate(); - } - ); - }, - emptyPrivate() { - if ( - this._isPrivateClipboard && - !Services.prefs.getBoolPref( - "browser.privatebrowsing.preserveClipboard", - false - ) && - this._lastClipboardHash === this._computeClipboardHash() - ) { - // nsIClipboard.emptyClipboard() does nothing in Wayland: - // we'll set an empty string as a work-around. - const trans = this._createTransferable(); - const flavor = "text/plain"; - trans.addDataFlavor(flavor); - const emptyString = Cc["@mozilla.org/supports-string;1"].createInstance( - Ci.nsISupportsString - ); - emptyString.data = ""; - trans.setTransferData(flavor, emptyString); - const { clipboard } = Services, - { kGlobalClipboard } = clipboard; - clipboard.setData(trans, null, kGlobalClipboard); - clipboard.emptyClipboard(kGlobalClipboard); - this._lastClipboardHash = null; - this._isPrivateClipboard = false; - this._log.info("Private clipboard emptied."); - } - }, -}; - ChromeUtils.defineLazyGetter( lazy, "WeaveService", @@ -596,9 +429,7 @@ BrowserGlue.prototype = { // handle any UI migration this._migrateUI(); - - // Base Browser-specific version of _migrateUI. - this._migrateUIBB(); + lazy.ProfileDataUpgrader.upgradeBB(this._isNewProfile); if (!Services.prefs.prefHasUserValue(PREF_PDFJS_ISDEFAULT_CACHE_STATE)) { lazy.PdfJs.checkIsDefault(this._isNewProfile); @@ -984,10 +815,6 @@ BrowserGlue.prototype = { lazy.WeaveService.init(); } - lazy.SecurityLevelRestartNotification.ready(); - - ClipboardPrivacy.startup(); - lazy.BrowserUtils.callModulesFromCategory( { categoryName: "browser-first-window-ready", @@ -1823,83 +1650,6 @@ BrowserGlue.prototype = { } }, - _migrateUIBB() { - // Version 1: 13.0a3. Reset layout.css.prefers-color-scheme.content-override - // for tor-browser#41739. - // Version 2: 14.0a5: Reset the privacy tracking headers preferences since - // the UI is hidden. tor-browser#42777. - // Also, do not set - // dom.security.https_only_mode_send_http_background_request in - // the security level anymore (tor-browser#42149). - // Also, reset security.xfocsp.errorReporting.automatic since we - // hid its neterror checkbox. tor-browser#42653. - // Version 3: 14.0a7: Reset general.smoothScroll. tor-browser#42070. - // Version 4: 15.0a2: Drop ML components. tor-browser#44045. - const MIGRATION_VERSION = 4; - const MIGRATION_PREF = "basebrowser.migration.version"; - if (this._isNewProfile) { - // Do not migrate fresh profiles - Services.prefs.setIntPref(MIGRATION_PREF, MIGRATION_VERSION); - return; - } else if (this._isNewProfile === undefined) { - // If this happens, check if upstream updated their function and do not - // set this member anymore! - console.error("_migrateUIBB: this._isNewProfile is undefined."); - } - // We do not care whether this is a new or old profile, since in version 1 - // we just quickly clear a user preference, which should not do anything to - // new profiles. - // Shall we ever raise the version number and have a watershed, we can add - // a check easily (any version > 0 will be an old profile). - const currentVersion = Services.prefs.getIntPref(MIGRATION_PREF, 0); - if (currentVersion < 1) { - Services.prefs.clearUserPref( - "layout.css.prefers-color-scheme.content-override" - ); - } - if (currentVersion < 2) { - for (const prefName of [ - "privacy.globalprivacycontrol.enabled", - "privacy.donottrackheader.enabled", - // Telemetry preference for if the user changed the value. - "privacy.globalprivacycontrol.was_ever_enabled", - // The next two preferences have no corresponding UI, but are related. - "privacy.globalprivacycontrol.functionality.enabled", - "privacy.globalprivacycontrol.pbmode.enabled", - "dom.security.https_only_mode_send_http_background_request", - "security.xfocsp.errorReporting.automatic", - ]) { - Services.prefs.clearUserPref(prefName); - } - } - if (currentVersion < 3) { - Services.prefs.clearUserPref("general.smoothScroll"); - } - if (currentVersion < 4) { - for (const prefName of [ - "browser.translations.enable", - "browser.ml.enable", - "browser.ml.chat.enabled", - "browser.ml.linkPreview.enabled", - "browser.tabs.groups.smart.enabled", - "browser.tabs.groups.smart.userEnabled", - "extensions.ml.enabled", - "pdfjs.enableAltText", - "pdfjs.enableAltTextForEnglish", - "pdfjs.enableGuessAltText", - "pdfjs.enableAltTextModelDownload", - "browser.urlbar.quicksuggest.mlEnabled", - "places.semanticHistory.featureGate", - ]) { - // Preferences are locked. Do not want user values to linger in the - // user's profile and become active if these preferences become unlocked - // in the future. - Services.prefs.clearUserPref(prefName); - } - } - Services.prefs.setIntPref(MIGRATION_PREF, MIGRATION_VERSION); - }, - async _showUpgradeDialog() { const data = await lazy.OnboardingMessageProvider.getUpgradeMessage(); const { gBrowser } = lazy.BrowserWindowTracker.getTopWindow(); ===================================== browser/components/ProfileDataUpgrader.sys.mjs ===================================== @@ -900,4 +900,78 @@ export let ProfileDataUpgrader = { // Update the migration version. Services.prefs.setIntPref("browser.migration.version", newVersion); }, + + upgradeBB(isNewProfile) { + // Version 1: 13.0a3. Reset layout.css.prefers-color-scheme.content-override + // for tor-browser#41739. + // Version 2: 14.0a5: Reset the privacy tracking headers preferences since + // the UI is hidden. tor-browser#42777. + // Also, do not set + // dom.security.https_only_mode_send_http_background_request in + // the security level anymore (tor-browser#42149). + // Also, reset security.xfocsp.errorReporting.automatic since we + // hid its neterror checkbox. tor-browser#42653. + // Version 3: 14.0a7: Reset general.smoothScroll. tor-browser#42070. + // Version 4: 15.0a2: Drop ML components. tor-browser#44045. + const MIGRATION_VERSION = 4; + const MIGRATION_PREF = "basebrowser.migration.version"; + + if (isNewProfile) { + // Do not migrate fresh profiles + Services.prefs.setIntPref(MIGRATION_PREF, MIGRATION_VERSION); + return; + } else if (isNewProfile === undefined) { + // If this happens, check if upstream updated their function and do not + // set this member anymore! + console.error("upgradeBB: isNewProfile is undefined."); + } + + const currentVersion = Services.prefs.getIntPref(MIGRATION_PREF, 0); + if (currentVersion < 1) { + Services.prefs.clearUserPref( + "layout.css.prefers-color-scheme.content-override" + ); + } + if (currentVersion < 2) { + for (const prefName of [ + "privacy.globalprivacycontrol.enabled", + "privacy.donottrackheader.enabled", + // Telemetry preference for if the user changed the value. + "privacy.globalprivacycontrol.was_ever_enabled", + // The next two preferences have no corresponding UI, but are related. + "privacy.globalprivacycontrol.functionality.enabled", + "privacy.globalprivacycontrol.pbmode.enabled", + "dom.security.https_only_mode_send_http_background_request", + "security.xfocsp.errorReporting.automatic", + ]) { + Services.prefs.clearUserPref(prefName); + } + } + if (currentVersion < 3) { + Services.prefs.clearUserPref("general.smoothScroll"); + } + if (currentVersion < 4) { + for (const prefName of [ + "browser.translations.enable", + "browser.ml.enable", + "browser.ml.chat.enabled", + "browser.ml.linkPreview.enabled", + "browser.tabs.groups.smart.enabled", + "browser.tabs.groups.smart.userEnabled", + "extensions.ml.enabled", + "pdfjs.enableAltText", + "pdfjs.enableAltTextForEnglish", + "pdfjs.enableGuessAltText", + "pdfjs.enableAltTextModelDownload", + "browser.urlbar.quicksuggest.mlEnabled", + "places.semanticHistory.featureGate", + ]) { + // Preferences are locked. Do not want user values to linger in the + // user's profile and become active if these preferences become unlocked + // in the future. + Services.prefs.clearUserPref(prefName); + } + } + Services.prefs.setIntPref(MIGRATION_PREF, MIGRATION_VERSION); + }, }; ===================================== browser/modules/ClipboardPrivacy.sys.mjs ===================================== @@ -0,0 +1,178 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +const lazy = {}; + +ChromeUtils.defineESModuleGetters(lazy, { + AsyncShutdown: "resource://gre/modules/AsyncShutdown.sys.mjs", + PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs", + setTimeout: "resource://gre/modules/Timer.sys.mjs", +}); + +/** + * Empty clipboard content from private windows on exit. + * + * See tor-browser#42154. + */ +export const ClipboardPrivacy = { + _lastClipboardHash: null, + _globalActivation: false, + _isPrivateClipboard: false, + _hasher: null, + _shuttingDown: false, + _log: null, + + _createTransferable() { + const trans = Cc["@mozilla.org/widget/transferable;1"].createInstance( + Ci.nsITransferable + ); + trans.init(null); + return trans; + }, + _computeClipboardHash() { + const flavors = ["text/x-moz-url", "text/plain"]; + if ( + !Services.clipboard.hasDataMatchingFlavors( + flavors, + Ci.nsIClipboard.kGlobalClipboard + ) + ) { + return null; + } + const trans = this._createTransferable(); + flavors.forEach(trans.addDataFlavor); + try { + Services.clipboard.getData(trans, Ci.nsIClipboard.kGlobalClipboard); + const clipboardContent = {}; + trans.getAnyTransferData({}, clipboardContent); + const { data } = clipboardContent.value.QueryInterface( + Ci.nsISupportsString + ); + const bytes = new TextEncoder().encode(data); + const hasher = (this._hasher ||= Cc[ + "@mozilla.org/security/hash;1" + ].createInstance(Ci.nsICryptoHash)); + hasher.init(hasher.SHA256); + hasher.update(bytes, bytes.length); + return hasher.finish(true); + } catch (e) {} + return null; + }, + + init() { + this._log = console.createInstance({ + prefix: "ClipboardPrivacy", + }); + this._lastClipboardHash = this._computeClipboardHash(); + + // Here we track changes in active window / application, + // by filtering focus events and window closures. + const handleActivation = (win, activation) => { + if (activation) { + if (!this._globalActivation) { + // focus changed within this window, bail out. + return; + } + this._globalActivation = false; + } else if (!Services.focus.activeWindow) { + // focus is leaving this window: + // let's track whether it remains within the browser. + lazy.setTimeout(() => { + this._globalActivation = !Services.focus.activeWindow; + }, 100); + } + + const checkClipboardContent = () => { + const clipboardHash = this._computeClipboardHash(); + if (clipboardHash !== this._lastClipboardHash) { + this._isPrivateClipboard = + !activation && + (lazy.PrivateBrowsingUtils.permanentPrivateBrowsing || + lazy.PrivateBrowsingUtils.isWindowPrivate(win)); + this._lastClipboardHash = clipboardHash; + this._log.debug( + `Clipboard changed: private ${this._isPrivateClipboard}, hash ${clipboardHash}.` + ); + } + }; + + if (win.closed) { + checkClipboardContent(); + } else { + // defer clipboard access on DOM events to work-around tor-browser#42306 + lazy.setTimeout(checkClipboardContent, 0); + } + }; + const focusListener = e => + e.isTrusted && handleActivation(e.currentTarget, e.type === "focusin"); + const initWindow = win => { + for (const e of ["focusin", "focusout"]) { + win.addEventListener(e, focusListener); + } + }; + for (const w of Services.ww.getWindowEnumerator()) { + initWindow(w); + } + Services.ww.registerNotification((win, event) => { + switch (event) { + case "domwindowopened": + initWindow(win); + break; + case "domwindowclosed": + handleActivation(win, false); + if ( + this._isPrivateClipboard && + lazy.PrivateBrowsingUtils.isWindowPrivate(win) && + (this._shuttingDown || + !Array.from(Services.ww.getWindowEnumerator()).find( + w => + lazy.PrivateBrowsingUtils.isWindowPrivate(w) && + // We need to filter out the HIDDEN WebExtensions window, + // which might be private as well but is not UI-relevant. + !w.location.href.startsWith("chrome://extensions/") + )) + ) { + // no more private windows, empty private content if needed + this.emptyPrivate(); + } + } + }); + + lazy.AsyncShutdown.quitApplicationGranted.addBlocker( + "ClipboardPrivacy: removing private data", + () => { + this._shuttingDown = true; + this.emptyPrivate(); + } + ); + }, + emptyPrivate() { + if ( + this._isPrivateClipboard && + !Services.prefs.getBoolPref( + "browser.privatebrowsing.preserveClipboard", + false + ) && + this._lastClipboardHash === this._computeClipboardHash() + ) { + // nsIClipboard.emptyClipboard() does nothing in Wayland: + // we'll set an empty string as a work-around. + const trans = this._createTransferable(); + const flavor = "text/plain"; + trans.addDataFlavor(flavor); + const emptyString = Cc["@mozilla.org/supports-string;1"].createInstance( + Ci.nsISupportsString + ); + emptyString.data = ""; + trans.setTransferData(flavor, emptyString); + const { clipboard } = Services, + { kGlobalClipboard } = clipboard; + clipboard.setData(trans, null, kGlobalClipboard); + clipboard.emptyClipboard(kGlobalClipboard); + this._lastClipboardHash = null; + this._isPrivateClipboard = false; + this._log.info("Private clipboard emptied."); + } + }, +}; ===================================== browser/modules/moz.build ===================================== @@ -136,7 +136,6 @@ EXTRA_JS_MODULES += [ "PopupBlockerObserver.sys.mjs", "ProcessHangMonitor.sys.mjs", "Sanitizer.sys.mjs", - "SecurityLevelRestartNotification.sys.mjs", "SelectionChangedMenulist.sys.mjs", "SharingUtils.sys.mjs", "SiteDataManager.sys.mjs", @@ -149,6 +148,8 @@ EXTRA_JS_MODULES += [ MOZ_SRC_FILES += [ "ContextId.sys.mjs", + "ClipboardPrivacy.sys.mjs", + "SecurityLevelRestartNotification.sys.mjs", ] if CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows": View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/a1886d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/a1886d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.2.0esr-15.0-1] 9 commits: fixup! BB 42019: Empty browser's clipboard on browser shutdown
by Pier Angelo Vendrame (＠pierov) 08 Sep '25

08 Sep '25

Pier Angelo Vendrame pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: d5582e87 by Pier Angelo Vendrame at 2025-09-08T12:03:34+02:00 fixup! BB 42019: Empty browser's clipboard on browser shutdown BB 43770: Follow upstream's BrowserGlue simplifications. ClipboardPrivacy to its own file and initialize it from the manifest, rather than from BrowserGlue. - - - - - d4c6e7a4 by Pier Angelo Vendrame at 2025-09-08T12:03:35+02:00 fixup! BB 40925: Implemented the Security Level component BB 43770: Follow upstream's BrowserGlue simplifications. Initialize the security level notification from the manifest. Also, since it was the only occurrence of the file path, move it to the moz-src:// scheme. - - - - - 8eccdc93 by Pier Angelo Vendrame at 2025-09-08T12:03:35+02:00 fixup! TB 40933: Add tor-launcher functionality BB 43770: Follow upstream's BrowserGlue simplifications. Moved the call to firstWindowLoaded to the manifest. - - - - - 167c0116 by Pier Angelo Vendrame at 2025-09-08T12:03:36+02:00 fixup! TB 8324: Prevent DNS proxy bypasses caused by Drag&Drop BB 43770: Follow upstream's BrowserGlue simplifications. - - - - - b45bb7f1 by Pier Angelo Vendrame at 2025-09-08T12:03:37+02:00 fixup! TB 43405: Show a prompt whenever we fail to apply Tor settings. BB 43770: Follow upstream's BrowserGlue simplifications. - - - - - ad267a06 by Pier Angelo Vendrame at 2025-09-08T12:03:37+02:00 fixup! TB 40458: Implement .tor.onion aliases Use proper private method and members. - - - - - a05bd724 by Pier Angelo Vendrame at 2025-09-08T12:03:38+02:00 fixup! TB 40458: Implement .tor.onion aliases BB 43770: Follow upstream's BrowserGlue simplifications. - - - - - a857af7e by Pier Angelo Vendrame at 2025-09-08T12:03:38+02:00 fixup! BB 42027: Base Browser migration procedures. BB 43770: Follow upstream's BrowserGlue simplifications. - - - - - 51ca3bdf by Pier Angelo Vendrame at 2025-09-08T12:03:39+02:00 fixup! TB 41435: Add a Tor Browser migration function BB 43770: Follow upstream's BrowserGlue simplifications. - - - - - 12 changed files: - browser/components/BrowserComponents.manifest - browser/components/BrowserGlue.sys.mjs - browser/components/ProfileDataUpgrader.sys.mjs - browser/components/onionservices/OnionAliasStore.sys.mjs - browser/components/onionservices/moz.build - browser/components/rulesets/RulesetsParent.sys.mjs - + browser/modules/ClipboardPrivacy.sys.mjs - browser/modules/moz.build - dom/base/ContentAreaDropListener.sys.mjs - toolkit/components/places/PlacesUtils.sys.mjs - toolkit/components/tor-launcher/tor-launcher.manifest - toolkit/modules/moz.build Changes: ===================================== browser/components/BrowserComponents.manifest ===================================== @@ -51,6 +51,11 @@ category browser-first-window-ready resource://gre/modules/CaptchaDetectionPingU category browser-first-window-ready resource://gre/modules/SandboxUtils.sys.mjs SandboxUtils.maybeWarnAboutMissingUserNamespaces #endif #endif +category browser-first-window-ready moz-src:///browser/modules/ClipboardPrivacy.sys.mjs ClipboardPrivacy.init +category browser-first-window-ready moz-src:///browser/modules/SecurityLevelRestartNotification.sys.mjs SecurityLevelRestartNotification.ready +category browser-first-window-ready moz-src:///toolkit/modules/DragDropFilter.sys.mjs DragDropFilter.init +category browser-first-window-ready moz-src:///browser/modules/TorSettingsNotification.sys.mjs TorSettingsNotification.ready +category browser-first-window-ready moz-src:///browser/components/onionservices/OnionAliasStore.sys.mjs OnionAliasStore.init category browser-idle-startup resource:///modules/PlacesUIUtils.sys.mjs PlacesUIUtils.unblockToolbars category browser-idle-startup resource:///modules/BuiltInThemes.sys.mjs BuiltInThemes.ensureBuiltInThemes @@ -94,5 +99,6 @@ category browser-quit-application-granted moz-src:///browser/components/search/S category browser-quit-application-granted resource://gre/modules/UpdateListener.sys.mjs UpdateListener.reset #endif category browser-quit-application-granted resource:///modules/UrlbarSearchTermsPersistence.sys.mjs UrlbarSearchTermsPersistence.uninit +category browser-quit-application-granted moz-src:///browser/components/onionservices/OnionAliasStore.sys.mjs OnionAliasStore.uninit category search-service-notification moz-src:///browser/components/search/SearchUIUtils.sys.mjs SearchUIUtils.showSearchServiceNotification ===================================== browser/components/BrowserGlue.sys.mjs ===================================== @@ -12,7 +12,6 @@ ChromeUtils.defineESModuleGetters(lazy, { AWToolbarButton: "resource:///modules/aboutwelcome/AWToolbarUtils.sys.mjs", ASRouter: "resource:///modules/asrouter/ASRouter.sys.mjs", AddonManager: "resource://gre/modules/AddonManager.sys.mjs", - AsyncShutdown: "resource://gre/modules/AsyncShutdown.sys.mjs", BackupService: "resource:///modules/backup/BackupService.sys.mjs", BrowserSearchTelemetry: "moz-src:///browser/components/search/BrowserSearchTelemetry.sys.mjs", @@ -31,7 +30,6 @@ ChromeUtils.defineESModuleGetters(lazy, { DistributionManagement: "resource:///modules/distribution.sys.mjs", DownloadsViewableInternally: "resource:///modules/DownloadsViewableInternally.sys.mjs", - DragDropFilter: "resource://gre/modules/DragDropFilter.sys.mjs", ExtensionsUI: "resource:///modules/ExtensionsUI.sys.mjs", // FilePickerCrashed is used by the `listeners` object below. // eslint-disable-next-line mozilla/valid-lazy @@ -42,7 +40,6 @@ ChromeUtils.defineESModuleGetters(lazy, { LoginHelper: "resource://gre/modules/LoginHelper.sys.mjs", MigrationUtils: "resource:///modules/MigrationUtils.sys.mjs", NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs", - OnionAliasStore: "resource:///modules/OnionAliasStore.sys.mjs", OnboardingMessageProvider: "resource:///modules/asrouter/OnboardingMessageProvider.sys.mjs", PageDataService: "resource:///modules/pagedata/PageDataService.sys.mjs", @@ -63,8 +60,6 @@ ChromeUtils.defineESModuleGetters(lazy, { ScreenshotsUtils: "resource:///modules/ScreenshotsUtils.sys.mjs", SearchSERPTelemetry: "moz-src:///browser/components/search/SearchSERPTelemetry.sys.mjs", - SecurityLevelRestartNotification: - "resource:///modules/SecurityLevelRestartNotification.sys.mjs", SessionStartup: "resource:///modules/sessionstore/SessionStartup.sys.mjs", SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs", ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs", @@ -75,11 +70,6 @@ ChromeUtils.defineESModuleGetters(lazy, { TelemetryReportingPolicy: "resource://gre/modules/TelemetryReportingPolicy.sys.mjs", TRRRacer: "resource:///modules/TRRPerformance.sys.mjs", - TorConnect: "resource://gre/modules/TorConnect.sys.mjs", - TorConnectTopics: "resource://gre/modules/TorConnect.sys.mjs", - TorProviderBuilder: "resource://gre/modules/TorProviderBuilder.sys.mjs", - TorSettingsNotification: - "resource:///modules/TorSettingsNotification.sys.mjs", WebChannel: "resource://gre/modules/WebChannel.sys.mjs", WebProtocolHandlerRegistrar: "resource:///modules/WebProtocolHandlerRegistrar.sys.mjs", @@ -113,170 +103,6 @@ if (AppConstants.ENABLE_WEBDRIVER) { const PREF_PDFJS_ISDEFAULT_CACHE_STATE = "pdfjs.enabledCache.state"; -// Empty clipboard content from private windows on exit -// (tor-browser#42154) -const ClipboardPrivacy = { - _lastClipboardHash: null, - _globalActivation: false, - _isPrivateClipboard: false, - _hasher: null, - _shuttingDown: false, - _log: null, - - _createTransferable() { - const trans = Cc["@mozilla.org/widget/transferable;1"].createInstance( - Ci.nsITransferable - ); - trans.init(null); - return trans; - }, - _computeClipboardHash() { - const flavors = ["text/x-moz-url", "text/plain"]; - if ( - !Services.clipboard.hasDataMatchingFlavors( - flavors, - Ci.nsIClipboard.kGlobalClipboard - ) - ) { - return null; - } - const trans = this._createTransferable(); - flavors.forEach(trans.addDataFlavor); - try { - Services.clipboard.getData(trans, Ci.nsIClipboard.kGlobalClipboard); - const clipboardContent = {}; - trans.getAnyTransferData({}, clipboardContent); - const { data } = clipboardContent.value.QueryInterface( - Ci.nsISupportsString - ); - const bytes = new TextEncoder().encode(data); - const hasher = (this._hasher ||= Cc[ - "@mozilla.org/security/hash;1" - ].createInstance(Ci.nsICryptoHash)); - hasher.init(hasher.SHA256); - hasher.update(bytes, bytes.length); - return hasher.finish(true); - } catch (e) {} - return null; - }, - - startup() { - this._log = console.createInstance({ - prefix: "ClipboardPrivacy", - }); - this._lastClipboardHash = this._computeClipboardHash(); - - // Here we track changes in active window / application, - // by filtering focus events and window closures. - const handleActivation = (win, activation) => { - if (activation) { - if (!this._globalActivation) { - // focus changed within this window, bail out. - return; - } - this._globalActivation = false; - } else if (!Services.focus.activeWindow) { - // focus is leaving this window: - // let's track whether it remains within the browser. - lazy.setTimeout(() => { - this._globalActivation = !Services.focus.activeWindow; - }, 100); - } - - const checkClipboardContent = () => { - const clipboardHash = this._computeClipboardHash(); - if (clipboardHash !== this._lastClipboardHash) { - this._isPrivateClipboard = - !activation && - (lazy.PrivateBrowsingUtils.permanentPrivateBrowsing || - lazy.PrivateBrowsingUtils.isWindowPrivate(win)); - this._lastClipboardHash = clipboardHash; - this._log.debug( - `Clipboard changed: private ${this._isPrivateClipboard}, hash ${clipboardHash}.` - ); - } - }; - - if (win.closed) { - checkClipboardContent(); - } else { - // defer clipboard access on DOM events to work-around tor-browser#42306 - lazy.setTimeout(checkClipboardContent, 0); - } - }; - const focusListener = e => - e.isTrusted && handleActivation(e.currentTarget, e.type === "focusin"); - const initWindow = win => { - for (const e of ["focusin", "focusout"]) { - win.addEventListener(e, focusListener); - } - }; - for (const w of Services.ww.getWindowEnumerator()) { - initWindow(w); - } - Services.ww.registerNotification((win, event) => { - switch (event) { - case "domwindowopened": - initWindow(win); - break; - case "domwindowclosed": - handleActivation(win, false); - if ( - this._isPrivateClipboard && - lazy.PrivateBrowsingUtils.isWindowPrivate(win) && - (this._shuttingDown || - !Array.from(Services.ww.getWindowEnumerator()).find( - w => - lazy.PrivateBrowsingUtils.isWindowPrivate(w) && - // We need to filter out the HIDDEN WebExtensions window, - // which might be private as well but is not UI-relevant. - !w.location.href.startsWith("chrome://extensions/") - )) - ) { - // no more private windows, empty private content if needed - this.emptyPrivate(); - } - } - }); - - lazy.AsyncShutdown.quitApplicationGranted.addBlocker( - "ClipboardPrivacy: removing private data", - () => { - this._shuttingDown = true; - this.emptyPrivate(); - } - ); - }, - emptyPrivate() { - if ( - this._isPrivateClipboard && - !Services.prefs.getBoolPref( - "browser.privatebrowsing.preserveClipboard", - false - ) && - this._lastClipboardHash === this._computeClipboardHash() - ) { - // nsIClipboard.emptyClipboard() does nothing in Wayland: - // we'll set an empty string as a work-around. - const trans = this._createTransferable(); - const flavor = "text/plain"; - trans.addDataFlavor(flavor); - const emptyString = Cc["@mozilla.org/supports-string;1"].createInstance( - Ci.nsISupportsString - ); - emptyString.data = ""; - trans.setTransferData(flavor, emptyString); - const { clipboard } = Services, - { kGlobalClipboard } = clipboard; - clipboard.setData(trans, null, kGlobalClipboard); - clipboard.emptyClipboard(kGlobalClipboard); - this._lastClipboardHash = null; - this._isPrivateClipboard = false; - this._log.info("Private clipboard emptied."); - } - }, -}; - ChromeUtils.defineLazyGetter( lazy, "WeaveService", @@ -603,13 +429,8 @@ BrowserGlue.prototype = { // handle any UI migration this._migrateUI(); - - // Base Browser-specific version of _migrateUI. - this._migrateUIBB(); - - // Handle any TBB-specific migration before showing the UI. Keep after - // _migrateUI to make sure this._isNewProfile has been defined. - this._migrateUITBB(); + lazy.ProfileDataUpgrader.upgradeBB(this._isNewProfile); + lazy.ProfileDataUpgrader.upgradeTB(this._isNewProfile); if (!Services.prefs.prefHasUserValue(PREF_PDFJS_ISDEFAULT_CACHE_STATE)) { lazy.PdfJs.checkIsDefault(this._isNewProfile); @@ -995,16 +816,6 @@ BrowserGlue.prototype = { lazy.WeaveService.init(); } - lazy.SecurityLevelRestartNotification.ready(); - - lazy.DragDropFilter.init(); - - lazy.TorProviderBuilder.firstWindowLoaded(); - - lazy.TorSettingsNotification.ready(); - - ClipboardPrivacy.startup(); - lazy.BrowserUtils.callModulesFromCategory( { categoryName: "browser-first-window-ready", @@ -1104,7 +915,6 @@ BrowserGlue.prototype = { // can perform at-shutdown tasks later in shutdown. Services.fog; }, - () => lazy.OnionAliasStore.uninit(), ]; for (let task of tasks) { @@ -1375,30 +1185,6 @@ BrowserGlue.prototype = { }, }, - { - task: () => { - if (!lazy.TorConnect.shouldShowTorConnect) { - // we will take this path when the user is using the legacy tor launcher or - // when Tor Browser didn't launch its own tor. - lazy.OnionAliasStore.init(); - } else { - // this path is taken when using about:torconnect, we wait to init - // after we are bootstrapped and connected to tor - const topic = lazy.TorConnectTopics.BootstrapComplete; - let bootstrapObserver = { - observe(aSubject, aTopic) { - if (aTopic === topic) { - lazy.OnionAliasStore.init(); - // we only need to init once, so remove ourselves as an obvserver - Services.obs.removeObserver(this, topic); - } - }, - }; - Services.obs.addObserver(bootstrapObserver, topic); - } - }, - }, - // Run TRR performance measurements for DoH. { name: "doh-rollout.trrRacer.run", @@ -1865,208 +1651,6 @@ BrowserGlue.prototype = { } }, - _migrateUIBB() { - // Version 1: 13.0a3. Reset layout.css.prefers-color-scheme.content-override - // for tor-browser#41739. - // Version 2: 14.0a5: Reset the privacy tracking headers preferences since - // the UI is hidden. tor-browser#42777. - // Also, do not set - // dom.security.https_only_mode_send_http_background_request in - // the security level anymore (tor-browser#42149). - // Also, reset security.xfocsp.errorReporting.automatic since we - // hid its neterror checkbox. tor-browser#42653. - // Version 3: 14.0a7: Reset general.smoothScroll. tor-browser#42070. - // Version 4: 15.0a2: Drop ML components. tor-browser#44045. - const MIGRATION_VERSION = 4; - const MIGRATION_PREF = "basebrowser.migration.version"; - if (this._isNewProfile) { - // Do not migrate fresh profiles - Services.prefs.setIntPref(MIGRATION_PREF, MIGRATION_VERSION); - return; - } else if (this._isNewProfile === undefined) { - // If this happens, check if upstream updated their function and do not - // set this member anymore! - console.error("_migrateUIBB: this._isNewProfile is undefined."); - } - // We do not care whether this is a new or old profile, since in version 1 - // we just quickly clear a user preference, which should not do anything to - // new profiles. - // Shall we ever raise the version number and have a watershed, we can add - // a check easily (any version > 0 will be an old profile). - const currentVersion = Services.prefs.getIntPref(MIGRATION_PREF, 0); - if (currentVersion < 1) { - Services.prefs.clearUserPref( - "layout.css.prefers-color-scheme.content-override" - ); - } - if (currentVersion < 2) { - for (const prefName of [ - "privacy.globalprivacycontrol.enabled", - "privacy.donottrackheader.enabled", - // Telemetry preference for if the user changed the value. - "privacy.globalprivacycontrol.was_ever_enabled", - // The next two preferences have no corresponding UI, but are related. - "privacy.globalprivacycontrol.functionality.enabled", - "privacy.globalprivacycontrol.pbmode.enabled", - "dom.security.https_only_mode_send_http_background_request", - "security.xfocsp.errorReporting.automatic", - ]) { - Services.prefs.clearUserPref(prefName); - } - } - if (currentVersion < 3) { - Services.prefs.clearUserPref("general.smoothScroll"); - } - if (currentVersion < 4) { - for (const prefName of [ - "browser.translations.enable", - "browser.ml.enable", - "browser.ml.chat.enabled", - "browser.ml.linkPreview.enabled", - "browser.tabs.groups.smart.enabled", - "browser.tabs.groups.smart.userEnabled", - "extensions.ml.enabled", - "pdfjs.enableAltText", - "pdfjs.enableAltTextForEnglish", - "pdfjs.enableGuessAltText", - "pdfjs.enableAltTextModelDownload", - "browser.urlbar.quicksuggest.mlEnabled", - "places.semanticHistory.featureGate", - ]) { - // Preferences are locked. Do not want user values to linger in the - // user's profile and become active if these preferences become unlocked - // in the future. - Services.prefs.clearUserPref(prefName); - } - } - Services.prefs.setIntPref(MIGRATION_PREF, MIGRATION_VERSION); - }, - - // Use this method for any TBB migration that can be run just before showing - // the UI. - // Anything that critically needs to be migrated earlier should not use this. - async _migrateUITBB() { - // Version 1: Tor Browser 12.0. We use it to remove langpacks, after the - // migration to packaged locales. - // Version 2: Tor Browser 13.0/13.0a1: tor-browser#41845. Also, removed some - // torbutton preferences that are not used anymore. - // Version 3: Tor Browser 13.0.7/13.5a3: Remove blockchair - // (tor-browser#42283). - // Version 4: Tor Browser 14.0a4 (2024-09-02): Remove Twitter, Yahoo and - // YouTube search engines (tor-browser#41835). - // Version 5: Tor Browser 14.0a5: Clear user preference for CFR settings - // since we hid the UI (tor-browser#43118). - // Version 6: Tor Browser 14.5a3: Clear preference for TorSettings that is - // no longer used (tor-browser#41921). - // Drop unused TorConnect setting (tor-browser#43462). - // Version 7: Tor Browser 14.5a6: Clear home page update url preference - // (tor-browser#43567). - // Version 8: Tor Browser 15.0a2: Remove legacy search addons - // (tor-browser#43111). - const TBB_MIGRATION_VERSION = 8; - const MIGRATION_PREF = "torbrowser.migration.version"; - - // If we decide to force updating users to pass through any version - // following 12.0, we can remove this check, and check only whether - // MIGRATION_PREF has a user value, like Mozilla does. - if (this._isNewProfile) { - // Do not migrate fresh profiles - Services.prefs.setIntPref(MIGRATION_PREF, TBB_MIGRATION_VERSION); - return; - } else if (this._isNewProfile === undefined) { - // If this happens, check if upstream updated their function and do not - // set this member anymore! - console.error("_migrateUITBB: this._isNewProfile is undefined."); - } - - const currentVersion = Services.prefs.getIntPref(MIGRATION_PREF, 0); - const removeLangpacks = async () => { - for (const addon of await AddonManager.getAddonsByTypes(["locale"])) { - await addon.uninstall(); - } - }; - if (currentVersion < 1) { - try { - await removeLangpacks(); - } catch (err) { - console.error("Could not remove langpacks", err); - } - } - if (currentVersion < 2) { - const prefToClear = [ - // tor-browser#41845: We were forcing these value by check the value of - // automatic PBM. We decided not to change - "browser.cache.disk.enable", - "places.history.enabled", - "security.nocertdb", - "permissions.memory_only", - // Old torbutton preferences not used anymore. - "extensions.torbutton.loglevel", - "extensions.torbutton.logmethod", - "extensions.torbutton.pref_fixup_version", - "extensions.torbutton.resize_new_windows", - "extensions.torbutton.startup", - "extensions.torlauncher.prompt_for_locale", - "extensions.torlauncher.loglevel", - "extensions.torlauncher.logmethod", - "extensions.torlauncher.torrc_fixup_version", - ]; - for (const pref of prefToClear) { - if (Services.prefs.prefHasUserValue(pref)) { - Services.prefs.clearUserPref(pref); - } - } - } - const dropAddons = async list => { - for (const id of list) { - try { - const engine = await lazy.AddonManager.getAddonByID(id); - await engine?.uninstall(); - } catch {} - } - }; - if (currentVersion < 3) { - await dropAddons([ - "blockchair(a)search.mozilla.org", - "blockchair-onion(a)search.mozilla.org", - ]); - } - if (currentVersion < 4) { - await dropAddons([ - "twitter(a)search.mozilla.org", - "yahoo(a)search.mozilla.org", - "youtube(a)search.mozilla.org", - ]); - } - if (currentVersion < 5) { - for (const pref of [ - "browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons", - "browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features", - ]) { - Services.prefs.clearUserPref(pref); - } - } - if (currentVersion < 6) { - Services.prefs.clearUserPref("torbrowser.settings.enabled"); - Services.prefs.clearUserPref("torbrowser.bootstrap.allow_internet_test"); - } - if (currentVersion < 7) { - Services.prefs.clearUserPref("torbrowser.post_update.url"); - } - if (currentVersion < 8) { - await dropAddons([ - "ddg(a)search.mozilla.org", - "ddg-onion(a)search.mozilla.org", - "google(a)search.mozilla.org", - "startpage(a)search.mozilla.org", - "startpage-onion(a)search.mozilla.org", - "wikipedia(a)search.mozilla.org", - ]); - } - - Services.prefs.setIntPref(MIGRATION_PREF, TBB_MIGRATION_VERSION); - }, - async _showUpgradeDialog() { const data = await lazy.OnboardingMessageProvider.getUpgradeMessage(); const { gBrowser } = lazy.BrowserWindowTracker.getTopWindow(); ===================================== browser/components/ProfileDataUpgrader.sys.mjs ===================================== @@ -900,4 +900,200 @@ export let ProfileDataUpgrader = { // Update the migration version. Services.prefs.setIntPref("browser.migration.version", newVersion); }, + + upgradeBB(isNewProfile) { + // Version 1: 13.0a3. Reset layout.css.prefers-color-scheme.content-override + // for tor-browser#41739. + // Version 2: 14.0a5: Reset the privacy tracking headers preferences since + // the UI is hidden. tor-browser#42777. + // Also, do not set + // dom.security.https_only_mode_send_http_background_request in + // the security level anymore (tor-browser#42149). + // Also, reset security.xfocsp.errorReporting.automatic since we + // hid its neterror checkbox. tor-browser#42653. + // Version 3: 14.0a7: Reset general.smoothScroll. tor-browser#42070. + // Version 4: 15.0a2: Drop ML components. tor-browser#44045. + const MIGRATION_VERSION = 4; + const MIGRATION_PREF = "basebrowser.migration.version"; + + if (isNewProfile) { + // Do not migrate fresh profiles + Services.prefs.setIntPref(MIGRATION_PREF, MIGRATION_VERSION); + return; + } else if (isNewProfile === undefined) { + // If this happens, check if upstream updated their function and do not + // set this member anymore! + console.error("upgradeBB: isNewProfile is undefined."); + } + + const currentVersion = Services.prefs.getIntPref(MIGRATION_PREF, 0); + if (currentVersion < 1) { + Services.prefs.clearUserPref( + "layout.css.prefers-color-scheme.content-override" + ); + } + if (currentVersion < 2) { + for (const prefName of [ + "privacy.globalprivacycontrol.enabled", + "privacy.donottrackheader.enabled", + // Telemetry preference for if the user changed the value. + "privacy.globalprivacycontrol.was_ever_enabled", + // The next two preferences have no corresponding UI, but are related. + "privacy.globalprivacycontrol.functionality.enabled", + "privacy.globalprivacycontrol.pbmode.enabled", + "dom.security.https_only_mode_send_http_background_request", + "security.xfocsp.errorReporting.automatic", + ]) { + Services.prefs.clearUserPref(prefName); + } + } + if (currentVersion < 3) { + Services.prefs.clearUserPref("general.smoothScroll"); + } + if (currentVersion < 4) { + for (const prefName of [ + "browser.translations.enable", + "browser.ml.enable", + "browser.ml.chat.enabled", + "browser.ml.linkPreview.enabled", + "browser.tabs.groups.smart.enabled", + "browser.tabs.groups.smart.userEnabled", + "extensions.ml.enabled", + "pdfjs.enableAltText", + "pdfjs.enableAltTextForEnglish", + "pdfjs.enableGuessAltText", + "pdfjs.enableAltTextModelDownload", + "browser.urlbar.quicksuggest.mlEnabled", + "places.semanticHistory.featureGate", + ]) { + // Preferences are locked. Do not want user values to linger in the + // user's profile and become active if these preferences become unlocked + // in the future. + Services.prefs.clearUserPref(prefName); + } + } + Services.prefs.setIntPref(MIGRATION_PREF, MIGRATION_VERSION); + }, + + async upgradeTB(isNewProfile) { + // Version 1: Tor Browser 12.0. We use it to remove langpacks, after the + // migration to packaged locales. + // Version 2: Tor Browser 13.0/13.0a1: tor-browser#41845. Also, removed some + // torbutton preferences that are not used anymore. + // Version 3: Tor Browser 13.0.7/13.5a3: Remove blockchair + // (tor-browser#42283). + // Version 4: Tor Browser 14.0a4 (2024-09-02): Remove Twitter, Yahoo and + // YouTube search engines (tor-browser#41835). + // Version 5: Tor Browser 14.0a5: Clear user preference for CFR settings + // since we hid the UI (tor-browser#43118). + // Version 6: Tor Browser 14.5a3: Clear preference for TorSettings that is + // no longer used (tor-browser#41921). + // Drop unused TorConnect setting (tor-browser#43462). + // Version 7: Tor Browser 14.5a6: Clear home page update url preference + // (tor-browser#43567). + // Version 8: Tor Browser 15.0a2: Remove legacy search addons + // (tor-browser#43111). + const TBB_MIGRATION_VERSION = 8; + const MIGRATION_PREF = "torbrowser.migration.version"; + + // If we decide to force updating users to pass through any version + // following 12.0, we can remove this check, and check only whether + // MIGRATION_PREF has a user value, like Mozilla does. + if (isNewProfile) { + // Do not migrate fresh profiles + Services.prefs.setIntPref(MIGRATION_PREF, TBB_MIGRATION_VERSION); + return; + } else if (isNewProfile === undefined) { + // If this happens, check if upstream updated their function and do not + // set this member anymore! + console.error("upgradeTB: isNewProfile is undefined."); + } + + const currentVersion = Services.prefs.getIntPref(MIGRATION_PREF, 0); + const removeLangpacks = async () => { + for (const addon of await AddonManager.getAddonsByTypes(["locale"])) { + await addon.uninstall(); + } + }; + if (currentVersion < 1) { + try { + await removeLangpacks(); + } catch (err) { + console.error("Could not remove langpacks", err); + } + } + if (currentVersion < 2) { + const prefToClear = [ + // tor-browser#41845: We were forcing these value by check the value of + // automatic PBM. We decided not to change + "browser.cache.disk.enable", + "places.history.enabled", + "security.nocertdb", + "permissions.memory_only", + // Old torbutton preferences not used anymore. + "extensions.torbutton.loglevel", + "extensions.torbutton.logmethod", + "extensions.torbutton.pref_fixup_version", + "extensions.torbutton.resize_new_windows", + "extensions.torbutton.startup", + "extensions.torlauncher.prompt_for_locale", + "extensions.torlauncher.loglevel", + "extensions.torlauncher.logmethod", + "extensions.torlauncher.torrc_fixup_version", + ]; + for (const pref of prefToClear) { + if (Services.prefs.prefHasUserValue(pref)) { + Services.prefs.clearUserPref(pref); + } + } + } + const dropAddons = async list => { + for (const id of list) { + try { + const engine = await lazy.AddonManager.getAddonByID(id); + await engine?.uninstall(); + } catch {} + } + }; + if (currentVersion < 3) { + await dropAddons([ + "blockchair(a)search.mozilla.org", + "blockchair-onion(a)search.mozilla.org", + ]); + } + if (currentVersion < 4) { + await dropAddons([ + "twitter(a)search.mozilla.org", + "yahoo(a)search.mozilla.org", + "youtube(a)search.mozilla.org", + ]); + } + if (currentVersion < 5) { + for (const pref of [ + "browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons", + "browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features", + ]) { + Services.prefs.clearUserPref(pref); + } + } + if (currentVersion < 6) { + Services.prefs.clearUserPref("torbrowser.settings.enabled"); + Services.prefs.clearUserPref("torbrowser.bootstrap.allow_internet_test"); + } + if (currentVersion < 7) { + Services.prefs.clearUserPref("torbrowser.post_update.url"); + } + if (currentVersion < 8) { + await dropAddons([ + "ddg(a)search.mozilla.org", + "ddg-onion(a)search.mozilla.org", + "google(a)search.mozilla.org", + "startpage(a)search.mozilla.org", + "startpage-onion(a)search.mozilla.org", + "wikipedia(a)search.mozilla.org", + ]); + } + + Services.prefs.setIntPref(MIGRATION_PREF, TBB_MIGRATION_VERSION); + }, }; ===================================== browser/components/onionservices/OnionAliasStore.sys.mjs ===================================== @@ -1,4 +1,6 @@ -// Copyright (c) 2022, The Tor Project, Inc. +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ import { setTimeout, clearTimeout } from "resource://gre/modules/Timer.sys.mjs"; @@ -6,7 +8,10 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { JSONFile: "resource://gre/modules/JSONFile.sys.mjs", - TorRequestWatch: "resource:///modules/TorRequestWatch.sys.mjs", + TorConnect: "resource://gre/modules/TorConnect.sys.mjs", + TorConnectTopics: "resource://gre/modules/TorConnect.sys.mjs", + TorRequestWatch: + "moz-src:///browser/components/onionservices/TorRequestWatch.sys.mjs", }); /* OnionAliasStore observer topics */ @@ -84,12 +89,14 @@ class Channel { }; } + #enabled; + constructor(name, pathPrefix, jwk, scope, enabled) { this.name = name; this.pathPrefix = pathPrefix; this.jwk = jwk; this.scope = scope; - this._enabled = enabled; + this.#enabled = enabled; this.mappings = []; this.currentTimestamp = 0; @@ -158,10 +165,10 @@ class Channel { log.debug( `Downloaded and verified rules for ${this.name}, now uncompressing` ); - this._makeMappings(JSON.parse(await gunzip(rulesGz))); + this.#makeMappings(JSON.parse(await gunzip(rulesGz))); } - _makeMappings(rules) { + #makeMappings(rules) { const toTest = /^https?:\/\/[a-zA-Z0-9\.]{56}\.onion$/; const mappings = []; rules.rulesets.forEach(rule => { @@ -210,7 +217,7 @@ class Channel { async updateMappings(force) { force = force === undefined ? false : !!force; - if (!this._enabled && !force) { + if (!this.#enabled && !force) { return; } await this.updateLatestTimestamp(); @@ -224,10 +231,10 @@ class Channel { } get enabled() { - return this._enabled; + return this.#enabled; } set enabled(enabled) { - this._enabled = enabled; + this.#enabled = enabled; if (!enabled) { this.mappings = []; this.currentTimestamp = 0; @@ -243,7 +250,7 @@ class Channel { pathPrefix: this.pathPrefix, jwk: this.jwk, scope, - enabled: this._enabled, + enabled: this.#enabled, mappings: this.mappings, currentTimestamp: this.currentTimestamp, }; @@ -277,37 +284,40 @@ class _OnionAliasStore { return 86400 * 1000; // 1 day, like HTTPS-Everywhere } - constructor() { - this._channels = new Map(); - this._rulesetTimeout = null; - this._lastCheck = 0; - this._storage = null; - } + #channels = new Map(); + #rulesetTimeout = null; + #lastCheck = 0; + #storage = null; async init() { lazy.TorRequestWatch.start(); - await this._loadSettings(); - if (this.enabled) { - await this._startUpdates(); + await this.#loadSettings(); + if (this.enabled && !lazy.TorConnect.shouldShowTorConnect) { + await this.#startUpdates(); + } else { + Services.obs.addObserver(this, lazy.TorConnectTopics.BootstrapComplete); } Services.prefs.addObserver(kPrefOnionAliasEnabled, this); } uninit() { - this._clear(); - if (this._rulesetTimeout) { - clearTimeout(this._rulesetTimeout); + this.#clear(); + if (this.#rulesetTimeout) { + clearTimeout(this.#rulesetTimeout); } - this._rulesetTimeout = null; + this.#rulesetTimeout = null; + + Services.obs.removeObserver(this, lazy.TorConnectTopics.BootstrapComplete); Services.prefs.removeObserver(kPrefOnionAliasEnabled, this); + lazy.TorRequestWatch.stop(); } async getChannels() { - if (this._storage === null) { - await this._loadSettings(); + if (this.#storage === null) { + await this.#loadSettings(); } - return Array.from(this._channels.values(), ch => ch.toJSON()); + return Array.from(this.#channels.values(), ch => ch.toJSON()); } async setChannel(chanData) { @@ -328,20 +338,20 @@ class _OnionAliasStore { ); // Call makeKey to make it throw if the key is invalid await ch.makeKey(); - this._channels.set(name, ch); - this._applyMappings(); - this._saveSettings(); - setTimeout(this._notifyChanges.bind(this), 1); + this.#channels.set(name, ch); + this.#applyMappings(); + this.#saveSettings(); + setTimeout(this.#notifyChanges.bind(this), 1); return ch; } enableChannel(name, enabled) { - const channel = this._channels.get(name); + const channel = this.#channels.get(name); if (channel !== null) { channel.enabled = enabled; - this._applyMappings(); - this._saveSettings(); - this._notifyChanges(); + this.#applyMappings(); + this.#saveSettings(); + this.#notifyChanges(); if (this.enabled && enabled && !channel.currentTimestamp) { this.updateChannel(name); } @@ -352,46 +362,46 @@ class _OnionAliasStore { if (!this.enabled) { throw Error("Onion Aliases are disabled"); } - const channel = this._channels.get(name); + const channel = this.#channels.get(name); if (channel === null) { throw Error("Channel not found"); } await channel.updateMappings(true); - this._saveSettings(); - this._applyMappings(); - setTimeout(this._notifyChanges.bind(this), 1); + this.#saveSettings(); + this.#applyMappings(); + setTimeout(this.#notifyChanges.bind(this), 1); return channel; } deleteChannel(name) { - if (this._channels.delete(name)) { - this._saveSettings(); - this._applyMappings(); - this._notifyChanges(); + if (this.#channels.delete(name)) { + this.#saveSettings(); + this.#applyMappings(); + this.#notifyChanges(); } } - async _loadSettings() { - if (this._storage !== null) { + async #loadSettings() { + if (this.#storage !== null) { return; } - this._channels = new Map(); - this._storage = new lazy.JSONFile({ + this.#channels = new Map(); + this.#storage = new lazy.JSONFile({ path: PathUtils.join( Services.dirsvc.get("ProfD", Ci.nsIFile).path, "onion-aliases.json" ), - dataPostProcessor: this._settingsProcessor.bind(this), + dataPostProcessor: this.#settingsProcessor.bind(this), }); - await this._storage.load(); - log.debug("Loaded settings", this._storage.data, this._storage.path); - this._applyMappings(); - this._notifyChanges(); + await this.#storage.load(); + log.debug("Loaded settings", this.#storage.data, this.#storage.path); + this.#applyMappings(); + this.#notifyChanges(); } - _settingsProcessor(data) { + #settingsProcessor(data) { if ("lastCheck" in data) { - this._lastCheck = data.lastCheck; + this.#lastCheck = data.lastCheck; } else { data.lastCheck = 0; } @@ -410,56 +420,56 @@ class _OnionAliasStore { } return true; }); - this._channels = channels; + this.#channels = channels; return data; } - _saveSettings() { - if (this._storage === null) { + #saveSettings() { + if (this.#storage === null) { throw Error("Settings have not been loaded"); } - this._storage.data.lastCheck = this._lastCheck; - this._storage.data.channels = Array.from(this._channels.values(), ch => + this.#storage.data.lastCheck = this.#lastCheck; + this.#storage.data.channels = Array.from(this.#channels.values(), ch => ch.toJSON() ); - this._storage.saveSoon(); + this.#storage.saveSoon(); } - _addMapping(shortOnionHost, longOnionHost) { + #addMapping(shortOnionHost, longOnionHost) { const service = Cc["@torproject.org/onion-alias-service;1"].getService( Ci.IOnionAliasService ); service.addOnionAlias(shortOnionHost, longOnionHost); } - _clear() { + #clear() { const service = Cc["@torproject.org/onion-alias-service;1"].getService( Ci.IOnionAliasService ); service.clearOnionAliases(); } - _applyMappings() { - this._clear(); - for (const ch of this._channels.values()) { + #applyMappings() { + this.#clear(); + for (const ch of this.#channels.values()) { if (!ch.enabled) { continue; } for (const [short, long] of ch.mappings) { - this._addMapping(short, long); + this.#addMapping(short, long); } } } - async _periodicRulesetCheck() { + async #periodicRulesetCheck() { if (!this.enabled) { log.debug("Onion Aliases are disabled, not updating rulesets."); return; } log.debug("Begin scheduled ruleset update"); - this._lastCheck = Date.now(); + this.#lastCheck = Date.now(); let anyUpdated = false; - for (const ch of this._channels.values()) { + for (const ch of this.#channels.values()) { if (!ch.enabled) { log.debug(`Not updating ${ch.name} because not enabled`); continue; @@ -473,22 +483,22 @@ class _OnionAliasStore { } } if (anyUpdated) { - this._saveSettings(); - this._applyMappings(); - this._notifyChanges(); + this.#saveSettings(); + this.#applyMappings(); + this.#notifyChanges(); } else { log.debug("No channel has been updated, avoid saving"); } - this._scheduleCheck(_OnionAliasStore.RULESET_CHECK_INTERVAL); + this.#scheduleCheck(_OnionAliasStore.RULESET_CHECK_INTERVAL); } - async _startUpdates() { - // This is a "private" function, so we expect the callers to verify wheter + async #startUpdates() { + // This is a private function, so we expect the callers to verify whether // onion aliases are enabled. // Callees will also do, so we avoid an additional check here. - const dt = Date.now() - this._lastCheck; + const dt = Date.now() - this.#lastCheck; let force = false; - for (const ch of this._channels.values()) { + for (const ch of this.#channels.values()) { if (ch.enabled && !ch.currentTimestamp) { // Edited while being offline or some other error happened force = true; @@ -499,34 +509,34 @@ class _OnionAliasStore { log.debug( `Mappings are stale (${dt}), or force check requested (${force}), checking them immediately` ); - await this._periodicRulesetCheck(); + await this.#periodicRulesetCheck(); } else { - this._scheduleCheck(_OnionAliasStore.RULESET_CHECK_INTERVAL - dt); + this.#scheduleCheck(_OnionAliasStore.RULESET_CHECK_INTERVAL - dt); } } - _scheduleCheck(dt) { - if (this._rulesetTimeout) { + #scheduleCheck(dt) { + if (this.#rulesetTimeout) { log.warn("The previous update timeout was not null"); - clearTimeout(this._rulesetTimeout); + clearTimeout(this.#rulesetTimeout); } if (!this.enabled) { log.warn( "Ignoring the scheduling of a new check because the Onion Alias feature is currently disabled." ); - this._rulesetTimeout = null; + this.#rulesetTimeout = null; return; } log.debug(`Scheduling ruleset update in ${dt}`); - this._rulesetTimeout = setTimeout(() => { - this._rulesetTimeout = null; - this._periodicRulesetCheck(); + this.#rulesetTimeout = setTimeout(() => { + this.#rulesetTimeout = null; + this.#periodicRulesetCheck(); }, dt); } - _notifyChanges() { + #notifyChanges() { Services.obs.notifyObservers( - Array.from(this._channels.values(), ch => ch.toJSON()), + Array.from(this.#channels.values(), ch => ch.toJSON()), OnionAliasStoreTopics.ChannelsChanged ); } @@ -538,11 +548,16 @@ class _OnionAliasStore { observe(aSubject, aTopic) { if (aTopic === "nsPref:changed") { if (this.enabled) { - this._startUpdates(); - } else if (this._rulesetTimeout) { - clearTimeout(this._rulesetTimeout); - this._rulesetTimeout = null; + this.#startUpdates(); + } else if (this.#rulesetTimeout) { + clearTimeout(this.#rulesetTimeout); + this.#rulesetTimeout = null; } + } else if ( + aTopic === lazy.TorConnectTopics.BootstrapComplete && + this.enabled + ) { + this.#startUpdates(); } } } ===================================== browser/components/onionservices/moz.build ===================================== @@ -1,8 +1,11 @@ JAR_MANIFESTS += ["jar.mn"] EXTRA_JS_MODULES += [ - "OnionAliasStore.sys.mjs", "OnionLocationChild.sys.mjs", "OnionLocationParent.sys.mjs", +] + +MOZ_SRC_FILES += [ + "OnionAliasStore.sys.mjs", "TorRequestWatch.sys.mjs", ] ===================================== browser/components/rulesets/RulesetsParent.sys.mjs ===================================== @@ -1,9 +1,11 @@ -// Copyright (c) 2022, The Tor Project, Inc. +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ import { OnionAliasStore, OnionAliasStoreTopics, -} from "resource:///modules/OnionAliasStore.sys.mjs"; +} from "moz-src:///browser/components/onionservices/OnionAliasStore.sys.mjs"; const kShowWarningPref = "torbrowser.rulesets.show_warning"; @@ -56,9 +58,10 @@ export class RulesetsParent extends JSWindowActorParent { return { showWarning: Services.prefs.getBoolPref(kShowWarningPref, true), }; - case "rulesets:set-channel": + case "rulesets:set-channel": { const ch = await OnionAliasStore.setChannel(message.data); return ch; + } case "rulesets:update-channel": // We need to catch any error in this way, because in case of an // exception, RPMSendQuery does not return on the other side ===================================== browser/modules/ClipboardPrivacy.sys.mjs ===================================== @@ -0,0 +1,178 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +const lazy = {}; + +ChromeUtils.defineESModuleGetters(lazy, { + AsyncShutdown: "resource://gre/modules/AsyncShutdown.sys.mjs", + PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs", + setTimeout: "resource://gre/modules/Timer.sys.mjs", +}); + +/** + * Empty clipboard content from private windows on exit. + * + * See tor-browser#42154. + */ +export const ClipboardPrivacy = { + _lastClipboardHash: null, + _globalActivation: false, + _isPrivateClipboard: false, + _hasher: null, + _shuttingDown: false, + _log: null, + + _createTransferable() { + const trans = Cc["@mozilla.org/widget/transferable;1"].createInstance( + Ci.nsITransferable + ); + trans.init(null); + return trans; + }, + _computeClipboardHash() { + const flavors = ["text/x-moz-url", "text/plain"]; + if ( + !Services.clipboard.hasDataMatchingFlavors( + flavors, + Ci.nsIClipboard.kGlobalClipboard + ) + ) { + return null; + } + const trans = this._createTransferable(); + flavors.forEach(trans.addDataFlavor); + try { + Services.clipboard.getData(trans, Ci.nsIClipboard.kGlobalClipboard); + const clipboardContent = {}; + trans.getAnyTransferData({}, clipboardContent); + const { data } = clipboardContent.value.QueryInterface( + Ci.nsISupportsString + ); + const bytes = new TextEncoder().encode(data); + const hasher = (this._hasher ||= Cc[ + "@mozilla.org/security/hash;1" + ].createInstance(Ci.nsICryptoHash)); + hasher.init(hasher.SHA256); + hasher.update(bytes, bytes.length); + return hasher.finish(true); + } catch (e) {} + return null; + }, + + init() { + this._log = console.createInstance({ + prefix: "ClipboardPrivacy", + }); + this._lastClipboardHash = this._computeClipboardHash(); + + // Here we track changes in active window / application, + // by filtering focus events and window closures. + const handleActivation = (win, activation) => { + if (activation) { + if (!this._globalActivation) { + // focus changed within this window, bail out. + return; + } + this._globalActivation = false; + } else if (!Services.focus.activeWindow) { + // focus is leaving this window: + // let's track whether it remains within the browser. + lazy.setTimeout(() => { + this._globalActivation = !Services.focus.activeWindow; + }, 100); + } + + const checkClipboardContent = () => { + const clipboardHash = this._computeClipboardHash(); + if (clipboardHash !== this._lastClipboardHash) { + this._isPrivateClipboard = + !activation && + (lazy.PrivateBrowsingUtils.permanentPrivateBrowsing || + lazy.PrivateBrowsingUtils.isWindowPrivate(win)); + this._lastClipboardHash = clipboardHash; + this._log.debug( + `Clipboard changed: private ${this._isPrivateClipboard}, hash ${clipboardHash}.` + ); + } + }; + + if (win.closed) { + checkClipboardContent(); + } else { + // defer clipboard access on DOM events to work-around tor-browser#42306 + lazy.setTimeout(checkClipboardContent, 0); + } + }; + const focusListener = e => + e.isTrusted && handleActivation(e.currentTarget, e.type === "focusin"); + const initWindow = win => { + for (const e of ["focusin", "focusout"]) { + win.addEventListener(e, focusListener); + } + }; + for (const w of Services.ww.getWindowEnumerator()) { + initWindow(w); + } + Services.ww.registerNotification((win, event) => { + switch (event) { + case "domwindowopened": + initWindow(win); + break; + case "domwindowclosed": + handleActivation(win, false); + if ( + this._isPrivateClipboard && + lazy.PrivateBrowsingUtils.isWindowPrivate(win) && + (this._shuttingDown || + !Array.from(Services.ww.getWindowEnumerator()).find( + w => + lazy.PrivateBrowsingUtils.isWindowPrivate(w) && + // We need to filter out the HIDDEN WebExtensions window, + // which might be private as well but is not UI-relevant. + !w.location.href.startsWith("chrome://extensions/") + )) + ) { + // no more private windows, empty private content if needed + this.emptyPrivate(); + } + } + }); + + lazy.AsyncShutdown.quitApplicationGranted.addBlocker( + "ClipboardPrivacy: removing private data", + () => { + this._shuttingDown = true; + this.emptyPrivate(); + } + ); + }, + emptyPrivate() { + if ( + this._isPrivateClipboard && + !Services.prefs.getBoolPref( + "browser.privatebrowsing.preserveClipboard", + false + ) && + this._lastClipboardHash === this._computeClipboardHash() + ) { + // nsIClipboard.emptyClipboard() does nothing in Wayland: + // we'll set an empty string as a work-around. + const trans = this._createTransferable(); + const flavor = "text/plain"; + trans.addDataFlavor(flavor); + const emptyString = Cc["@mozilla.org/supports-string;1"].createInstance( + Ci.nsISupportsString + ); + emptyString.data = ""; + trans.setTransferData(flavor, emptyString); + const { clipboard } = Services, + { kGlobalClipboard } = clipboard; + clipboard.setData(trans, null, kGlobalClipboard); + clipboard.emptyClipboard(kGlobalClipboard); + this._lastClipboardHash = null; + this._isPrivateClipboard = false; + this._log.info("Private clipboard emptied."); + } + }, +}; ===================================== browser/modules/moz.build ===================================== @@ -136,12 +136,10 @@ EXTRA_JS_MODULES += [ "PopupBlockerObserver.sys.mjs", "ProcessHangMonitor.sys.mjs", "Sanitizer.sys.mjs", - "SecurityLevelRestartNotification.sys.mjs", "SelectionChangedMenulist.sys.mjs", "SharingUtils.sys.mjs", "SiteDataManager.sys.mjs", "SitePermissions.sys.mjs", - "TorSettingsNotification.sys.mjs", "TorUIUtils.sys.mjs", "TransientPrefs.sys.mjs", "URILoadingHelper.sys.mjs", @@ -151,6 +149,9 @@ EXTRA_JS_MODULES += [ MOZ_SRC_FILES += [ "ContextId.sys.mjs", + "ClipboardPrivacy.sys.mjs", + "SecurityLevelRestartNotification.sys.mjs", + "TorSettingsNotification.sys.mjs", ] if CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows": ===================================== dom/base/ContentAreaDropListener.sys.mjs ===================================== @@ -5,7 +5,7 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { - OpaqueDrag: "resource://gre/modules/DragDropFilter.sys.mjs", + OpaqueDrag: "moz-src:///toolkit/modules/DragDropFilter.sys.mjs", }); // This component is used for handling dragover and drop of urls. ===================================== toolkit/components/places/PlacesUtils.sys.mjs ===================================== @@ -12,7 +12,7 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { Bookmarks: "resource://gre/modules/Bookmarks.sys.mjs", History: "resource://gre/modules/History.sys.mjs", - OpaqueDrag: "resource://gre/modules/DragDropFilter.sys.mjs", + OpaqueDrag: "moz-src:///toolkit/modules/DragDropFilter.sys.mjs", PlacesSyncUtils: "resource://gre/modules/PlacesSyncUtils.sys.mjs", Sqlite: "resource://gre/modules/Sqlite.sys.mjs", }); ===================================== toolkit/components/tor-launcher/tor-launcher.manifest ===================================== @@ -1 +1,2 @@ category profile-after-change TorStartupService @torproject.org/tor-startup-service;1 +category browser-first-window-ready resource://gre/modules/TorProviderBuilder.sys.mjs TorProviderBuilder.firstWindowLoaded ===================================== toolkit/modules/moz.build ===================================== @@ -164,7 +164,6 @@ EXTRA_JS_MODULES += [ "DateTimePickerPanel.sys.mjs", "DeferredTask.sys.mjs", "DomainFrontedRequests.sys.mjs", - "DragDropFilter.sys.mjs", "E10SUtils.sys.mjs", "EventEmitter.sys.mjs", "FileUtils.sys.mjs", @@ -220,6 +219,10 @@ EXTRA_JS_MODULES += [ "WebChannel.sys.mjs", ] +MOZ_SRC_FILES += [ + "DragDropFilter.sys.mjs", +] + if CONFIG["MOZ_ASAN_REPORTER"]: EXTRA_JS_MODULES += [ "AsanReporter.sys.mjs", View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/d28d9f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/d28d9f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-140.2.0esr-15.0-1] BB 43525: Skip Remote Settings for search engine customization.
by Pier Angelo Vendrame (＠pierov) 08 Sep '25

08 Sep '25

Pier Angelo Vendrame pushed to branch base-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: a1886d8c by Pier Angelo Vendrame at 2025-09-08T11:57:50+02:00 BB 43525: Skip Remote Settings for search engine customization. Also, add some bundled search engines. - - - - - 9 changed files: - toolkit/components/search/AppProvidedSearchEngine.sys.mjs - toolkit/components/search/SearchEngineSelector.sys.mjs - + toolkit/components/search/content/base-browser-search-engine-icons.json - + toolkit/components/search/content/base-browser-search-engines.json - + toolkit/components/search/content/duckduckgo.ico - + toolkit/components/search/content/startpage-16.png - + toolkit/components/search/content/startpage-32.png - + toolkit/components/search/jar.mn - toolkit/components/search/moz.build Changes: ===================================== toolkit/components/search/AppProvidedSearchEngine.sys.mjs ===================================== @@ -116,6 +116,10 @@ class IconHandler { await this.#buildIconMap(); } + if (AppConstants.BASE_BROWSER_VERSION) { + return this.#iconMap.get(engineIdentifier); + } + let iconList = this.#iconMap.get(this.getKey(engineIdentifier)) || []; return iconList.filter(r => this.#identifierMatches(engineIdentifier, r.engineIdentifiers) @@ -132,29 +136,7 @@ class IconHandler { * source object or null of there is no icon with the supplied width. */ async createIconURL(iconRecord) { - let iconData; - try { - iconData = await this.#iconCollection.attachments.get(iconRecord); - } catch (ex) { - console.error(ex); - } - if (!iconData) { - console.warn("Unable to find the attachment for", iconRecord.id); - // Queue an update in case we haven't downloaded it yet. - this.#pendingUpdatesMap.set(iconRecord.id, iconRecord); - this.#maybeQueueIdle(); - return null; - } - - if (iconData.record.last_modified != iconRecord.last_modified) { - // The icon we have stored is out of date, queue an update so that we'll - // download the new icon. - this.#pendingUpdatesMap.set(iconRecord.id, iconRecord); - this.#maybeQueueIdle(); - } - return URL.createObjectURL( - new Blob([iconData.buffer], { type: iconRecord.attachment.mimetype }) - ); + return iconRecord.url; } QueryInterface = ChromeUtils.generateQI(["nsIObserver"]); @@ -238,27 +220,23 @@ class IconHandler { * Obtains the icon list from the remote settings collection. */ async #buildIconMap() { - let iconList = []; try { - iconList = await this.#iconCollection.get(); + this.#iconMap = new Map( + Object.entries( + await ( + await fetch( + "chrome://global/content/search/base-browser-search-engine-icons.json" + ) + ).json() + ) + ); } catch (ex) { console.error(ex); + this.#iconMap = null; } - if (!iconList.length) { + if (!this.#iconMap) { console.error("Failed to obtain search engine icon list records"); } - - this.#iconMap = new Map(); - for (let record of iconList) { - let keys = new Set(record.engineIdentifiers.map(this.getKey)); - for (let key of keys) { - if (this.#iconMap.has(key)) { - this.#iconMap.get(key).push(record); - } else { - this.#iconMap.set(key, [record]); - } - } - } } /** ===================================== toolkit/components/search/SearchEngineSelector.sys.mjs ===================================== @@ -2,6 +2,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs"; + /** * @typedef {import("../uniffi-bindgen-gecko-js/components/generated/RustSearch.sys.mjs").SearchEngineSelector} RustSearchEngineSelector * We use "Rust" above to avoid conflict with the class name for the JavaScript wrapper. @@ -92,30 +94,15 @@ export class SearchEngineSelector { return this._getConfigurationPromise; } - this._getConfigurationPromise = Promise.all([ - this._getConfiguration(), - this._getConfigurationOverrides(), - ]); - let remoteSettingsData = await this._getConfigurationPromise; - this._configuration = remoteSettingsData[0]; - this._configurationOverrides = remoteSettingsData[1]; - delete this._getConfigurationPromise; - - if (!this._configuration?.length) { - throw Components.Exception( - "Failed to get engine data from Remote Settings", - Cr.NS_ERROR_UNEXPECTED - ); - } - - if (!this._listenerAdded) { - this._remoteConfig.on("sync", this._onConfigurationUpdated); - this._remoteConfigOverrides.on( - "sync", - this._onConfigurationOverridesUpdated - ); - this._listenerAdded = true; - } + let { promise, resolve } = Promise.withResolvers(); + this._getConfigurationPromise = promise; + this._configuration = await ( + await fetch( + "chrome://global/content/search/base-browser-search-engines.json" + ) + ).json(); + this._configurationOverrides = []; + resolve(this._configuration); if (lazy.SearchUtils.rustSelectorFeatureGate) { this.#selector.setSearchConfig( @@ -242,6 +229,12 @@ export class SearchEngineSelector { * The new configuration object */ _onConfigurationUpdated({ data: { current } }) { + // tor-browser#43525: Even though RemoteSettings are a no-op for us, we do + // not want them to interfere in any way. + if (AppConstants.BASE_BROWSER_VERSION) { + return; + } + this._configuration = current; if (lazy.SearchUtils.rustSelectorFeatureGate) { @@ -268,6 +261,12 @@ export class SearchEngineSelector { * The new configuration object */ _onConfigurationOverridesUpdated({ data: { current } }) { + // tor-browser#43525: Even though RemoteSettings are a no-op for us, we do + // not want them to interfere in any way. + if (AppConstants.BASE_BROWSER_VERSION) { + return; + } + this._configurationOverrides = current; if (lazy.SearchUtils.rustSelectorFeatureGate) { ===================================== toolkit/components/search/content/base-browser-search-engine-icons.json ===================================== @@ -0,0 +1,15 @@ +{ + "ddg": [ + { "url": "chrome://global/content/search/duckduckgo.ico", "imageSize": 32 } + ], + "startpage": [ + { + "url": "chrome://global/content/search/startpage-16.png", + "imageSize": 16 + }, + { + "url": "chrome://global/content/search/startpage-32.png", + "imageSize": 32 + } + ] +} ===================================== toolkit/components/search/content/base-browser-search-engines.json ===================================== @@ -0,0 +1,43 @@ +[ + { + "base": { + "aliases": ["duckduckgo", "ddg"], + "classification": "general", + "name": "DuckDuckGo", + "urls": { + "search": { + "base": "https://duckduckgo.com/", + "params": [], + "searchTermParamName": "q" + } + } + }, + "id": "04e99a38-13ee-47d8-8aa4-64482b3dea99", + "identifier": "ddg", + "recordType": "engine", + "variants": [{ "environment": { "allRegionsAndLocales": true } }] + }, + { + "base": { + "aliases": ["startpage", "sp"], + "classification": "general", + "name": "Startpage", + "urls": { + "search": { + "base": "https://www.startpage.com/sp/search", + "params": [], + "searchTermParamName": "q" + } + } + }, + "id": "927bbd9f-b2f3-48b4-8974-1c1148028f4d", + "identifier": "startpage", + "recordType": "engine", + "variants": [{ "environment": { "allRegionsAndLocales": true } }] + }, + { + "recordType": "defaultEngines", + "globalDefault": "ddg", + "globalDefaultPrivate": "ddg" + } +] ===================================== toolkit/components/search/content/duckduckgo.ico ===================================== Binary files /dev/null and b/toolkit/components/search/content/duckduckgo.ico differ ===================================== toolkit/components/search/content/startpage-16.png ===================================== Binary files /dev/null and b/toolkit/components/search/content/startpage-16.png differ ===================================== toolkit/components/search/content/startpage-32.png ===================================== Binary files /dev/null and b/toolkit/components/search/content/startpage-32.png differ ===================================== toolkit/components/search/jar.mn ===================================== @@ -0,0 +1,6 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +toolkit.jar: + content/global/search/ (content/*) ===================================== toolkit/components/search/moz.build ===================================== @@ -46,5 +46,7 @@ TESTING_JS_MODULES += [ "tests/SearchTestUtils.sys.mjs", ] +JAR_MANIFESTS += ["jar.mn"] + with Files("**"): BUG_COMPONENT = ("Firefox", "Search") View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a1886d8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a1886d8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-140.2.0esr-15.0-1] 4 commits: fixup! MB 213: Customize the search engines list
by Pier Angelo Vendrame (＠pierov) 08 Sep '25

08 Sep '25

Pier Angelo Vendrame pushed to branch mullvad-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Mullvad Browser Commits: fd210716 by Pier Angelo Vendrame at 2025-09-08T11:52:36+02:00 fixup! MB 213: Customize the search engines list BB 43525: Skip Remote Settings for search engine customization. Drop some changes that we are not going to keep with the shared approach. - - - - - 0c345e48 by Pier Angelo Vendrame at 2025-09-08T11:53:16+02:00 dropme! MB 213: Customize the search engines list BB 43525: Skip Remote Settings for search engine customization. Prepare the tree for the new approach. - - - - - e95419fa by Pier Angelo Vendrame at 2025-09-08T11:53:17+02:00 BB 43525: Skip Remote Settings for search engine customization. Also, add some bundled search engines. - - - - - b80c84c1 by Pier Angelo Vendrame at 2025-09-08T11:53:17+02:00 amend! MB 213: Customize the search engines list MB 213: Customize the search engines list. - - - - - 6 changed files: - toolkit/components/search/AppProvidedSearchEngine.sys.mjs - toolkit/components/search/SearchEngineSelector.sys.mjs - toolkit/components/search/SearchService.sys.mjs - toolkit/components/search/content/mullvadBrowserSearchEngineIcons.json → toolkit/components/search/content/base-browser-search-engine-icons.json - + toolkit/components/search/content/base-browser-search-engines.json - − toolkit/components/search/content/mullvadBrowserSearchEngines.json Changes: ===================================== toolkit/components/search/AppProvidedSearchEngine.sys.mjs ===================================== @@ -116,7 +116,14 @@ class IconHandler { await this.#buildIconMap(); } - return this.#iconMap.get(engineIdentifier); + if (AppConstants.BASE_BROWSER_VERSION) { + return this.#iconMap.get(engineIdentifier); + } + + let iconList = this.#iconMap.get(this.getKey(engineIdentifier)) || []; + return iconList.filter(r => + this.#identifierMatches(engineIdentifier, r.engineIdentifiers) + ); } /** @@ -218,7 +225,7 @@ class IconHandler { Object.entries( await ( await fetch( - "chrome://global/content/search/mullvadBrowserSearchEngineIcons.json" + "chrome://global/content/search/base-browser-search-engine-icons.json" ) ).json() ) ===================================== toolkit/components/search/SearchEngineSelector.sys.mjs ===================================== @@ -2,6 +2,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs"; + /** * @typedef {import("../uniffi-bindgen-gecko-js/components/generated/RustSearch.sys.mjs").SearchEngineSelector} RustSearchEngineSelector * We use "Rust" above to avoid conflict with the class name for the JavaScript wrapper. @@ -92,30 +94,15 @@ export class SearchEngineSelector { return this._getConfigurationPromise; } - this._getConfigurationPromise = Promise.all([ - this._getConfiguration(), - this._getConfigurationOverrides(), - ]); - let remoteSettingsData = await this._getConfigurationPromise; - this._configuration = remoteSettingsData[0]; - this._configurationOverrides = remoteSettingsData[1]; - delete this._getConfigurationPromise; - - if (!this._configuration?.length) { - throw Components.Exception( - "Failed to get engine data from Remote Settings", - Cr.NS_ERROR_UNEXPECTED - ); - } - - if (!this._listenerAdded) { - this._remoteConfig.on("sync", this._onConfigurationUpdated); - this._remoteConfigOverrides.on( - "sync", - this._onConfigurationOverridesUpdated - ); - this._listenerAdded = true; - } + let { promise, resolve } = Promise.withResolvers(); + this._getConfigurationPromise = promise; + this._configuration = await ( + await fetch( + "chrome://global/content/search/base-browser-search-engines.json" + ) + ).json(); + this._configurationOverrides = []; + resolve(this._configuration); if (lazy.SearchUtils.rustSelectorFeatureGate) { this.#selector.setSearchConfig( @@ -242,6 +229,12 @@ export class SearchEngineSelector { * The new configuration object */ _onConfigurationUpdated({ data: { current } }) { + // tor-browser#43525: Even though RemoteSettings are a no-op for us, we do + // not want them to interfere in any way. + if (AppConstants.BASE_BROWSER_VERSION) { + return; + } + this._configuration = current; if (lazy.SearchUtils.rustSelectorFeatureGate) { @@ -268,6 +261,12 @@ export class SearchEngineSelector { * The new configuration object */ _onConfigurationOverridesUpdated({ data: { current } }) { + // tor-browser#43525: Even though RemoteSettings are a no-op for us, we do + // not want them to interfere in any way. + if (AppConstants.BASE_BROWSER_VERSION) { + return; + } + this._configurationOverrides = current; if (lazy.SearchUtils.rustSelectorFeatureGate) { ===================================== toolkit/components/search/SearchService.sys.mjs ===================================== @@ -25,7 +25,6 @@ ChromeUtils.defineESModuleGetters(lazy, { Region: "resource://gre/modules/Region.sys.mjs", RemoteSettings: "resource://services-settings/remote-settings.sys.mjs", SearchEngine: "moz-src:///toolkit/components/search/SearchEngine.sys.mjs", - // eslint-disable-next-line mozilla/valid-lazy SearchEngineSelector: "moz-src:///toolkit/components/search/SearchEngineSelector.sys.mjs", SearchSettings: "moz-src:///toolkit/components/search/SearchSettings.sys.mjs", @@ -579,7 +578,11 @@ export class SearchService { // Test-only function to reset just the engine selector so that it can // load a different configuration. - resetEngineSelector() {} + resetEngineSelector() { + this.#engineSelector = new lazy.SearchEngineSelector( + this.#handleConfigurationUpdated.bind(this) + ); + } resetToAppDefaultEngine() { let appDefaultEngine = this.appDefaultEngine; @@ -1420,6 +1423,10 @@ export class SearchService { // We need to catch the region being updated during initialization so we // start listening straight away. Services.obs.addObserver(this, lazy.Region.REGION_TOPIC); + + this.#engineSelector = new lazy.SearchEngineSelector( + this.#handleConfigurationUpdated.bind(this) + ); } /** @@ -1652,7 +1659,6 @@ export class SearchService { * Handles the search configuration being - adds a wait on the user * being idle, before the search engine update gets handled. */ - // eslint-disable-next-line no-unused-private-class-members #handleConfigurationUpdated() { if (this.#queuedIdle) { return; @@ -2622,12 +2628,21 @@ export class SearchService { // This is prefixed with _ rather than # because it is // called in test_remove_engine_notification_box.js async _fetchEngineSelectorEngines() { - const engines = await ( - await fetch( - "chrome://global/content/search/mullvadBrowserSearchEngines.json" - ) - ).json(); - return { engines, privateDefault: undefined }; + let searchEngineSelectorProperties = { + locale: Services.locale.appLocaleAsBCP47, + region: lazy.Region.home || "unknown", + channel: lazy.SearchUtils.MODIFIED_APP_CHANNEL, + experiment: this._experimentPrefValue, + distroID: lazy.SearchUtils.distroID ?? "", + }; + + for (let [key, value] of Object.entries(searchEngineSelectorProperties)) { + this._settings.setMetaDataAttribute(key, value); + } + + return this.#engineSelector.fetchEngineConfiguration( + searchEngineSelectorProperties + ); } #setDefaultFromSelector(refinedConfig) { ===================================== toolkit/components/search/content/mullvadBrowserSearchEngineIcons.json → toolkit/components/search/content/base-browser-search-engine-icons.json ===================================== @@ -1,27 +1,33 @@ { "ddg": [ - { "url": "chrome://global/content/search/duckduckgo.ico", "iconSize": 32 } + { "url": "chrome://global/content/search/duckduckgo.ico", "imageSize": 32 } ], "ddg-html": [ - { "url": "chrome://global/content/search/duckduckgo.ico", "iconSize": 32 } + { "url": "chrome://global/content/search/duckduckgo.ico", "imageSize": 32 } ], "mullvad-leta": [ - { "url": "chrome://global/content/search/mullvad-leta.svg", "iconSize": 16 } + { + "url": "chrome://global/content/search/mullvad-leta.svg", + "imageSize": 16 + } ], "mojeek": [ - { "url": "chrome://global/content/search/mojeek.ico", "iconSize": 32 } + { "url": "chrome://global/content/search/mojeek.ico", "imageSize": 32 } ], "brave": [ - { "url": "chrome://global/content/search/brave.svg", "iconSize": 16 } + { "url": "chrome://global/content/search/brave.svg", "imageSize": 16 } ], "startpage": [ { "url": "chrome://global/content/search/startpage-16.png", - "iconSize": 16 + "imageSize": 16 }, - { "url": "chrome://global/content/search/startpage-32.png", "iconSize": 32 } + { + "url": "chrome://global/content/search/startpage-32.png", + "imageSize": 32 + } ], "metager": [ - { "url": "chrome://global/content/search/metager.ico", "iconSize": 196 } + { "url": "chrome://global/content/search/metager.ico", "imageSize": 196 } ] } ===================================== toolkit/components/search/content/base-browser-search-engines.json ===================================== @@ -0,0 +1,133 @@ +[ + { + "base": { + "aliases": ["mullvad-leta", "leta", "mullvad", "ml"], + "classification": "general", + "name": "Mullvad Leta", + "urls": { + "search": { + "base": "https://leta.mullvad.net/", + "params": [], + "searchTermParamName": "q" + } + } + }, + "id": "ee88d691-6d7a-4adb-9fec-5a205565505a", + "identifier": "mullvad-leta", + "recordType": "engine", + "variants": [{ "environment": { "allRegionsAndLocales": true } }] + }, + { + "base": { + "aliases": ["duckduckgo", "ddg"], + "classification": "general", + "name": "DuckDuckGo", + "urls": { + "search": { + "base": "https://duckduckgo.com/", + "params": [], + "searchTermParamName": "q" + } + } + }, + "id": "04e99a38-13ee-47d8-8aa4-64482b3dea99", + "identifier": "ddg", + "recordType": "engine", + "variants": [{ "environment": { "allRegionsAndLocales": true } }] + }, + { + "base": { + "aliases": ["ddg-html", "duckduckgohtml", "ddgh"], + "classification": "general", + "name": "DuckDuckGo (HTML)", + "urls": { + "search": { + "base": "https://html.duckduckgo.com/html/", + "params": [], + "searchTermParamName": "q" + } + } + }, + "id": "98d8c84b-7455-431d-98b9-890e7bcc0041", + "identifier": "ddg-html", + "recordType": "engine", + "variants": [{ "environment": { "allRegionsAndLocales": true } }] + }, + { + "base": { + "aliases": ["mojeek", "mj"], + "classification": "general", + "name": "Mojeek", + "urls": { + "search": { + "base": "https://www.mojeek.com/search", + "params": [], + "searchTermParamName": "q" + } + } + }, + "id": "10df12ac-2b39-4aa9-8845-d5b35d5bb70c", + "identifier": "mojeek", + "recordType": "engine", + "variants": [{ "environment": { "allRegionsAndLocales": true } }] + }, + { + "base": { + "aliases": ["brave", "bv"], + "classification": "general", + "name": "Brave Search", + "urls": { + "search": { + "base": "https://search.brave.com/search", + "params": [], + "searchTermParamName": "q" + } + } + }, + "id": "f479314b-030b-49a8-a2fe-7e1c5d1d9071", + "identifier": "brave", + "recordType": "engine", + "variants": [{ "environment": { "allRegionsAndLocales": true } }] + }, + { + "base": { + "aliases": ["startpage", "sp"], + "classification": "general", + "name": "Startpage", + "urls": { + "search": { + "base": "https://www.startpage.com/sp/search", + "params": [], + "searchTermParamName": "q" + } + } + }, + "id": "927bbd9f-b2f3-48b4-8974-1c1148028f4d", + "identifier": "startpage", + "recordType": "engine", + "variants": [{ "environment": { "allRegionsAndLocales": true } }] + }, + { + "base": { + "aliases": ["metager", "mg"], + "classification": "general", + "name": "MetaGer", + "urls": { + "search": { + "base": "https://metager.org/meta/meta.ger3", + "params": [], + "searchTermParamName": "eingabe" + } + } + }, + "id": "a9d07d93-469c-4bf4-8dd1-fa137f1cc85f", + "identifier": "metager", + "recordType": "engine", + "variants": [{ "environment": { "allRegionsAndLocales": true } }] + }, + { + "recordType": "defaultEngines", + "globalDefault": "mullvad-leta", + "globalDefaultPrivate": "mullvad-leta" + } +] ===================================== toolkit/components/search/content/mullvadBrowserSearchEngines.json deleted ===================================== @@ -1,114 +0,0 @@ -[ - { - "aliases": ["mullvad-leta", "leta", "mullvad", "ml"], - "name": "Mullvad Leta", - "urls": { - "search": { - "base": "https://leta.mullvad.net/", - "params": [], - "searchTermParamName": "q" - } - }, - "id": "ee88d691-6d7a-4adb-9fec-5a205565505a", - "identifier": "mullvad-leta", - "recordType": "engine", - "orderHint": 100, - "variants": [] - }, - { - "aliases": ["duckduckgo", "ddg"], - "name": "DuckDuckGo", - "urls": { - "search": { - "base": "https://duckduckgo.com/", - "params": [], - "searchTermParamName": "q" - } - }, - "id": "04e99a38-13ee-47d8-8aa4-64482b3dea99", - "identifier": "ddg", - "recordType": "engine", - "orderHint": 90, - "variants": [] - }, - { - "aliases": ["ddg-html", "duckduckgohtml", "ddgh"], - "name": "DuckDuckGo (HTML)", - "urls": { - "search": { - "base": "https://html.duckduckgo.com/html/", - "params": [], - "searchTermParamName": "q" - } - }, - "id": "98d8c84b-7455-431d-98b9-890e7bcc0041", - "identifier": "ddg-html", - "recordType": "engine", - "orderHint": 80, - "variants": [] - }, - { - "aliases": ["mojeek", "mj"], - "name": "Mojeek", - "urls": { - "search": { - "base": "https://www.mojeek.com/search", - "params": [], - "searchTermParamName": "q" - } - }, - "id": "10df12ac-2b39-4aa9-8845-d5b35d5bb70c", - "identifier": "mojeek", - "recordType": "engine", - "orderHint": 70, - "variants": [] - }, - { - "aliases": ["brave", "bv"], - "name": "Brave Search", - "urls": { - "search": { - "base": "https://search.brave.com/search", - "params": [], - "searchTermParamName": "q" - } - }, - "id": "f479314b-030b-49a8-a2fe-7e1c5d1d9071", - "identifier": "brave", - "recordType": "engine", - "orderHint": 60, - "variants": [] - }, - { - "aliases": ["startpage", "sp"], - "name": "Startpage", - "urls": { - "search": { - "base": "https://www.startpage.com/sp/search", - "params": [], - "searchTermParamName": "q" - } - }, - "id": "049f86fd-28fe-4389-910f-aac28f07d745", - "identifier": "startpage", - "recordType": "engine", - "orderHint": 50, - "variants": [] - }, - { - "aliases": ["metager", "mg"], - "name": "MetaGer", - "urls": { - "search": { - "base": "https://metager.org/meta/meta.ger3", - "params": [], - "searchTermParamName": "eingabe" - } - }, - "id": "a9d07d93-469c-4bf4-8dd1-fa137f1cc85f", - "identifier": "metager", - "recordType": "engine", - "orderHint": 40, - "variants": [] - } -] View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/ac… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/ac… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.2.0esr-15.0-1] 3 commits: dropme! TB 42891: Set the bundled search engine for Tor Browser.
by Pier Angelo Vendrame (＠pierov) 08 Sep '25

08 Sep '25

Pier Angelo Vendrame pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 2404a7c1 by Pier Angelo Vendrame at 2025-09-08T11:39:58+02:00 dropme! TB 42891: Set the bundled search engine for Tor Browser. BB 43525: Skip Remote Settings for search engine customization. Undo some changes to this commit, as they need to be moved to Base Browser. - - - - - 10cd8e31 by Pier Angelo Vendrame at 2025-09-08T11:39:58+02:00 BB 43525: Skip Remote Settings for search engine customization. Also, add some bundled search engines. - - - - - d28d9f49 by Pier Angelo Vendrame at 2025-09-08T11:39:59+02:00 amend! TB 42891: Set the bundled search engine for Tor Browser. TB 42891: Set the bundled search engine for Tor Browser. - - - - - 4 changed files: - toolkit/components/search/AppProvidedSearchEngine.sys.mjs - toolkit/components/search/SearchEngineSelector.sys.mjs - toolkit/components/search/content/torBrowserSearchEngineIcons.json → toolkit/components/search/content/base-browser-search-engine-icons.json - toolkit/components/search/content/torBrowserSearchEngines.json → toolkit/components/search/content/base-browser-search-engines.json Changes: ===================================== toolkit/components/search/AppProvidedSearchEngine.sys.mjs ===================================== @@ -116,8 +116,10 @@ class IconHandler { await this.#buildIconMap(); } - return this.#iconMap.get(engineIdentifier); - // eslint-disable-next-line no-unreachable + if (AppConstants.BASE_BROWSER_VERSION) { + return this.#iconMap.get(engineIdentifier); + } + let iconList = this.#iconMap.get(this.getKey(engineIdentifier)) || []; return iconList.filter(r => this.#identifierMatches(engineIdentifier, r.engineIdentifiers) @@ -223,7 +225,7 @@ class IconHandler { Object.entries( await ( await fetch( - "chrome://global/content/search/torBrowserSearchEngineIcons.json" + "chrome://global/content/search/base-browser-search-engine-icons.json" ) ).json() ) ===================================== toolkit/components/search/SearchEngineSelector.sys.mjs ===================================== @@ -97,7 +97,9 @@ export class SearchEngineSelector { let { promise, resolve } = Promise.withResolvers(); this._getConfigurationPromise = promise; this._configuration = await ( - await fetch("chrome://global/content/search/torBrowserSearchEngines.json") + await fetch( + "chrome://global/content/search/base-browser-search-engines.json" + ) ).json(); this._configurationOverrides = []; resolve(this._configuration); ===================================== toolkit/components/search/content/torBrowserSearchEngineIcons.json → toolkit/components/search/content/base-browser-search-engine-icons.json ===================================== @@ -1,15 +1,9 @@ { "ddg": [ - { - "url": "chrome://global/content/search/duckduckgo.ico", - "imageSize": 32 - } + { "url": "chrome://global/content/search/duckduckgo.ico", "imageSize": 32 } ], "ddg-onion": [ - { - "url": "chrome://global/content/search/duckduckgo.ico", - "imageSize": 32 - } + { "url": "chrome://global/content/search/duckduckgo.ico", "imageSize": 32 } ], "startpage": [ { @@ -32,9 +26,6 @@ } ], "wikipedia": [ - { - "url": "chrome://global/content/search/wikipedia.ico", - "imageSize": 32 - } + { "url": "chrome://global/content/search/wikipedia.ico", "imageSize": 32 } ] } ===================================== toolkit/components/search/content/torBrowserSearchEngines.json → toolkit/components/search/content/base-browser-search-engines.json ===================================== @@ -15,13 +15,7 @@ "id": "04e99a38-13ee-47d8-8aa4-64482b3dea99", "identifier": "ddg", "recordType": "engine", - "variants": [ - { - "environment": { - "allRegionsAndLocales": true - } - } - ] + "variants": [{ "environment": { "allRegionsAndLocales": true } }] }, { "base": { @@ -39,13 +33,7 @@ "id": "1e431da4-a60c-4411-9251-a95a841d451f", "identifier": "ddg-onion", "recordType": "engine", - "variants": [ - { - "environment": { - "allRegionsAndLocales": true - } - } - ] + "variants": [{ "environment": { "allRegionsAndLocales": true } }] }, { "base": { @@ -63,13 +51,7 @@ "id": "927bbd9f-b2f3-48b4-8974-1c1148028f4d", "identifier": "startpage", "recordType": "engine", - "variants": [ - { - "environment": { - "allRegionsAndLocales": true - } - } - ] + "variants": [{ "environment": { "allRegionsAndLocales": true } }] }, { "base": { @@ -87,13 +69,7 @@ "id": "e7eaba8d-6b9e-43fb-a799-b01b096c03ff", "identifier": "startpage-onion", "recordType": "engine", - "variants": [ - { - "environment": { - "allRegionsAndLocales": true - } - } - ] + "variants": [{ "environment": { "allRegionsAndLocales": true } }] }, { "base": { @@ -111,13 +87,7 @@ "id": "7f6d23c2-191e-483e-af3a-ce6451e3a8dd", "identifier": "wikipedia", "recordType": "engine", - "variants": [ - { - "environment": { - "allRegionsAndLocales": true - } - } - ] + "variants": [{ "environment": { "allRegionsAndLocales": true } }] }, { "recordType": "defaultEngines", View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/d244ff… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/d244ff… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-140.2.0esr-15.0-1] BB 43664: Automatically check the PBM checkbox when in always-on PBM.
by Pier Angelo Vendrame (＠pierov) 05 Sep '25

05 Sep '25

Pier Angelo Vendrame pushed to branch mullvad-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Mullvad Browser Commits: ac67b549 by Pier Angelo Vendrame at 2025-09-05T18:56:43+02:00 BB 43664: Automatically check the PBM checkbox when in always-on PBM. - - - - - 1 changed file: - browser/base/content/browser-addons.js Changes: ===================================== browser/base/content/browser-addons.js ===================================== @@ -20,6 +20,7 @@ ChromeUtils.defineESModuleGetters(lazy, { ExtensionPermissions: "resource://gre/modules/ExtensionPermissions.sys.mjs", OriginControls: "resource://gre/modules/ExtensionPermissions.sys.mjs", PERMISSION_L10N: "resource://gre/modules/ExtensionPermissionMessages.sys.mjs", + PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs", SITEPERMS_ADDON_TYPE: "resource://gre/modules/addons/siteperms-addon-utils.sys.mjs", }); @@ -466,7 +467,9 @@ customElements.define( this.notification.options.customElementOptions; let checkboxEl = this.ownerDocument.createElement("moz-checkbox"); - checkboxEl.checked = grantPrivateBrowsingAllowed; + checkboxEl.checked = + grantPrivateBrowsingAllowed || + lazy.PrivateBrowsingUtils.permanentPrivateBrowsing; checkboxEl.addEventListener("change", () => { // NOTE: the popupnotification instances will be reused // and so the callback function is destructured here to View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/ac6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/ac6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-140.2.0esr-15.0-1] BB 43664: Automatically check the PBM checkbox when in always-on PBM.
by Pier Angelo Vendrame (＠pierov) 05 Sep '25

05 Sep '25

Pier Angelo Vendrame pushed to branch base-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: d0b3fa67 by Pier Angelo Vendrame at 2025-09-05T18:56:10+02:00 BB 43664: Automatically check the PBM checkbox when in always-on PBM. - - - - - 1 changed file: - browser/base/content/browser-addons.js Changes: ===================================== browser/base/content/browser-addons.js ===================================== @@ -20,6 +20,7 @@ ChromeUtils.defineESModuleGetters(lazy, { ExtensionPermissions: "resource://gre/modules/ExtensionPermissions.sys.mjs", OriginControls: "resource://gre/modules/ExtensionPermissions.sys.mjs", PERMISSION_L10N: "resource://gre/modules/ExtensionPermissionMessages.sys.mjs", + PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs", SITEPERMS_ADDON_TYPE: "resource://gre/modules/addons/siteperms-addon-utils.sys.mjs", }); @@ -466,7 +467,9 @@ customElements.define( this.notification.options.customElementOptions; let checkboxEl = this.ownerDocument.createElement("moz-checkbox"); - checkboxEl.checked = grantPrivateBrowsingAllowed; + checkboxEl.checked = + grantPrivateBrowsingAllowed || + lazy.PrivateBrowsingUtils.permanentPrivateBrowsing; checkboxEl.addEventListener("change", () => { // NOTE: the popupnotification instances will be reused // and so the callback function is destructured here to View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/d0b3fa6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/d0b3fa6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.2.0esr-15.0-1] BB 43664: Automatically check the PBM checkbox when in always-on PBM.
by Pier Angelo Vendrame (＠pierov) 05 Sep '25

05 Sep '25

Pier Angelo Vendrame pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: d244ff5a by Pier Angelo Vendrame at 2025-09-04T18:30:26+02:00 BB 43664: Automatically check the PBM checkbox when in always-on PBM. - - - - - 1 changed file: - browser/base/content/browser-addons.js Changes: ===================================== browser/base/content/browser-addons.js ===================================== @@ -20,6 +20,7 @@ ChromeUtils.defineESModuleGetters(lazy, { ExtensionPermissions: "resource://gre/modules/ExtensionPermissions.sys.mjs", OriginControls: "resource://gre/modules/ExtensionPermissions.sys.mjs", PERMISSION_L10N: "resource://gre/modules/ExtensionPermissionMessages.sys.mjs", + PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs", SITEPERMS_ADDON_TYPE: "resource://gre/modules/addons/siteperms-addon-utils.sys.mjs", }); @@ -466,7 +467,9 @@ customElements.define( this.notification.options.customElementOptions; let checkboxEl = this.ownerDocument.createElement("moz-checkbox"); - checkboxEl.checked = grantPrivateBrowsingAllowed; + checkboxEl.checked = + grantPrivateBrowsingAllowed || + lazy.PrivateBrowsingUtils.permanentPrivateBrowsing; checkboxEl.addEventListener("change", () => { // NOTE: the popupnotification instances will be reused // and so the callback function is destructured here to View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/d244ff5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/d244ff5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] MB 463: Fix typo in MimeType entry in .desktop file included in deb/rpm package
by boklm (＠boklm) 04 Sep '25

04 Sep '25

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 4c8683ec by Nicolas Vigier at 2025-09-04T16:03:43+02:00 MB 463: Fix typo in MimeType entry in .desktop file included in deb/rpm package - - - - - 1 changed file: - projects/linux-packages/browser.desktop.in Changes: ===================================== projects/linux-packages/browser.desktop.in ===================================== @@ -10,6 +10,6 @@ Icon=[% c("var/system_pkg/pkg_name") %] StartupNotify=true StartupWMClass=[% c("var/display_name") %] [% IF ! c("var/tor-browser") -%] -MimeType=text/html;text/xml;application/xhtml_xml;x-scheme-handler/http;x-scheme-handler/https; +MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https; [% END -%] Terminal=false View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-143.0a1-16.0-1] 235 commits: BB 41454: Move focus after calling openPreferences for a sub-category.
by brizental (＠brizental) 04 Sep '25

04 Sep '25

brizental pushed to branch tor-browser-143.0a1-16.0-1 at The Tor Project / Applications / Tor Browser Commits: e1e2b747 by Henry Wilkes at 2025-08-28T15:29:32+02:00 BB 41454: Move focus after calling openPreferences for a sub-category. Temporary fix until mozilla bug 1799153 gets a patch upstream. - - - - - e6e31c85 by Henry Wilkes at 2025-08-28T15:29:33+02:00 BB 43072: Add aria label and description to moz-message-bar. Ensures that moz-message-bar, including notifications, are announced on Orca. This addresses upstream bugzilla bug 1895857 and should likely be replaced when it is fixed. - - - - - 5453b4f4 by Henry Wilkes at 2025-08-28T15:29:33+02:00 BB 42739: Use the brand name for profile error messages. Some messages in profileSelection.properties use gAppData->name as variable inputs. However, gAppData->name is still "Firefox" for our base-browser builds, rather than the user-facing browser name. We swap these instances with the displayed brand name instead. - - - - - a632aa50 by Henry Wilkes at 2025-08-28T15:29:34+02:00 BB 41483: Remove the firefox override for appstrings.properties Remove this patch after upstream bugzilla bug 1790187 - - - - - 40a7c81a by Marco Simonelli at 2025-08-28T15:29:35+02:00 BB 41459: WebRTC fails to build under mingw (Part 1) - properly define NOMINMAX for just MSVC builds - - - - - c97ea65d by Marco Simonelli at 2025-08-28T15:30:23+02:00 BB 41459: WebRTC fails to build under mingw (Part 2) - fixes required to build third_party/libwebrtc - - - - - e26b89ea by Marco Simonelli at 2025-08-28T15:30:26+02:00 BB 41459: WebRTC fails to build under mingw (Part 3) - fixes required to build third_party/sipcc - - - - - a4aa224e by Marco Simonelli at 2025-08-28T15:30:27+02:00 BB 41459: WebRTC fails to build under mingw (Part 4) - fixes requried to build netwerk/sctp - - - - - 0e44237d by Marco Simonelli at 2025-08-28T18:54:23+02:00 BB 41459: WebRTC fails to build under mingw (Part 5) - fixes required to build dom/media/webrtc - - - - - 7a5fcc49 by Marco Simonelli at 2025-08-28T18:54:24+02:00 BB 41459: WebRTC fails to build under mingw (Part 6) - fixes required to build dom/media/systemservices - - - - - db9c9201 by june wilde at 2025-08-28T18:54:25+02:00 BB 42758: Fix WebRTC build errors. - - - - - 64f0da68 by hackademix at 2025-08-28T18:54:25+02:00 BB 41854: Allow overriding download spam protection. - - - - - 45fd3c62 by hackademix at 2025-08-28T18:54:26+02:00 BB 42832: Download spam prevention exemption for browser extensions. - - - - - 0b808fb7 by Pier Angelo Vendrame at 2025-08-28T18:54:27+02:00 BB 42220: Allow for more file types to be forced-inline. Firefox allows to open some files in the browser without any confirmation, but this will result in a disk leak, because the file will be downloaded to the temporary directory first (and not deleted, in some cases). A preference allows PDFs to be opened without being downloaded to disk. So, we introduce a similar one to do the same for all the files that are set to be opened automatically in the browser. - - - - - ae063e87 by hackademix at 2025-08-28T18:54:27+02:00 BB 42835: Create an actor to filter file data transfers - - - - - 117fe200 by Beatriz Rizental at 2025-08-28T18:54:28+02:00 BB 42728: Modify ./mach lint to skip unused linters - - - - - f8a5665f by Morgan at 2025-08-28T18:54:29+02:00 BB 43615: Add Gitlab Issue and Merge Request templates - - - - - 71e9c3a2 by Henry Wilkes at 2025-09-04T10:41:35+02:00 BB 41803: Add some developer tools for working on tor-browser. - - - - - 75861368 by Richard Pospesel at 2025-09-04T10:41:36+02:00 BB 42683: Create script to generate issue triage csv file from bugzilla query and git logs - - - - - 71d9ef5f by Henry Wilkes at 2025-09-04T10:41:36+02:00 BB 42305: Add script to combine translation files across versions. - - - - - 076c877a by Beatriz Rizental at 2025-09-04T10:41:37+02:00 BB 43535: Enable tests - - - - - 2cfb7305 by Beatriz Rizental at 2025-09-04T11:31:51+02:00 Add CI for Base Browser - - - - - 97d534ba by Pier Angelo Vendrame at 2025-09-04T11:32:14+02:00 Base Browser's .mozconfigs. Bug 17858: Cannot create incremental MARs for hardened builds. Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff (which is part of mar-tools and is not distributed to end-users) with ASan. Bug 21849: Don't allow SSL key logging. Bug 25741 - TBA: Disable features at compile-time Define MOZ_ANDROID_NETWORK_STATE and MOZ_ANDROID_LOCATION Bug 27623 - Export MOZILLA_OFFICIAL during desktop builds This fixes a problem where some preferences had the wrong default value. Also see bug 27472 where we made a similar fix for Android. Bug 29859: Disable HLS support for now Bug 30463: Explicitly disable MOZ_TELEMETRY_REPORTING Bug 32493: Disable MOZ_SERVICES_HEALTHREPORT Bug 33734: Set MOZ_NORMANDY to False Bug 33851: Omit Parental Controls. Bug 40252: Add --enable-rust-simd to our tor-browser mozconfig files Bug 41584: Move some configuration options to base-browser level - - - - - 04d34cf3 by Pier Angelo Vendrame at 2025-09-04T11:32:15+02:00 fixup! Base Browser's .mozconfigs. BB 44067: Build geckodriver only on Linux. After Bug 1908788, geckodriver has become a host tool. So, even when we cross-compile, we get Linux binaries, and we stopped shipping them in tor-browser-build. Therefore, we can disable also their compilation. - - - - - ba9dad36 by Pier Angelo Vendrame at 2025-09-04T11:32:15+02:00 Tweaks to the build system Bug 40857: Modified the fat .aar creation file This is a workaround to build fat .aars with the compiling enviornment disabled. Mozilla does not use a similar configuration, but either runs a Firefox build and discards its output, or uses artifacts build. We might switch to artifact builds too, and drop this patch, or write a better one to upstream. But until then we need this patch. See also https://bugzilla.mozilla.org/show_bug.cgi?id=1763770. Bug 41458: Prevent `mach package-multi-locale` from actually creating a package macOS builds need some files to be moved around with ./mach package-multi-locale to create multi-locale packages. The required command isn't exposed through any other mach command. So, we patch package-multi-locale both to prevent it from failing when doing official builds and to detect any future changes on it. - - - - - c450d3ca by Pier Angelo Vendrame at 2025-09-04T11:32:16+02:00 BB 29320: Replace the gnu target with gnullvm for Rust. - - - - - eaf64e78 by Pier Angelo Vendrame at 2025-09-04T11:32:17+02:00 BB 42616: Remove VideoCaptureTest.kt. This is a workaround to fix the GeckoView build with WebRTC disabled. We should replace this workaround with a proper solution, that excludes this test when MOZ_WEBRTC is undefined/False. - - - - - 9184bdbf by Pier Angelo Vendrame at 2025-09-04T11:32:17+02:00 BB 41108: Remove privileged macOS installation from 102 - - - - - 942d3289 by Dan Ballard at 2025-09-04T11:32:18+02:00 BB 41149: Re-enable DLL injection protection in all builds not just nightlies - - - - - ecc69aea by Henry Wilkes at 2025-09-04T11:32:19+02:00 BB 43092: Disable wayland by default in Base Browser. - - - - - 9c391c8a by Matthew Finkel at 2025-09-04T11:32:19+02:00 BB 24796: Comment out excess permissions from GeckoView The GeckoView AndroidManifest.xml is not preprocessed unlike Fennec's manifest, so we can't use the ifdef preprocessor guards around the permissions we do not want. Commenting the permissions is the next-best-thing. - - - - - 3492fd02 by Matthew Finkel at 2025-09-04T11:32:20+02:00 BB 28125: Prevent non-Necko network connections - - - - - f4207662 by Mike Perry at 2025-09-04T11:32:21+02:00 BB 12974: Disable NTLM and Negotiate HTTP Auth The Mozilla bugs: https://bugzilla.mozilla.org/show_bug.cgi?id=1046421, https://bugzilla.mozilla.org/show_bug.cgi?id=1261591, tor-browser#27602 - - - - - d93b1c43 by cypherpunks1 at 2025-09-04T11:32:21+02:00 BB 40717: Hide Windows SSO in settings - - - - - 568b2d84 by Georg Koppen at 2025-09-04T11:32:22+02:00 BB 16285: Exclude ClearKey system for now In the past the ClearKey system had not been compiled when specifying --disable-eme. But that changed and it is even bundled nowadays (see: Mozilla's bug 1300654). We don't want to ship it right now as the use case for it is not really visible while the code had security vulnerabilities in the past. - - - - - 2111fc02 by Kathy Brade at 2025-09-04T11:32:23+02:00 BB 21431: Clean-up system extensions shipped in Firefox Only ship the pdfjs extension. - - - - - 08c19df9 by Kathy Brade at 2025-09-04T11:32:23+02:00 BB 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc. Hide elements on about:logins that mention sync, "Firefox LockWise", and Mozilla's LockWise mobile apps. Disable the "Create New Login" button when security.nocertdb is true. - - - - - 0a1f9b37 by Alex Catarineu at 2025-09-04T11:32:24+02:00 BB 41457: Remove Mozilla permissions Bug 40025: Remove Mozilla add-on install permissions - - - - - 1c124f70 by Kathy Brade at 2025-09-04T11:32:25+02:00 BB 41662: Disable about:sync-logs Even though we disable sync by default with `identity.fxaccounts.enabled`, this about: page is still avilable. We could throw an exception on the constructor of the related component, but it would result only in an error in the console, without a visible "this address does not look right" error page. If we fix the issues with MOZ_SERVICES_SYNC, we can restore the component. - - - - - 9e627ca1 by Morgan at 2025-09-04T11:32:25+02:00 BB 42716: Disable unwanted about: pages - - - - - 39d9a79c by Arthur Edelstein at 2025-09-04T11:32:26+02:00 BB 26353: Prevent speculative connect that violated FPI. Connections were observed in the catch-all circuit when the user entered an https or http URL in the URL bar, or typed a search term. - - - - - ab224ebc by Alex Catarineu at 2025-09-04T11:32:27+02:00 BB 31740: Remove some unnecessary RemoteSettings instances More concretely, SearchService.jsm 'hijack-blocklists' and url-classifier-skip-urls. Avoid creating instance for 'anti-tracking-url-decoration'. If prefs are disabling their usage, avoid creating instances for 'cert-revocations' and 'intermediates'. Do not ship JSON dumps for collections we do not expect to need. For the ones in the 'main' bucket, this prevents them from being synced unnecessarily (the code in remote-settings does so for collections in the main bucket for which a dump or local data exists). For the collections in the other buckets, we just save some size by not shipping their dumps. We also clear the collections database on the v2 -> v3 migration. - - - - - aaa7ef46 by cypherpunks1 at 2025-09-04T11:32:28+02:00 BB 41092: Add a RemoteSettings JSON dump for query-stripping - - - - - 030aff1a by cypherpunks1 at 2025-09-04T15:10:14+02:00 BB 42730: Patch RemoteSettings to use only local dumps as a data source - - - - - 0a6e889b by Pier Angelo Vendrame at 2025-09-04T15:10:21+02:00 BB 41635: Disable the Normandy component Do not include Normandy at all whenever MOZ_NORMANDY is False. - - - - - df344c4c by Georg Koppen at 2025-09-04T15:10:22+02:00 BB 30541: Disable WebGL readPixel() for web content Related Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1428034 - - - - - bd92c917 by Alex Catarineu at 2025-09-04T15:10:23+02:00 BB 28369: Stop shipping pingsender executable - - - - - f34e0072 by Henry Wilkes at 2025-09-04T15:10:23+02:00 BB 42630: Disable LaterRun module. - - - - - cce97144 by Pier Angelo Vendrame at 2025-09-04T15:10:24+02:00 BB 41599: Always return an empty string as network ID Firefox computes an internal network ID used to detect network changes and act consequently (e.g., to improve WebSocket UX). However, there are a few ways to get this internal network ID, so we patch them out, to be sure any new code will not be able to use them and possibly link users. We also sent a patch to Mozilla to seed the internal network ID, to prevent any accidental leak in the future. Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1817756 - - - - - 633376ec by Pier Angelo Vendrame at 2025-09-04T15:10:25+02:00 BB 43386: Use Firefox in the UA in RFP-exempt request. XHR requests initiated by extensions are exempt from RFP. Therefore, they report the actual app name, instead of Firefox, and the actual Firefox minor version. This happens whenever the app name has been customized and does not match a hardcoded "Firefox". - - - - - 8d1c714d by Richard Pospesel at 2025-09-04T15:10:25+02:00 BB 41327: Disable UrlbarProviderInterventions - - - - - abc725f1 by Richard Pospesel at 2025-09-04T15:10:26+02:00 BB 42037: Disable about:firefoxview page - - - - - 9fa26714 by Mike Perry at 2025-09-04T15:10:27+02:00 Firefox preference overrides. - - - - - afd03e1a by Beatriz Rizental at 2025-09-04T15:10:28+02:00 fixup! Firefox preference overrides. - - - - - c5bc2f73 by Pier Angelo Vendrame at 2025-09-04T15:10:29+02:00 fixup! Firefox preference overrides. BB 44062: Enable touch events on Windows and Android. Auto-detection makes some properties available on the global scope only when touch support is actually available, but this introduces entorpy. Let's force touch enabled in Windows+Android and disable it elsewhere. This improves consistency with the spoofed number of touch points. - - - - - d4eb37b7 by Pier Angelo Vendrame at 2025-09-04T15:10:29+02:00 fixup! Firefox preference overrides. BB 44026: Disable the modal with upstream's ToU. We disable data collection, so those terms do not apply to us. Indeed, currently this feature is already gated on the datareporting pref, but since upstream is refactoring these prefs, adding an explicit one seems a good idea. Also, move the datareporting prefs closer to telemetry. - - - - - 8220aff3 by Pier Angelo Vendrame at 2025-09-04T15:10:30+02:00 BB 43140: Tighten up fonts on Linux. We ship a fontconfig configuration to esnure all Linux users have the same defaults and reduce the chances of fingerprinting. We used to add this file in tor-browser-build, but some users might skip it by using the browser executable without the wrapper script. Therefore, we decided to activate the file with the FontConfig API instead of the environment variables. Bug 41043: Hardcode the UI font on Linux The mechanism to choose the UI font does not play well with our fontconfig configuration. As a result, the final criterion to choose the font for the UI was its version. Since we hardcode Arimo as a default sans-serif on preferences, we use it also for the UI. FontConfig will fall back to some other font for scripts Arimo does not cover as expected (we tested with Japanese). Bug 43141: Hardcode system-ui to Arimo. - - - - - 5ce2c6e1 by Pier Angelo Vendrame at 2025-09-04T15:10:31+02:00 BB 43322: Customize the font visibility lists. Customize the lists of fonts to assign base visibility to in base browser and derivatives. Also, rename the files with the upstream lists, to make sure we do not use them by mistake. - - - - - 796be49d by Alex Catarineu at 2025-09-04T15:10:32+02:00 BB 30605: Honor privacy.spoof_english in Android This checks `privacy.spoof_english` whenever `setLocales` is called from Fenix side and sets `intl.accept_languages` accordingly. Bug 40198: Expose privacy.spoof_english pref in GeckoView - - - - - 7035bbcb by Pier Angelo Vendrame at 2025-09-04T15:10:32+02:00 BB 42562: Normalized the Accepted Languages on Android. The OS language might be outside the list of actually supported languages and it might leak the user's region. Therefore, we force the locale reported in Accept-Language to match one we support with translations, even when it means using a not exact region tag. - - - - - 6490a7e9 by Alex Catarineu at 2025-09-04T15:10:33+02:00 BB 40171: Make WebRequest and GeckoWebExecutor First-Party aware - - - - - 6ad157e8 by Alex Catarineu at 2025-09-04T15:10:34+02:00 BB 26345: Hide tracking protection UI - - - - - 7f0a2f76 by Henry Wilkes at 2025-09-04T15:10:35+02:00 BB 43109: Hide Firefox Relay from settings. This should remain disabled, see tor-browser#42814. - - - - - 1039dfe9 by Henry Wilkes at 2025-09-04T15:10:35+02:00 BB 42777: Hide Website Privacy Preferences. We hide the Website Privacy Preferences section, which controls the "global privacy control" (GPC) and "do not track" (DNT) settings. - - - - - fc4d261e by Morgan at 2025-09-04T15:10:36+02:00 BB 42070: Hide "Use smooth scrolling" from settings - - - - - 0599f636 by Arthur Edelstein at 2025-09-04T15:10:37+02:00 BB 18905: Hide unwanted items from help menu Bug 25660: Remove the "New Private Window" option - - - - - f8ddd40b by Pier Angelo Vendrame at 2025-09-04T15:10:38+02:00 BB 41739: Remove "Website appearance" from about:preferences. It is ignored because of RFP and it is confusing for users. - - - - - 90920fc5 by Henry Wilkes at 2025-09-04T15:10:38+02:00 BB 43117: Hide "Always underline links" from settings. - - - - - a5f3b2b7 by Pier Angelo Vendrame at 2025-09-04T15:10:39+02:00 BB 42774: Always hide the third-pary certs UI. - - - - - ace2de5b by Henry Wilkes at 2025-09-04T15:10:40+02:00 BB 43118: Hide feature recommendation (CFR) settings. - - - - - 1b2f4542 by Pier Angelo Vendrame at 2025-09-04T15:10:41+02:00 BB 9173: Change the default Firefox profile directory to be relative. This commit makes Firefox look for the default profile directory in a directory relative to the binary path. The directory can be specified through the --with-relative-data-dir. This is relative to the same directory as the firefox main binary for Linux and Windows. On macOS, we remove Contents/MacOS from it. Or, in other words, the directory is relative to the application bundle. This behavior can be overriden at runtime, by placing a file called system-install adjacent to the firefox main binary (also on macOS). - - - - - 4651352a by Pier Angelo Vendrame at 2025-09-04T15:10:41+02:00 BB 42773: Replace ~ with the original home. In Bug 93141, Mozilla started sending users to their home when they type ~ in the URL bar. On Linux, we change $HOME for various reason, therefore you would be redirected to the spoofed home directory when typing ~. So, we check if the original home directory is known, and use that, instead. - - - - - e1026e01 by Alex Catarineu at 2025-09-04T15:10:42+02:00 BB 27604: Fix addon issues when moving the profile directory Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1429838 - - - - - 8ddeac42 by Mike Perry at 2025-09-04T15:10:43+02:00 BB 13028: Prevent potential proxy bypass cases. It looks like these cases should only be invoked in the NSS command line tools, and not the browser, but I decided to patch them anyway because there literally is a maze of network function pointers being passed around, and it's very hard to tell if some random code might not pass in the proper proxied versions of the networking code here by accident. Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1433509 - - - - - c3f26e89 by Pier Angelo Vendrame at 2025-09-04T15:10:44+02:00 BB 40309: Avoid using regional OS locales Avoid regional OS locales if the pref `intl.regional_prefs.use_os_locales` is false but RFP is enabled. - - - - - 6a0a24f8 by Matthew Finkel at 2025-09-04T15:10:44+02:00 BB 40432: Prevent probing installed applications Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1711084 - - - - - bc1fce52 by Henry Wilkes at 2025-09-04T15:10:45+02:00 BB 29745: Limit remote access to content accessible resources - - - - - 1a5f56b3 by cypherpunks1 at 2025-09-04T15:10:46+02:00 BB 33955: When copying an image only copy the image contents to the clipboard - - - - - ea85fc35 by cypherpunks1 at 2025-09-04T15:10:46+02:00 BB 41791: Omit the source URL when copying page contents to the clipboard - - - - - 9e9aaabb by Pier Angelo Vendrame at 2025-09-04T15:10:47+02:00 BB 43196: Remove the vendor name from media notifications on Linux. Firefox shows "vendor remoteName" as a title of the "... is playing media" notification on Linux. However, for our browser the remote name is enough, and prepending the vendor to it creates a string users usually never see. - - - - - ca6a906b by Pier Angelo Vendrame at 2025-09-04T15:10:48+02:00 Base Browser strings This commit adds all the strings needed by following Base Browser patches. - - - - - 14fe1960 by Henry Wilkes at 2025-09-04T15:10:49+02:00 BB 42583: Modify moz-support-link for Base Browser. - - - - - cccd5ff9 by Henry Wilkes at 2025-09-04T15:10:49+02:00 fixup! BB 42583: Modify moz-support-link for Base Browser. TB 43864: Move moz-support-link "preferences" patch to base-browser. - - - - - 6c543932 by Pier Angelo Vendrame at 2025-09-04T15:10:50+02:00 BB 41369: Improve Firefox language settings for multi-lingual packages Change the language selector to be sorted by language code, rather than name, and to display the language code to the user. Bug 41372: Handle Japanese as a special case in preferences on macOS Japanese is treated in a special way on macOS. However, seeing the Japanese language tag could be confusing for users, and moreover the language name is not localized correctly like other langs. Bug 41378: Tell users that they can change their language at the first start With multi-lingual builds, Tor Browser matches the user's system language, but some users might want to change it. So, we tell them that it is possible, but only once. - - - - - 6b9573fb by p13dz at 2025-09-04T15:10:51+02:00 BB 40283: Workaround for the file upload bug - - - - - c794a922 by hackademix at 2025-09-04T15:10:52+02:00 BB 42019: Empty browser's clipboard on browser shutdown - - - - - 9745a34c by hackademix at 2025-09-04T15:10:52+02:00 BB 42084: Ensure English spoofing works even if preferences are set out of order. - - - - - 13fc3573 by Pier Angelo Vendrame at 2025-09-04T15:10:53+02:00 BB 41930: Remove the UI to customize accept_languages. - - - - - cc34dccb by hackademix at 2025-09-04T15:10:54+02:00 BB 32308: Use direct browser sizing for letterboxing. Bug 30556: align letterboxing with 200x100 new win width stepping - - - - - 6eaf4583 by hackademix at 2025-09-04T15:10:55+02:00 fixup! BB 32308: Use direct browser sizing for letterboxing. BB 44041: Use fixed positioning to make dialog overlays cover the whole content of letterboxed tabs. - - - - - a259e03d by hackademix at 2025-09-04T15:10:55+02:00 BB 41631: Prevent weird initial window dimensions caused by subpixel computations - - - - - 0f624996 by hackademix at 2025-09-04T15:10:56+02:00 BB 41918: Option to reuse last window size when letterboxing is enabled. - - - - - 2dfa0fe0 by hackademix at 2025-09-04T15:10:57+02:00 BB 41916: Letterboxing preferences UI - - - - - 17916a32 by hackademix at 2025-09-04T15:10:58+02:00 BB 41695: Warn on window maximization without letterboxing in RFPHelper module - - - - - 93671384 by hackademix at 2025-09-04T15:10:58+02:00 BB 42443: Shrink window to match letterboxing size when the emtpy area is clicked. - - - - - 523ba8f8 by hackademix at 2025-09-04T15:10:59+02:00 BB 41919: Letterboxing, add temporarily visible web content-size indicator on window resizing. - - - - - 4609de43 by Henry Wilkes at 2025-09-04T15:11:00+02:00 BB 42528: Don't leak system scrollbar size on windows. - - - - - 0e9dd8a1 by Henry Wilkes at 2025-09-04T15:11:01+02:00 BB 31575: Disable Firefox Home (Activity Stream) Treat about:blank as the default home page and new tab page. BB 43886: Disable the newtab component/addon. Bug 41624: Disable about:pocket-* pages. Bug 40144: Redirect about:privatebrowsing to the user's home - - - - - 3a60222d by Kathy Brade at 2025-09-04T15:11:01+02:00 BB 4234: Use the Firefox Update Process for Base Browser. Windows: disable "runas" code path in updater (15201). Windows: avoid writing to the registry (16236). Also includes fixes for tickets 13047, 13301, 13356, 13594, 15406, 16014, 16909, 24476, and 25909. Also fix bug 27221: purge the startup cache if the Base Browser version changed (even if the Firefox version and build ID did not change), e.g., after a minor Base Browser update. Also fix 32616: Disable GetSecureOutputDirectoryPath() functionality. Bug 26048: potentially confusing "restart to update" message Within the update doorhanger, remove the misleading message that mentions that windows will be restored after an update is applied, and replace the "Restart and Restore" button label with an existing "Restart to update Tor Browser" string. Bug 28885: notify users that update is downloading Add a "Downloading Base Browser update" item which appears in the hamburger (app) menu while the update service is downloading a MAR file. Before this change, the browser did not indicate to the user that an update was in progress, which is especially confusing in Tor Browser because downloads often take some time. If the user clicks on the new menu item, the about dialog is opened to allow the user to see download progress. As part of this fix, the update service was changed to always show update-related messages in the hamburger menu, even if the update was started in the foreground via the about dialog or via the "Check for Tor Browser Update" toolbar menu item. This change is consistent with the Tor Browser goal of making sure users are informed about the update process. Removed #28885 parts of this patch which have been uplifted to Firefox. - - - - - 22d3dca0 by Pier Angelo Vendrame at 2025-09-04T15:11:02+02:00 BB 42061: Create an alpha update channel. - - - - - a117c1e4 by Nicolas Vigier at 2025-09-04T15:11:03+02:00 BB 41682: Add base-browser nightly mar signing key - - - - - cfbc29da by Pier Angelo Vendrame at 2025-09-04T15:11:04+02:00 BB 41603: Customize the creation of MOZ_SOURCE_URL MOZ_SOURCE_URL is created by combining MOZ_SOURCE_REPO and MOZ_SOURCE_CHANGESET. But the code takes for granted that it refers to a Hg instance, so it combines them as `$MOZ_SOURCE_REPO/rev/$MOZ_SOURCE_CHANGESET`. With this commit, we change this logic to combine them to create a URL that is valid for GitLab. $MOZ_SOURCE_CHANGESET needs to be a commit hash, not a branch or a tag. If that is needed, we could use /-/tree/, instead of /-/commit/. - - - - - 034b555b by Pier Angelo Vendrame at 2025-09-04T15:11:04+02:00 BB 42438: Tweaks to the migration wizard. Remove the items not compatible with our features (such as history) from the migration wizard. On Linux, allow to specify an alternative home directory, since we usually change $HOME in our startup script. - - - - - 11758ef9 by Alex Catarineu at 2025-09-04T15:11:05+02:00 BB 40069: Add helpers for message passing with extensions - - - - - 7c8317f7 by Matthew Finkel at 2025-09-04T15:11:06+02:00 BB 41598: Prevent NoScript from being removed/disabled. Bug 40253: Explicitly allow NoScript in Private Browsing mode. - - - - - c30e9588 by Henry Wilkes at 2025-09-04T15:11:07+02:00 BB 41581: Hide NoScript extension's toolbar button by default. This hides it from both the toolbar and the unified extensions panel. We also hide the unified-extension-button if the panel would be empty: not including the NoScript button when it is hidden. As a result, this will be hidden by default until a user installs another extension (or shows the NoScript button and unpins it). - - - - - 5139b936 by Henry Wilkes at 2025-09-04T15:11:07+02:00 fixup! BB 41581: Hide NoScript extension's toolbar button by default. TB 43874: Incorporate our unified extension button hiding logic into mozilla's changes for ESR 140. - - - - - baba1ddd by hackademix at 2025-09-04T15:11:08+02:00 BB 41834: Hide "Can't Be Removed - learn more" menu line for uninstallable add-ons - - - - - ca7e8a7f by Pier Angelo Vendrame at 2025-09-04T15:11:09+02:00 BB 40925: Implemented the Security Level component This component adds a new Security Level toolbar button which visually indicates the current global security level via icon (as defined by the extensions.torbutton.security_slider pref), a drop-down hanger with a short description of the current security level, and a new section in the about:preferences#privacy page where users can change their current security level. In addition, the hanger and the preferences page will show a visual warning when the user has modified prefs associated with the security level and provide a one-click 'Restore Defaults' button to get the user back on recommended settings. Bug 40125: Expose Security Level pref in GeckoView - - - - - 31498a55 by Henry Wilkes at 2025-09-04T15:11:10+02:00 fixup! BB 40925: Implemented the Security Level component TB 43844: Flip the security level shield icon for RTL. We also do some minor clean up in the areas we touch. - - - - - 4011bb6c by Pier Angelo Vendrame at 2025-09-04T15:11:10+02:00 fixup! BB 40925: Implemented the Security Level component BB 44090: Add CSP to our XUL XHTML documents. - - - - - b56c65fc by Pier Angelo Vendrame at 2025-09-04T15:11:11+02:00 fixup! BB 40925: Implemented the Security Level component BB 43785: Fix DDG HTML in Safest. During the rebases, we broke the automatic redirects to the HTML version of DuckDuckGo. This commit fixes them. - - - - - 719e48ce by Pier Angelo Vendrame at 2025-09-04T15:11:12+02:00 BB 40926: Implemented the New Identity feature - - - - - 7df8d8fd by Pier Angelo Vendrame at 2025-09-04T15:11:13+02:00 fixup! BB 40926: Implemented the New Identity feature BB 44090: Add CSP to our XUL XHTML documents. - - - - - caeb8047 by Henry Wilkes at 2025-09-04T15:11:13+02:00 BB 41736: Customize toolbar for base-browser. - - - - - 9086e6df by Henry Wilkes at 2025-09-04T15:11:14+02:00 BB 43864: Modify the urlbar for Base Browser. - - - - - 4262cc08 by Pier Angelo Vendrame at 2025-09-04T15:11:15+02:00 BB 42027: Base Browser migration procedures. This commit implmenents the the Base Browser's version of _migrateUI. - - - - - 23068587 by Henry Wilkes at 2025-09-04T15:11:16+02:00 TB 42308: Create README for tor-browser. We drop the README.txt that comes from Mozilla Firefox and add README.md for tor-browser. - - - - - 1029c8af by Morgan at 2025-09-04T15:11:16+02:00 TB 43616: Customize Gitlab Issue and Merge Request templates - - - - - 2d02dd6a by Beatriz Rizental at 2025-09-04T15:11:17+02:00 Add CI for Tor Browser - - - - - 16829a68 by Richard Pospesel at 2025-09-04T15:11:18+02:00 TB 41089: Add tor-browser build scripts + Makefile to tor-browser - - - - - 7e0ee116 by clairehurst at 2025-09-04T15:11:18+02:00 fixup! TB 41089: Add tor-browser build scripts + Makefile to tor-browser Bug 43984: Update android build scripts and docs for ESR 140 - - - - - 838e63b8 by Alex Catarineu at 2025-09-04T15:11:19+02:00 Add TorStrings module for localization - - - - - 9d44ed03 by Henry Wilkes at 2025-09-04T15:11:20+02:00 Tor Browser strings This commit adds all the strings needed for Tor Browser patches. - - - - - aebd7ba3 by Henry Wilkes at 2025-09-04T15:11:21+02:00 fixup! Tor Browser strings TB 44069: Update the meek name and description. Update the radio option strings to point their .label directly to the name strings. - - - - - 22ffa025 by Henry Wilkes at 2025-09-04T15:11:21+02:00 Tor Browser localization migration scripts. - - - - - 4e64d448 by Mike Perry at 2025-09-04T15:11:22+02:00 TB 2176: Rebrand Firefox to TorBrowser See also Bugs #5194, #7187, #8115, #8219. This patch does some basic renaming of Firefox to TorBrowser. The rest of the branding is done by images and icons. Also fix bug 27905. Bug 25702: Update Tor Browser icon to follow design guidelines - Updated all of the branding in /browser/branding/official with new 'stable' icon series. - Updated /extensions/onboarding/content/img/tor-watermark.png with new icon and add the source svg in the same directory - Copied /browser/branding/official over /browser/branding/nightly and the new /browser/branding/alpha directories. Replaced content with 'nightly' and 'alpha' icon series. Updated VisualElements_70.png and VisualElements_150.png with updated icons in each branding directory (fixes #22654) - Updated firefox.VisualElementsManfiest.xml with updated colors in each branding directory - Added firefox.svg to each branding directory from which all the other icons are derived (apart from document.icns and document.ico) - Added default256.png and default512.png icons - Updated aboutTBUpdate.css to point to branding-aware icon128.png and removed original icon - Use the Tor Browser icon within devtools/client/themes/images/. Bug 30631: Blurry Tor Browser icon on macOS app switcher It would seem the png2icns tool does not generate correct icns files and so on macOS the larger icons were missing resulting in blurry icons in the OS chrome. Regenerated the padded icons in a macOS VM using iconutil. Bug 28196: preparations for using torbutton tor-browser-brand.ftl A small change to Fluent FileSource class is required so that we can register a new source without its supported locales being counted as available locales for the browser. Bug 31803: Replaced about:debugging logo with flat version Bug 21724: Make Firefox and Tor Browser distinct macOS apps When macOS opens a document or selects a default browser, it sometimes uses the CFBundleSignature. Changing from the Firefox MOZB signature to a different signature TORB allows macOS to distinguish between Firefox and Tor Browser. Bug 32092: Fix Tor Browser Support link in preferences For bug 40562, we moved onionPattern* from bug 27476 to here, as about:tor needs these files but it is included earlier. Bug 41278: Create Tor Browser styled pdf logo similar to the vanilla Firefox one Bug 42088: New application icons (used in-app and on linux). Bug 42087: New application icons (windows). - - - - - 6fc5ab78 by Henry Wilkes at 2025-09-04T15:11:23+02:00 Customize moz-toggle for tor-browser. - - - - - 19b8aba1 by Henry Wilkes at 2025-09-04T15:11:24+02:00 TB 43087: Add onion-pattern to be used on Tor pages. - - - - - 12bf0cda by Henry Wilkes at 2025-09-04T15:11:24+02:00 TB 41817: tor-browser semantic colors. - - - - - 7cc588b3 by Henry Wilkes at 2025-09-04T15:11:25+02:00 TB 41917: Change letterboxing styling for Tor Browser. - - - - - 798a3319 by Henry Wilkes at 2025-09-04T15:11:26+02:00 TB 42110: Add TorUIUtils module for common tor component methods. - - - - - af676b9d by Henry Wilkes at 2025-09-04T15:11:27+02:00 Add purple tor version of the loading APNG. - - - - - ae1982a0 by Henry Wilkes at 2025-09-04T15:11:27+02:00 fixup! Add purple tor version of the loading APNG. TB 43519: Drop tor loading PNGs. This should drop the entire target commit. - - - - - 8519d660 by Henry Wilkes at 2025-09-04T15:11:28+02:00 TB 42583: Modify moz-support-link for Tor Browser. - - - - - 37a5dcfb by sanketh at 2025-09-04T15:11:29+02:00 TB 40209: Implement Basic Crypto Safety Adds a CryptoSafety actor which detects when you've copied a crypto address from a HTTP webpage and shows a warning. Closes #40209. Bug 40428: Fix string attribute names - - - - - a61d9fb3 by Mike Perry at 2025-09-04T15:11:30+02:00 TB3: Tor Browser's official .mozconfigs. Also: Add an --enable-tor-browser-data-outside-app-dir configure option Add --with-tor-browser-version configure option Bug 31457: disable per-installation profiles The dedicated profiles (per-installation) feature does not interact well with our bundled profiles on Linux and Windows, and it also causes multiple profiles to be created on macOS under TorBrowser-Data. Bug 31935: Disable profile downgrade protection. Since Tor Browser does not support more than one profile, disable the prompt and associated code that offers to create one when a version downgrade situation is detected. Add --enable-tor-browser-update build option Bug 40793: moved Tor configuration options from old-configure.in to moz.configure Bug 41584: Move some configuration options to base-browser level - - - - - ca6e1c5f by Henry Wilkes at 2025-09-04T15:11:30+02:00 TB 41340: Enable TOR_BROWSER_NIGHTLY_BUILD features for dev and nightly builds tor-browser#41285: Enable fluent warnings. - - - - - 4c05853b by Pier Angelo Vendrame at 2025-09-04T15:11:31+02:00 TB 40562: Added Tor Browser preferences to 000-tor-browser.js Before reordering patches, we used to keep the Tor-related patches (torbutton and tor-launcher) at the beginning. After that issue, we decided to move them towards the end. In addition to that, we have decided to move Tor Browser-only preferences there, too, to make Base Browser-only fixups easier to apply. - - - - - ab04f714 by Henry Wilkes at 2025-09-04T15:11:32+02:00 fixup! TB 40562: Added Tor Browser preferences to 000-tor-browser.js TB 43864: Move to Tor Browser help URL to preferences. - - - - - e31420a0 by Pier Angelo Vendrame at 2025-09-04T15:11:33+02:00 TB 13252: Customize profile management on macOS On macOS we allow both portable mode and system installation. However, in the latter case, we customize Firefox's directories to match the hierarchy we use for the portable mode. Also, display an informative error message if the TorBrowser-Data directory cannot be created due to an "access denied" or a "read only volume" error. - - - - - 0174a437 by Pier Angelo Vendrame at 2025-09-04T15:11:33+02:00 TB 40933: Add tor-launcher functionality Bug 41926: Reimplement the control port - - - - - 58e9f55d by Cecylia Bocovich at 2025-09-04T15:11:34+02:00 Lox integration - - - - - b681d3df by Richard Pospesel at 2025-09-04T15:11:35+02:00 TB 40597: Implement TorSettings module - migrated in-page settings read/write implementation from about:preferences#tor to the TorSettings module - TorSettings initially loads settings from the tor daemon, and saves them to firefox prefs - TorSettings notifies observers when a setting has changed; currently only QuickStart notification is implemented for parity with previous preference notify logic in about:torconnect and about:preferences#tor - about:preferences#tor, and about:torconnect now read and write settings thorugh the TorSettings module - all tor settings live in the torbrowser.settings.* preference branch - removed unused pref modify permission for about:torconnect content page from AsyncPrefs.jsm Bug 40645: Migrate Moat APIs to Moat.jsm module - - - - - 971a0953 by Arthur Edelstein at 2025-09-04T15:11:35+02:00 TB 3455: Add DomainIsolator, for isolating circuit by domain. Add an XPCOM component that registers a ProtocolProxyChannelFilter which sets the username/password for each web request according to url bar domain. Bug 9442: Add New Circuit button Bug 13766: Set a 10 minute circuit dirty timeout for the catch-all circ. Bug 19206: Include a 128 bit random tag as part of the domain isolator nonce. Bug 19206: Clear out the domain isolator state on `New Identity`. Bug 21201.2: Isolate by firstPartyDomain from OriginAttributes Bug 21745: Fix handling of catch-all circuit Bug 41741: Refactor the domain isolator and new circuit - - - - - fad975c7 by Henry Wilkes at 2025-09-04T15:11:36+02:00 TB 41600: Add a tor circuit display panel. - - - - - 7df094d2 by Pier Angelo Vendrame at 2025-09-04T15:11:37+02:00 TB 42247: Android helpers for the TorProvider GeckoView is missing some API we use on desktop for the integration with the tor daemon, such as subprocess. Therefore, we need to implement them in Java and plumb the data back and forth between JS and Java. - - - - - b6a0aaad by Dan Ballard at 2025-09-04T15:11:38+02:00 fixup! TB 42247: Android helpers for the TorProvider Bug 41188 pt2: strip out legacy TorController logic and shims - - - - - 42bf1706 by hackademix at 2025-09-04T15:11:38+02:00 TB 8324: Prevent DNS proxy bypasses caused by Drag&Drop Bug 41613: Skip Drang & Drop filtering for DNS-safe URLs - - - - - a15c78ee by Matthew Finkel at 2025-09-04T15:11:39+02:00 TB 25741: TBA: Disable GeckoNetworkManager The browser should not need information related to the network interface or network state, tor should take care of that. - - - - - 27083f35 by Pier Angelo Vendrame at 2025-09-04T15:11:40+02:00 TB 40807: Added QRCode.js to toolkit/modules - - - - - 5f2e6133 by Richard Pospesel at 2025-09-04T15:11:41+02:00 TB 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection This patch adds a new about:preferences#connection page which allows modifying bridge, proxy, and firewall settings from within Tor Browser. All of the functionality present in tor-launcher's Network Configuration panel is present: - Setting built-in bridges - Requesting bridges from BridgeDB via moat - Using user-provided bridges - Configuring SOCKS4, SOCKS5, and HTTP/HTTPS proxies - Setting firewall ports - Viewing and Copying Tor's logs - The Networking Settings in General preferences has been removed Bug 40774: Update about:preferences page to match new UI designs - - - - - 911d5aaf by Henry Wilkes at 2025-09-04T15:11:41+02:00 fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection TB 43519: Use loading.svg. - - - - - 4760ef44 by Henry Wilkes at 2025-09-04T15:11:42+02:00 fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection TB 44069: Update built-in meek name and description. Also change the radio options strings to have their .label point directly to the corresponding bridge type name string. - - - - - a0f8457f by Pier Angelo Vendrame at 2025-09-04T15:11:43+02:00 fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection BB 44090: Add CSP to our XUL XHTML documents. - - - - - dfe0e1e8 by Richard Pospesel at 2025-09-04T15:11:44+02:00 TB 27476: Implement about:torconnect captive portal within Tor Browser - implements new about:torconnect page as tor-launcher replacement - adds new torconnect component to browser - tor process management functionality remains implemented in tor-launcher through the TorProtocolService module - adds warning/error box to about:preferences#tor when not connected to tor Bug 40773: Update the about:torconnect frontend page to match additional UI flows. Bug 41608: Add a toolbar status button and a urlbar "Connect" button. - - - - - 88dfac40 by Henry Wilkes at 2025-09-04T15:11:44+02:00 fixup! TB 27476: Implement about:torconnect captive portal within Tor Browser TB 43832: Drop eslint-env - - - - - 392f40e2 by Beatriz Rizental at 2025-09-04T15:11:45+02:00 Temporary changes to about:torconnect for Android. - - - - - 482a4504 by Henry Wilkes at 2025-09-04T15:11:46+02:00 TB 43405: Show a prompt whenever we fail to apply Tor settings. - - - - - 0e82f698 by Henry Wilkes at 2025-09-04T15:11:46+02:00 TB 7494: Create local home page for TBB. Bug 41333: Update about:tor to new design. Including: + make the favicon match the branding icon. + make the location bar show a search icon. - - - - - a07a3900 by Pier Angelo Vendrame at 2025-09-04T15:11:47+02:00 TB 41668: Tweaks to the Base Browser updater for Tor Browser This commit was once part of "Bug 4234: Use the Firefox Update Process for Tor Browser.". However, some parts of it were not needed for Base Browser and some derivative browsers. Therefore, we extracted from that commit the parts for Tor Browser legacy, and we add them back to the patch set with this commit. - - - - - 90f7bee8 by Kathy Brade at 2025-09-04T15:11:48+02:00 TB 12647: Support symlinks in the updater. - - - - - 77bd1728 by Georg Koppen at 2025-09-04T15:11:49+02:00 TB 32658: Create a new MAR signing key It's time for our rotation again: Move the backup key in the front position and add a new backup key. Bug 33803: Move our primary nightly MAR signing key to tor-browser Bug 33803: Add a secondary nightly MAR signing key - - - - - 54d8aab2 by Pier Angelo Vendrame at 2025-09-04T15:11:49+02:00 TB 42891: Set the bundled search engine for Tor Browser. After upstream changes between Firefox 115 and 128, we had to completely rework the way in which we define our search engines. This commit replaces the old "Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing". With that commit, we customized a list of addons IDs to ship as built-in search engines, but then upsteam moved to using only RemoteSettings. The configuration has many more fields, and it would be quite long to include it in the source code. Therefore, we use some local JSON files and load the settings from them. - - - - - 350f17f8 by Pier Angelo Vendrame at 2025-09-04T15:11:50+02:00 fixup! TB 42891: Set the bundled search engine for Tor Browser. TB 43111: Remove legacy search addons. Remove legacy files that are not needed anymore. - - - - - 1a3ef6dc by Henry Wilkes at 2025-09-04T15:11:51+02:00 TB 41906: Hide DNS over HTTPS preferences. - - - - - 8f539c5f by Richard Pospesel at 2025-09-04T15:11:52+02:00 TB 23247: Communicating security expectations for .onion Encrypting pages hosted on Onion Services with SSL/TLS is redundant (in terms of hiding content) as all traffic within the Tor network is already fully encrypted. Therefore, serving HTTP pages from an Onion Service is more or less fine. Prior to this patch, Tor Browser would mostly treat pages delivered via Onion Services as well as pages delivered in the ordinary fashion over the internet in the same way. This created some inconsistencies in behaviour and misinformation presented to the user relating to the security of pages delivered via Onion Services: - HTTP Onion Service pages did not have any 'lock' icon indicating the site was secure - HTTP Onion Service pages would be marked as unencrypted in the Page Info screen - Mixed-mode content restrictions did not apply to HTTP Onion Service pages embedding Non-Onion HTTP content This patch fixes the above issues, and also adds several new 'Onion' icons to the mix to indicate all of the various permutations of Onion Services hosted HTTP or HTTPS pages with HTTP or HTTPS content. Strings for Onion Service Page Info page are pulled from Torbutton's localization strings. - - - - - 0dde073c by Kathy Brade at 2025-09-04T15:11:53+02:00 TB 30237: Add v3 onion services client authentication prompt When Tor informs the browser that client authentication is needed, temporarily load about:blank instead of about:neterror and prompt for the user's key. If a correctly formatted key is entered, use Tor's ONION_CLIENT_AUTH_ADD control port command to add the key (via Torbutton's control port module) and reload the page. If the user cancels the prompt, display the standard about:neterror "Unable to connect" page. This requires a small change to browser/actors/NetErrorChild.jsm to account for the fact that the docShell no longer has the failedChannel information. The failedChannel is used to extract TLS-related error info, which is not applicable in the case of a canceled .onion authentication prompt. Add a leaveOpen option to PopupNotifications.show so we can display error messages within the popup notification doorhanger without closing the prompt. Add support for onion services strings to the TorStrings module. Add support for Tor extended SOCKS errors (Tor proposal 304) to the socket transport and SOCKS layers. Improved display of all of these errors will be implemented as part of bug 30025. Also fixes bug 19757: Add a "Remember this key" checkbox to the client auth prompt. Add an "Onion Services Authentication" section within the about:preferences "Privacy & Security section" to allow viewing and removal of v3 onion client auth keys that have been stored on disk. Also fixes bug 19251: use enhanced error pages for onion service errors. - - - - - fce681b8 by Pier Angelo Vendrame at 2025-09-04T15:11:53+02:00 fixup! TB 30237: Add v3 onion services client authentication prompt BB 44090: Add CSP to our XUL XHTML documents. - - - - - 40eb1f4d by Alex Catarineu at 2025-09-04T15:11:54+02:00 TB 21952: Implement Onion-Location Whenever a valid Onion-Location HTTP header (or corresponding HTML <meta> http-equiv attribute) is found in a document load, we either redirect to it (if the user opted-in via preference) or notify the presence of an onionsite alternative with a badge in the urlbar. - - - - - 0a40367b by Pier Angelo Vendrame at 2025-09-04T15:11:55+02:00 TB 40458: Implement .tor.onion aliases We have enabled HTTPS-Only mode, therefore we do not need HTTPS-Everywhere anymore. However, we want to keep supporting .tor.onion aliases (especially for securedrop). Therefore, in this patch we implemented the parsing of HTTPS-Everywhere rulesets, and the redirect of .tor.onion domains. Actually, Tor Browser believes they are actual domains. We change them on the fly on the SOCKS proxy requests to resolve the domain, and on the code that verifies HTTPS certificates. - - - - - 4fa531ae by Pier Angelo Vendrame at 2025-09-04T15:11:56+02:00 TB 11698: Incorporate Tor Browser Manual pages into Tor Browser This patch associates the about:manual page to a translated page that must be injected to browser/omni.ja after the build. The content must be placed in chrome/browser/content/browser/manual/, so that is then available at chrome://browser/content/manual/. We preferred giving absolute freedom to the web team, rather than having to change the patch in case of changes on the documentation. - - - - - e41ac091 by Pier Angelo Vendrame at 2025-09-04T15:11:56+02:00 TB 41435: Add a Tor Browser migration function For now this function only deletes old language packs for which we are already packaging the strings with the application. - - - - - b914a262 by Pier Angelo Vendrame at 2025-09-04T15:11:57+02:00 fixup! TB 41435: Add a Tor Browser migration function TB 43111: Remove legacy search addons. The upstream migration code does not allow removing the manifests. If we want to remove them, we need to add our migration. - - - - - d9a201c4 by Dan Ballard at 2025-09-04T15:11:58+02:00 TB 40701: Add security warning when downloading a file Shown in the downloads panel, about:downloads and places.xhtml. - - - - - 39a37c59 by Henry Wilkes at 2025-09-04T15:11:58+02:00 TB 41736: Customize toolbar for tor-browser. - - - - - dc2a50c9 by hackademix at 2025-09-04T15:11:59+02:00 TB 41728: Pin bridges.torproject.org domains to Let's Encrypt's root cert public key - - - - - 5e88de7b by Richard Pospesel at 2025-09-04T15:12:00+02:00 TB 41822: Unconditionally disable default browser UX in about:preferences - - - - - deedf944 by Beatriz Rizental at 2025-09-04T15:12:01+02:00 TB 43817: Add tests for Tor Browser This is a catch all commits for adding any tests or testing infrastructure that doesn't obviously fit any other commit. - - - - - 6be2946f by Cecylia Bocovich at 2025-09-04T15:12:01+02:00 Temporary commit: manually place generated wasm files These files are built reproducibly using tor-browser-build: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/merge_re… We're manually adding them here while working on the interface, but eventually these should be placed in the right location using tor-browser-build. - - - - - 7602637a by Pier Angelo Vendrame at 2025-09-04T15:12:02+02:00 [android] TBA strings - - - - - e96d1cbb by Henry Wilkes at 2025-09-04T15:12:03+02:00 fixup! [android] TBA strings TB 44069: Update meek name. TB 44083: Capitalise Snowflake name. - - - - - 43222428 by Dan Ballard at 2025-09-04T15:12:04+02:00 TB 42660: Disable ProxySelector.openConnectionWithProxy and NOPify CrashReporter.sendCrashReport - - - - - 1bbaf282 by Dan Ballard at 2025-09-04T15:12:04+02:00 TB 43006: Disable RFP for Font Visibility on Android - - - - - 3485ae44 by Matthew Finkel at 2025-09-04T15:12:05+02:00 TB 40005: [android] Modify Default toolbar menu Originally android-components#40005. - - - - - 7d38c6a8 by Alex Catarineu at 2025-09-04T15:12:06+02:00 TB 34378: [android] Port external helper app prompting Together with the corresponding fenix patch, this allows all `startActivity` that may open external apps to be replaced by `TorUtils.startActivityPrompt`. Originally, android-components#40007 and fenix#34378. - - - - - 0343a462 by Alex Catarineu at 2025-09-04T15:12:07+02:00 TB 40002: [android] Ensure system download manager is not used Originally, android-components#40002. android-components#40075: Support scoped storage to enable downloads on API < 29 - in android-components!7, we blocked all usage of Scoped Storage in an attempt to block usage of Android's DownloadManager, which is known to cause proxy bypasses - as of Android API 29, downloads will not work without Scoped Storage, causing all downlaods to fail (see: fenix##40192) - here, we enable usage of scoped storage for API >= 29, but block calls to DownloadManager on API < 29 - - - - - 89d2958b by Pier Angelo Vendrame at 2025-09-04T15:12:07+02:00 fixup! TB 40562: Added Tor Browser preferences to 000-tor-browser.js BB 44062: Enable touch events on Windows and Android. Auto-detection makes some properties available on the global scope only when touch support is actually available, but this introduces entorpy. Let's force touch enabled in Windows+Android and disable it elsewhere. This improves consistency with the spoofed number of touch points. - - - - - e6d8a3fa by Beatriz Rizental at 2025-09-04T15:12:08+02:00 TB 40009: [android] Change the default search engines Originally, android-components#40009. This matches the search engines from desktop, that is: DDG as the default, then YouTube, Google, DDGOnion, Startpage, Twitter, Wikipedia and Yahoo. android-components#40062: Update DuckDuckGo onion search plugin - - - - - bf392eef by Beatriz Rizental at 2025-09-04T15:12:09+02:00 TB 42191: [android] Temporary StrictMode relaxation to clear the thumbnail cache. - - - - - 6e07eeb6 by hackademix at 2025-09-04T15:12:10+02:00 [android] Modify add-on support Bug 41160: One-time ultimate switch Tor Browser Android to HTTPS-Only. Bug 41159: Remove HTTPS-Everywhere extension from Tor Browser Android. Bug 41094: Enable HTTPS-Only Mode by default in Tor Browser Android. Turn shouldUseHttpsOnly's default to true. Bug 40225: Bundled extensions don't get updated with Android Tor Browser updates. Bug 40030: Install NoScript addon on startup. 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. Also, we hide the uninstall button for builtin addons. Bug 40058: Hide option for disallowing addon in private mode - - - - - 3373daa8 by Dan Ballard at 2025-09-04T15:12:10+02:00 fixup! [android] Modify add-on support Bug 41188 pt2: strip out legacy TorController logic and shims - - - - - 6b4612cc by Alex Catarineu at 2025-09-04T15:12:11+02:00 [android] Modify Addon support android-components#40011: Hide option for disallowing addons in private mode android-components#40016: Allow inheriting from AddonCollectionProvider This will allow implementing our own AddonsProvider in fenix. - - - - - acd4c568 by Alex Catarineu at 2025-09-04T15:12:12+02:00 TB 40015: [android] Port padlock states for .onion services Originally, android-components#40015. - - - - - c9ebe4bb by Matthew Finkel at 2025-09-04T15:12:13+02:00 [android] Modify Tracking Protection configuration android-components#40020: Disable third-party cookies android-components#40024: Disable tracking protection by default - - - - - e34ac538 by Matthew Finkel at 2025-09-04T15:12:13+02:00 TB 40023: [android] Stop PrivateNotificationService Originally, android-components#40023. - - - - - 360cec44 by Dan Ballard at 2025-09-04T15:12:14+02:00 fixup! TB 40023: [android] Stop PrivateNotificationService Bug 43346: revert patch, not needed anymore - - - - - bc7bce15 by Alex Catarineu at 2025-09-04T15:12:15+02:00 TB 34439 [android]: Isolate Icon loader on Android. Originally, android-components#34439. - - - - - 8cd95a6b by Matthew Finkel at 2025-09-04T15:12:16+02:00 [android] 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 - - - - - 611d731b by clairehurst at 2025-09-04T15:12:16+02:00 fixup! [android] Disable features and functionality tor-browser#43977 Crash on debug launch - - - - - 1c97ea8a by clairehurst at 2025-09-04T15:12:17+02:00 fixup! [android] Disable features and functionality tor-browser#44029 Search/url bar doesn't work on android after ESR 140 - - - - - a7afac3e by clairehurst at 2025-09-04T15:12:18+02:00 fixup! [android] Disable features and functionality tor-browser#44036 Crash on opening "Search Settings" on android - - - - - c670f14b by Matthew Finkel at 2025-09-04T15:12:19+02:00 TB 40032 [android]: Set usesCleartextTraffic as false Originally, fenix#40032. - - - - - c2078ed7 by Matthew Finkel at 2025-09-04T15:12:19+02:00 [android] 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 - - - - - e1c11464 by Georg Koppen at 2025-09-04T15:12:20+02:00 [android] 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. - - - - - 6e8f62c6 by Nicolas Vigier at 2025-09-04T15:12:21+02:00 TB 43987 [Android]: disable optimization for org.mozilla.experiments.nimbus.Nimbus Fixing a reproducibility issue. - - - - - 6e9c7af5 by Beatriz Rizental at 2025-09-04T15:12:22+02:00 [android] Override settings - - - - - 88311195 by Alex Catarineu at 2025-09-04T15:12:22+02:00 TB 40087 [android]: Implement a switch for spoof English. Originally, fenix#40087 and android-components#40019. - - - - - d2b2e77f by Matthew Finkel at 2025-09-04T15:12:23+02:00 TB 34403 [android]: Disable Normal mode by default. Originally, fenix#34403. - - - - - d30167c1 by Matthew Finkel at 2025-09-04T15:12:24+02:00 TB 40016 [android]: Don't install WebCompat webext. Originally, fenix#40016. - - - - - dc3c4078 by Matthew Finkel at 2025-09-04T15:12:25+02:00 [android] 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 40063: Do not sort search engines alphabetically 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 Bug 40198: Spoof English toggle now overlaps with locale list - - - - - a83dc052 by Matthew Finkel at 2025-09-04T15:12:25+02:00 TB 40026 [android]: Implement Security Level settings on Android. Originally, fenix#40026. - - - - - a3797c8b by Dan Ballard at 2025-09-04T15:12:26+02:00 TB 41972: [android] Disable Mozilla onboarding - - - - - 69de76c3 by Dan Ballard at 2025-09-04T15:12:27+02:00 TB 41878: [android] Add standalone Tor Bootstrap - - - - - de31d3c9 by Dan Ballard at 2025-09-04T15:12:28+02:00 fixup! TB 41878: [android] Add standalone Tor Bootstrap Bug 41188 pt2: strip out legacy TorController logic and shims - - - - - 9fe08bd9 by Matthew Finkel at 2025-09-04T15:12:28+02:00 TB 40041 [android]: Implement Tor Network Settings Originally, fenix#40041. - - - - - deb0795f by Dan Ballard at 2025-09-04T15:12:29+02:00 fixup! TB 40041 [android]: Implement Tor Network Settings Bug 41188 pt2: strip out legacy TorController logic and shims - - - - - 64728cc1 by clairehurst at 2025-09-04T15:12:30+02:00 fixup! TB 40041 [android]: Implement Tor Network Settings tor-browser#44042 Debug crash when opening settings too quickly after launching app. Clean up surrounding code - - - - - 596cff60 by clairehurst at 2025-09-04T15:12:31+02:00 fixup! TB 40041 [android]: Implement Tor Network Settings tor-browser#44042 Debug crash when opening settings too quickly after launching app. Clean up surrounding code - - - - - f3623ec3 by Henry Wilkes at 2025-09-04T15:12:31+02:00 fixup! TB 40041 [android]: Implement Tor Network Settings TB 44069: Update meek name. TB 44083: Capitalise Snowflake name. - - - - - bf252b61 by clairehurst at 2025-09-04T15:12:32+02:00 [android] Implement Android-native Connection Assist UI - - - - - 563595c9 by Dan Ballard at 2025-09-04T15:12:33+02:00 fixup! [android] Implement Android-native Connection Assist UI Bug 41188 pt2: strip out legacy TorController logic and shims - - - - - e075f6ac by clairehurst at 2025-09-04T15:12:34+02:00 fixup! [android] Implement Android-native Connection Assist UI Bug 43645: Swiping away doesn't always disconnect from tor - - - - - e63a2e52 by clairehurst at 2025-09-04T15:12:34+02:00 TB 42655 [android]: Implement "New circuit for this site" on Android - - - - - aecdd2a0 by clairehurst at 2025-09-04T15:12:35+02:00 TB 42089: [android] Remove ability to submit site support requests - - - - - abd2c4c3 by clairehurst at 2025-09-04T15:12:36+02:00 [android] Delete unused media - - - - - 19d9c5f0 by Beatriz Rizental at 2025-09-04T15:12:37+02:00 TB 43243: [android] Implement Android launch test Also remove exit call from terminate function. It causes all espresso tests to crash on exit and otherwise doesn't do anything. - - - - - e3d09dad by Beatriz Rizental at 2025-09-04T15:12:37+02:00 TB 42669: [android] Use custom no-op app-services Fetch the custom built no-op application services library from tor-browser-build when building for Android. - - - - - aa24a82d by Dan Ballard at 2025-09-04T15:12:38+02:00 fixup! TB 42669: [android] Use custom no-op app-services Add fix for edge case where there are dup nightly builds - - - - - be1ccb12 by Beatriz Rizental at 2025-09-04T15:12:39+02:00 fixup! TB 42669: [android] Use custom no-op app-services - - - - - 6776a57e by Beatriz Rizental at 2025-09-04T15:12:40+02:00 Various Android workarounds - - - - - 0b7eb6f9 by Beatriz Rizental at 2025-09-04T15:12:40+02:00 fixup! Various Android workarounds - - - - - e8b7b22d by Beatriz Rizental at 2025-09-04T15:12:41+02:00 fixup! Add CI for Base Browser - - - - - e3b434ee by Henry Wilkes at 2025-09-04T15:12:42+02:00 fixup! Add CI for Base Browser TB 44104: Do not run linter when a merge request has no overall change. We also use `\0` to separate file names, rather than `\n`. - - - - - a2308fba by Beatriz Rizental at 2025-09-04T15:12:43+02:00 fixup! Add CI for Tor Browser 1. Change the containerfile to use ./mach bootstrap to gather dependencies. 2. Update debian version from bookworm to trixie 3. Update container build rule to actually only build when merging to the default branch, not just any protected branch. - - - - - 1814 changed files: - .gitignore - + .gitlab-ci.yml - + .gitlab/ci/containers/base/Containerfile - + .gitlab/ci/jobs/lint/helpers.py - + .gitlab/ci/jobs/lint/lint.yml - + .gitlab/ci/jobs/startup-test/startup-test-android.py - + .gitlab/ci/jobs/startup-test/startup-test.py - + .gitlab/ci/jobs/startup-test/startup-test.yml - + .gitlab/ci/jobs/update-containers.yml - + .gitlab/ci/jobs/update-translations.yml - + .gitlab/ci/mixins.yml - + .gitlab/issue_templates/000 Bug Report.md - + .gitlab/issue_templates/010 Proposal.md - + .gitlab/issue_templates/020 Web Compatibility.md - + .gitlab/issue_templates/030 Test.md - + .gitlab/issue_templates/031 Fingerprinting.md - + .gitlab/issue_templates/040 Feature.md - + .gitlab/issue_templates/050 Backport.md - + .gitlab/issue_templates/060 Rebase - Alpha.md - + .gitlab/issue_templates/061 Rebase - Stable.md - + .gitlab/issue_templates/062 Rebase - Legacy.md - + .gitlab/issue_templates/063 Rebase - Rapid.md - + .gitlab/issue_templates/070 Uplift.md - + .gitlab/issue_templates/080 Security Backports.md - + .gitlab/issue_templates/090 Emergency Security Issue.md - + .gitlab/issue_templates/100 Release QA - Desktop.md - + .gitlab/issue_templates/101 Release QA - Android.md - + .gitlab/issue_templates/110 Bugzilla Triage.md - + .gitlab/issue_templates/120 Bugzilla Audit.md - + .gitlab/issue_templates/Default.md - + .gitlab/merge_request_templates/Default.md - .prettierignore - README.md - browser/.eslintrc.mjs - + browser/actors/CryptoSafetyChild.sys.mjs - + browser/actors/CryptoSafetyParent.sys.mjs - browser/actors/moz.build - browser/app/Makefile.in - browser/app/macbuild/Contents/Info.plist.in - browser/app/macbuild/Contents/MacOS-files.in - browser/app/moz.build - browser/app/permissions - + browser/app/profile/000-tor-browser.js - + browser/app/profile/001-base-profile.js - browser/app/profile/firefox.js - browser/base/content/aboutDialog-appUpdater.js - browser/base/content/aboutDialog.js - browser/base/content/aboutDialog.xhtml - + browser/base/content/aboutDialogTor.css - browser/base/content/appmenu-viewcache.inc.xhtml - browser/base/content/browser-addons.js - browser/base/content/browser-context.js - browser/base/content/browser-init.js - browser/base/content/browser-main.js - browser/base/content/browser-menubar.inc - browser/base/content/browser-menubar.js - browser/base/content/browser-places.js - browser/base/content/browser-safebrowsing.js - browser/base/content/browser-sets.inc - browser/base/content/browser-sets.js - browser/base/content/browser-siteIdentity.js - browser/base/content/browser.js - browser/base/content/browser.js.globals - browser/base/content/browser.xhtml - browser/base/content/default-bookmarks.html - + browser/base/content/languageNotification.js - browser/base/content/main-popupset.inc.xhtml - browser/base/content/navigator-toolbox.inc.xhtml - browser/base/content/pageinfo/pageInfo.xhtml - browser/base/content/pageinfo/security.js - browser/base/content/popup-notifications.inc.xhtml - browser/base/content/utilityOverlay.js - browser/base/jar.mn - browser/base/moz.build - browser/branding/branding-common.mozbuild - + browser/branding/tb-alpha/VisualElements_150.png - + browser/branding/tb-alpha/VisualElements_70.png - + browser/branding/tb-alpha/configure.sh - + browser/branding/tb-alpha/content/about-logo.png - + browser/branding/tb-alpha/content/about-logo.svg - + browser/branding/tb-alpha/content/about-logo(a)2x.png - + browser/branding/tb-alpha/content/about-wordmark.svg - + browser/branding/tb-alpha/content/about.png - + browser/branding/tb-alpha/content/aboutDialog.css - + browser/branding/tb-alpha/content/firefox-wordmark.svg - + browser/branding/tb-alpha/content/jar.mn - + browser/branding/tb-alpha/content/moz.build - + browser/branding/tb-alpha/default128.png - + browser/branding/tb-alpha/default16.png - + browser/branding/tb-alpha/default22.png - + browser/branding/tb-alpha/default24.png - + browser/branding/tb-alpha/default256.png - + browser/branding/tb-alpha/default32.png - + browser/branding/tb-alpha/default48.png - + browser/branding/tb-alpha/default64.png - + browser/branding/tb-alpha/document.icns - + browser/branding/tb-alpha/document.ico - + browser/branding/tb-alpha/document_pdf.ico - + browser/branding/tb-alpha/firefox.VisualElementsManifest.xml - + browser/branding/tb-alpha/firefox.icns - + browser/branding/tb-alpha/firefox.ico - + browser/branding/tb-alpha/locales/en-US/brand.ftl - + browser/branding/tb-alpha/locales/en-US/brand.properties - + browser/branding/tb-alpha/locales/jar.mn - + browser/branding/tb-alpha/locales/moz.build - + browser/branding/tb-alpha/moz.build - + browser/branding/tb-alpha/newtab.ico - + browser/branding/tb-alpha/newwindow.ico - + browser/branding/tb-alpha/pbmode.ico - + browser/branding/tb-alpha/pref/firefox-branding.js - + browser/branding/tb-nightly/VisualElements_150.png - + browser/branding/tb-nightly/VisualElements_70.png - + browser/branding/tb-nightly/configure.sh - + browser/branding/tb-nightly/content/about-logo.png - + browser/branding/tb-nightly/content/about-logo.svg - + browser/branding/tb-nightly/content/about-logo(a)2x.png - + browser/branding/tb-nightly/content/about-wordmark.svg - + browser/branding/tb-nightly/content/about.png - + browser/branding/tb-nightly/content/aboutDialog.css - + browser/branding/tb-nightly/content/firefox-wordmark.svg - + browser/branding/tb-nightly/content/jar.mn - + browser/branding/tb-nightly/content/moz.build - + browser/branding/tb-nightly/default128.png - + browser/branding/tb-nightly/default16.png - + browser/branding/tb-nightly/default22.png - + browser/branding/tb-nightly/default24.png - + browser/branding/tb-nightly/default256.png - + browser/branding/tb-nightly/default32.png - + browser/branding/tb-nightly/default48.png - + browser/branding/tb-nightly/default64.png - + browser/branding/tb-nightly/document.icns - + browser/branding/tb-nightly/document.ico - + browser/branding/tb-nightly/document_pdf.ico - + browser/branding/tb-nightly/firefox.VisualElementsManifest.xml - + browser/branding/tb-nightly/firefox.icns - + browser/branding/tb-nightly/firefox.ico - + browser/branding/tb-nightly/locales/en-US/brand.ftl - + browser/branding/tb-nightly/locales/en-US/brand.properties - + browser/branding/tb-nightly/locales/jar.mn - + browser/branding/tb-nightly/locales/moz.build - + browser/branding/tb-nightly/moz.build - + browser/branding/tb-nightly/newtab.ico - + browser/branding/tb-nightly/newwindow.ico - + browser/branding/tb-nightly/pbmode.ico - + browser/branding/tb-nightly/pref/firefox-branding.js - + browser/branding/tb-release/VisualElements_150.png - + browser/branding/tb-release/VisualElements_70.png - + browser/branding/tb-release/configure.sh - + browser/branding/tb-release/content/about-logo.png - + browser/branding/tb-release/content/about-logo.svg - + browser/branding/tb-release/content/about-logo(a)2x.png - + browser/branding/tb-release/content/about-wordmark.svg - + browser/branding/tb-release/content/about.png - + browser/branding/tb-release/content/aboutDialog.css - + browser/branding/tb-release/content/firefox-wordmark.svg - + browser/branding/tb-release/content/jar.mn - + browser/branding/tb-release/content/moz.build - + browser/branding/tb-release/default128.png - + browser/branding/tb-release/default16.png - + browser/branding/tb-release/default22.png - + browser/branding/tb-release/default24.png - + browser/branding/tb-release/default256.png - + browser/branding/tb-release/default32.png - + browser/branding/tb-release/default48.png - + browser/branding/tb-release/default64.png - + browser/branding/tb-release/document.icns - + browser/branding/tb-release/document.ico - + browser/branding/tb-release/document_pdf.ico - + browser/branding/tb-release/firefox.VisualElementsManifest.xml - + browser/branding/tb-release/firefox.icns - + browser/branding/tb-release/firefox.ico - + browser/branding/tb-release/locales/en-US/brand.ftl - + browser/branding/tb-release/locales/en-US/brand.properties - + browser/branding/tb-release/locales/jar.mn - + browser/branding/tb-release/locales/moz.build - + browser/branding/tb-release/moz.build - + browser/branding/tb-release/newtab.ico - + browser/branding/tb-release/newwindow.ico - + browser/branding/tb-release/pbmode.ico - + browser/branding/tb-release/pref/firefox-branding.js - browser/components/BrowserComponents.manifest - browser/components/BrowserContentHandler.sys.mjs - browser/components/BrowserGlue.sys.mjs - browser/components/DesktopActorRegistry.sys.mjs - browser/components/about/AboutRedirector.cpp - browser/components/about/components.conf - browser/components/aboutlogins/AboutLoginsParent.sys.mjs - browser/components/aboutlogins/content/aboutLogins.css - browser/components/aboutlogins/content/aboutLogins.mjs - browser/components/aboutlogins/content/components/fxaccounts-button.css - + browser/components/abouttor/AboutTorChild.sys.mjs - + browser/components/abouttor/AboutTorMessage.sys.mjs - + browser/components/abouttor/AboutTorParent.sys.mjs - + browser/components/abouttor/HomepageOverride.sys.mjs - + browser/components/abouttor/content/1f44b-waving-hand.svg - + browser/components/abouttor/content/1f4e3-megaphone.svg - + browser/components/abouttor/content/26a1-high-voltage.svg - + browser/components/abouttor/content/2728-sparkles.svg - + browser/components/abouttor/content/2764-red-heart.svg - + browser/components/abouttor/content/aboutTor.css - + browser/components/abouttor/content/aboutTor.html - + browser/components/abouttor/content/aboutTor.js - + browser/components/abouttor/content/dax-logo.svg - + browser/components/abouttor/jar.mn - + browser/components/abouttor/moz.build - browser/components/customizableui/CustomizableUI.sys.mjs - browser/components/customizableui/CustomizeMode.sys.mjs - browser/components/customizableui/content/panelUI.inc.xhtml - browser/components/customizableui/content/panelUI.js - browser/components/downloads/DownloadSpamProtection.sys.mjs - + browser/components/downloads/DownloadsTorWarning.sys.mjs - browser/components/downloads/content/contentAreaDownloadsView.js - browser/components/downloads/content/contentAreaDownloadsView.xhtml - browser/components/downloads/content/downloads.css - browser/components/downloads/content/downloads.js - browser/components/downloads/content/downloadsPanel.inc.xhtml - browser/components/downloads/moz.build - browser/components/extensions/parent/ext-browserAction.js - browser/components/extensions/schemas/chrome_settings_overrides.json - browser/components/migration/ChromeMigrationUtils.sys.mjs - browser/components/migration/content/migration-wizard.mjs - browser/components/moz.build - + browser/components/newidentity/content/newIdentityDialog.css - + browser/components/newidentity/content/newIdentityDialog.js - + browser/components/newidentity/content/newIdentityDialog.xhtml - + browser/components/newidentity/content/newidentity.js - + browser/components/newidentity/jar.mn - + browser/components/newidentity/moz.build - browser/components/newtab/AboutHomeStartupCache.sys.mjs - + browser/components/onionservices/OnionAliasStore.sys.mjs - + browser/components/onionservices/OnionLocationChild.sys.mjs - + browser/components/onionservices/OnionLocationParent.sys.mjs - + browser/components/onionservices/TorRequestWatch.sys.mjs - + browser/components/onionservices/content/authNotificationIcon.inc.xhtml - + browser/components/onionservices/content/authPopup.inc.xhtml - + browser/components/onionservices/content/authPreferences.css - + browser/components/onionservices/content/authPreferences.inc.xhtml - + browser/components/onionservices/content/authPreferences.js - + browser/components/onionservices/content/authPrompt.js - + browser/components/onionservices/content/onionlocation-urlbar.inc.xhtml - + browser/components/onionservices/content/onionlocation.css - + browser/components/onionservices/content/onionservices.css - + browser/components/onionservices/content/savedKeysDialog.js - + browser/components/onionservices/content/savedKeysDialog.xhtml - + browser/components/onionservices/jar.mn - + browser/components/onionservices/moz.build - browser/components/places/PlacesUIUtils.sys.mjs - browser/components/places/content/controller.js - browser/components/places/content/places.css - browser/components/places/content/places.js - browser/components/places/content/places.xhtml - browser/components/preferences/home.inc.xhtml - browser/components/preferences/home.js - browser/components/preferences/jar.mn - + browser/components/preferences/letterboxing-middle-dark.svg - + browser/components/preferences/letterboxing-middle-light.svg - + browser/components/preferences/letterboxing-top-dark.svg - + browser/components/preferences/letterboxing-top-light.svg - + browser/components/preferences/letterboxing.css - + browser/components/preferences/letterboxing.inc.xhtml - + browser/components/preferences/letterboxing.js - browser/components/preferences/main.inc.xhtml - browser/components/preferences/main.js - browser/components/preferences/preferences.js - browser/components/preferences/preferences.xhtml - browser/components/preferences/privacy.inc.xhtml - browser/components/preferences/privacy.js - + browser/components/rulesets/RulesetsChild.sys.mjs - + browser/components/rulesets/RulesetsParent.sys.mjs - + browser/components/rulesets/content/aboutRulesets.css - + browser/components/rulesets/content/aboutRulesets.html - + browser/components/rulesets/content/aboutRulesets.js - + browser/components/rulesets/content/securedrop.svg - + browser/components/rulesets/jar.mn - + browser/components/rulesets/moz.build - browser/components/search/SERPCategorization.sys.mjs - browser/components/search/SearchSERPTelemetry.sys.mjs - + browser/components/securitylevel/SecurityLevelUIUtils.sys.mjs - + browser/components/securitylevel/content/securityLevel.js - + browser/components/securitylevel/content/securityLevelButton.css - + browser/components/securitylevel/content/securityLevelButton.inc.xhtml - + browser/components/securitylevel/content/securityLevelDialog.js - + browser/components/securitylevel/content/securityLevelDialog.xhtml - + browser/components/securitylevel/content/securityLevelIcon.svg - + browser/components/securitylevel/content/securityLevelPanel.css - + browser/components/securitylevel/content/securityLevelPanel.inc.xhtml - + browser/components/securitylevel/content/securityLevelPreferences.css - + browser/components/securitylevel/content/securityLevelPreferences.inc.xhtml - + browser/components/securitylevel/jar.mn - + browser/components/securitylevel/moz.build - browser/components/tabbrowser/content/tabbrowser.js - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1e8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1e9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1eb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1ec.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1ee.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1f1.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1f4.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1f6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1f8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1f9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1fa.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1fc.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1fd.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1ff.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1e6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1e7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1e9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1eb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1ec.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1ed.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1ee.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1ef.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1f1.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1f3.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1f4.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1f6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1f8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1f9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1fb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1fc.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1fe.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1ff.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1e6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1e8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1e9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1eb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1ec.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1ed.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1ee.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1f0.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1f1.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1f3.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1f4.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1f5.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1fa.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1fb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1fc.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1fd.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1fe.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1ff.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e9-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e9-1f1ec.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e9-1f1ef.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e9-1f1f0.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e9-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e9-1f1f4.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e9-1f1ff.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ea-1f1e6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ea-1f1e8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ea-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ea-1f1ec.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ea-1f1ed.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ea-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ea-1f1f8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ea-1f1f9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ea-1f1fa.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1eb-1f1ee.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1eb-1f1ef.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1eb-1f1f0.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1eb-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1eb-1f1f4.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1eb-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1e6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1e7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1e9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1eb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1ec.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1ed.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1ee.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1f1.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1f3.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1f5.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1f6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1f8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1f9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1fa.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1fc.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1fe.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ed-1f1f0.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ed-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ed-1f1f3.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ed-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ed-1f1f9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ed-1f1fa.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ee-1f1e8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ee-1f1e9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ee-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ee-1f1f1.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ee-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ee-1f1f3.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ee-1f1f4.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ee-1f1f6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ee-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ee-1f1f8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ee-1f1f9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ef-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ef-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ef-1f1f4.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ef-1f1f5.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f0-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f0-1f1ec.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f0-1f1ed.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f0-1f1ee.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f0-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f0-1f1f3.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f0-1f1f5.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f0-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f0-1f1fc.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f0-1f1fe.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f0-1f1ff.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f1-1f1e6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f1-1f1e7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f1-1f1e8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f1-1f1ee.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f1-1f1f0.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f1-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f1-1f1f8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f1-1f1f9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f1-1f1fa.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f1-1f1fb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f1-1f1fe.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1e6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1e8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1e9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1eb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1ec.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1ed.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1f0.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1f1.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1f3.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1f4.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1f5.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1f6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1f8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1f9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1fa.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1fb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1fc.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1fd.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1fe.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1ff.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f3-1f1e6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f3-1f1e8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f3-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f3-1f1eb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f3-1f1ec.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f3-1f1ee.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f3-1f1f1.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f3-1f1f4.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f3-1f1f5.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f3-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f3-1f1fa.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f3-1f1ff.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f4-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f5-1f1e6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f5-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f5-1f1eb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f5-1f1ec.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f5-1f1ed.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f5-1f1f0.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f5-1f1f1.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f5-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f5-1f1f3.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f5-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f5-1f1f8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f5-1f1f9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f5-1f1fc.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f5-1f1fe.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f6-1f1e6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f7-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f7-1f1f4.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f7-1f1f8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f7-1f1fa.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f7-1f1fc.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1e6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1e7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1e8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1e9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1ec.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1ed.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1ee.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1ef.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1f0.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1f1.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1f3.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1f4.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1f8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1f9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1fb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1fd.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1fe.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1ff.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1e6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1e8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1e9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1eb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1ec.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1ed.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1ef.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1f0.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1f1.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1f3.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1f4.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1f9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1fb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1fc.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1ff.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fa-1f1e6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fa-1f1ec.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fa-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fa-1f1f3.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fa-1f1f8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fa-1f1fe.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fa-1f1ff.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fb-1f1e6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fb-1f1e8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fb-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fb-1f1ec.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fb-1f1ee.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fb-1f1f3.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fb-1f1fa.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fc-1f1eb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fc-1f1f8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fd-1f1f0.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fe-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fe-1f1f9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ff-1f1e6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ff-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ff-1f1fc.svg - + browser/components/torcircuit/content/tor-circuit-flags/README.txt - + browser/components/torcircuit/content/tor-circuit-icon-mask.svg - + browser/components/torcircuit/content/tor-circuit-node-end.svg - + browser/components/torcircuit/content/tor-circuit-node-middle.svg - + browser/components/torcircuit/content/tor-circuit-node-relays.svg - + browser/components/torcircuit/content/tor-circuit-node-start.svg - + browser/components/torcircuit/content/tor-circuit-redirect.svg - + browser/components/torcircuit/content/torCircuitPanel.css - + browser/components/torcircuit/content/torCircuitPanel.inc.xhtml - + browser/components/torcircuit/content/torCircuitPanel.js - + browser/components/torcircuit/jar.mn - + browser/components/torcircuit/moz.build - + browser/components/torpreferences/content/bridge-bot.svg - + browser/components/torpreferences/content/bridge-qr.svg - + browser/components/torpreferences/content/bridge.svg - + browser/components/torpreferences/content/bridgeQrDialog.js - + browser/components/torpreferences/content/bridgeQrDialog.xhtml - + browser/components/torpreferences/content/bridgemoji/BridgeEmoji.js - + browser/components/torpreferences/content/bridgemoji/annotations.json - + browser/components/torpreferences/content/bridgemoji/bridge-emojis.json - + browser/components/torpreferences/content/bridgemoji/svgs/1f300.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f308.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f30a.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f30b.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f319.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f31f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f321.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f32d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f32e.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f332.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f333.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f334.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f335.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f336.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f337.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f339.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f33a.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f33b.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f33d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f33f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f341.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f344.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f345.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f346.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f347.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f348.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f349.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f34a.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f34b.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f34c.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f34d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f34f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f350.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f351.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f352.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f353.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f354.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f355.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f368.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f369.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f36a.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f36b.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f36c.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f36d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f37f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f380.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f381.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f382.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f383.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f388.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f389.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f38f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f392.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f399.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f39f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3a0.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3a1.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3a2.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3a8.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3ac.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3af.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3b2.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3b6.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3b7.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3b8.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3ba.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3bb.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3be.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3c0.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3c6.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3c8.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3d3.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3d4.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3d5.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3dd.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3e1.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3ee.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3f7.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3f8.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3f9.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f40a.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f40c.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f40d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f417.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f418.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f419.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f41a.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f41b.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f41d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f41e.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f41f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f420.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f422.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f425.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f426.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f428.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f42a.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f42c.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f42d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f42e.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f42f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f430.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f431.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f432.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f433.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f434.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f435.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f436.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f437.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f43a.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f43b.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f43f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f441.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f451.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f455.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f457.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f45f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f47d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f484.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f488.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f48d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f48e.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f490.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f4a1.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f4a7.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f4b3.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f4bf.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f4cc.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f4ce.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f4d5.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f4e1.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f4e2.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f4fb.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f50b.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f511.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f525.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f526.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f52c.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f52d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f52e.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f54a.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f58c.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f58d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f5ff.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f680.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f681.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f686.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f68b.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f68d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f695.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f697.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f69a.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f69c.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f6a0.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f6a2.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f6a4.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f6f0.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f6f4.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f6f5.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f6f6.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f6f8.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f6f9.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f6fa.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f6fc.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f916.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f93f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f941.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f94c.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f94f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f950.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f951.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f955.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f956.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f95c.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f95d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f95e.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f965.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f966.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f968.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f96c.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f96d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f96f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f980.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f981.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f984.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f986.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f987.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f988.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f989.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f98a.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f98b.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f98c.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f98e.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f98f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f992.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f993.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f994.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f995.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f998.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f999.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f99a.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f99c.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f99d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f99e.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9a3.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9a4.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9a5.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9a6.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9a7.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9a9.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9ad.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9c1.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9c3.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9c5.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9c7.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9c9.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9d9.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9da.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9dc.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9e0.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9e2.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9e6.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9e9.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9ea.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9ec.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9ed.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9ee.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9f2.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9f5.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9f9.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1fa73.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1fa80.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1fa81.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1fa83.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1fa90.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1fa91.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1fa95.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1fa97.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1fab6.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1fad0.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1fad2.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1fad6.svg - + browser/components/torpreferences/content/bridgemoji/svgs/23f0.svg - + browser/components/torpreferences/content/bridgemoji/svgs/2600.svg - + browser/components/torpreferences/content/bridgemoji/svgs/2602.svg - + browser/components/torpreferences/content/bridgemoji/svgs/2604.svg - + browser/components/torpreferences/content/bridgemoji/svgs/260e.svg - + browser/components/torpreferences/content/bridgemoji/svgs/2693.svg - + browser/components/torpreferences/content/bridgemoji/svgs/2696.svg - + browser/components/torpreferences/content/bridgemoji/svgs/26bd.svg - + browser/components/torpreferences/content/bridgemoji/svgs/26f2.svg - + browser/components/torpreferences/content/bridgemoji/svgs/26f5.svg - + browser/components/torpreferences/content/bridgemoji/svgs/2708.svg - + browser/components/torpreferences/content/bridgemoji/svgs/270f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/2728.svg - + browser/components/torpreferences/content/bridgemoji/svgs/2744.svg - + browser/components/torpreferences/content/bridgemoji/svgs/README.txt - + browser/components/torpreferences/content/builtinBridgeDialog.js - + browser/components/torpreferences/content/builtinBridgeDialog.xhtml - + browser/components/torpreferences/content/connectionCategory.inc.xhtml - + browser/components/torpreferences/content/connectionPane.js - + browser/components/torpreferences/content/connectionPane.xhtml - + browser/components/torpreferences/content/connectionSettingsDialog.js - + browser/components/torpreferences/content/connectionSettingsDialog.xhtml - + browser/components/torpreferences/content/lox-bridge-icon.svg - + browser/components/torpreferences/content/lox-bridge-pass.svg - + browser/components/torpreferences/content/lox-complete-ring.svg - + browser/components/torpreferences/content/lox-invite-icon.svg - + browser/components/torpreferences/content/lox-progress-ring.svg - + browser/components/torpreferences/content/lox-success.svg - + browser/components/torpreferences/content/loxInviteDialog.js - + browser/components/torpreferences/content/loxInviteDialog.xhtml - + browser/components/torpreferences/content/mail.svg - + browser/components/torpreferences/content/network-broken.svg - + browser/components/torpreferences/content/network.svg - + browser/components/torpreferences/content/provideBridgeDialog.js - + browser/components/torpreferences/content/provideBridgeDialog.xhtml - + browser/components/torpreferences/content/requestBridgeDialog.js - + browser/components/torpreferences/content/requestBridgeDialog.xhtml - + browser/components/torpreferences/content/telegram-logo.svg - + browser/components/torpreferences/content/torLogDialog.js - + browser/components/torpreferences/content/torLogDialog.xhtml - + browser/components/torpreferences/content/torPreferences.css - + browser/components/torpreferences/jar.mn - + browser/components/torpreferences/moz.build - browser/components/urlbar/QuickActionsLoaderDefault.sys.mjs - browser/components/urlbar/SearchModeSwitcher.sys.mjs - browser/components/urlbar/UrlbarProvidersManager.sys.mjs - browser/components/urlbar/UrlbarUtils.sys.mjs - browser/components/urlbar/moz.build - + browser/config/mozconfigs/base-browser - + browser/config/mozconfigs/base-browser-android - + browser/config/mozconfigs/tor-browser - + browser/config/mozconfigs/tor-browser-android - browser/extensions/moz.build - + browser/fonts/fonts.conf - browser/fonts/moz.build - browser/installer/Makefile.in - browser/installer/package-manifest.in - browser/installer/windows/nsis/shared.nsh - − browser/locales/en-US/chrome/overrides/appstrings.properties - browser/locales/jar.mn - browser/locales/l10n.toml - browser/modules/AboutNewTab.sys.mjs - browser/modules/BrowserWindowTracker.sys.mjs - browser/modules/HomePage.sys.mjs - browser/modules/LaterRun.sys.mjs - + browser/modules/SecurityLevelRestartNotification.sys.mjs - + browser/modules/TorSettingsNotification.sys.mjs - + browser/modules/TorUIUtils.sys.mjs - browser/modules/URILoadingHelper.sys.mjs - browser/modules/moz.build - browser/moz.build - browser/moz.configure - browser/themes/shared/browser-shared.css - browser/themes/shared/controlcenter/panel.css - browser/themes/shared/downloads/contentAreaDownloadsView.css - + browser/themes/shared/icons/new_circuit.svg - + browser/themes/shared/icons/new_identity.svg - browser/themes/shared/identity-block/identity-block.css - browser/themes/shared/jar.inc.mn - browser/themes/shared/notification-icons.css - browser/themes/shared/preferences/preferences.css - browser/themes/shared/tabbrowser/content-area.css - browser/themes/shared/tabbrowser/tabs.css - browser/themes/shared/toolbarbutton-icons.css - + browser/themes/shared/tor-urlbar-button.css - build.gradle - build/application.ini.in - build/moz.build - build/moz.configure/init.configure - build/moz.configure/rust.configure - build/moz.configure/update-programs.configure - build/moz.configure/windows.configure - build/variables.py - caps/nsScriptSecurityManager.cpp - config/createprecomplete.py - devtools/client/aboutdebugging/src/actions/runtimes.js - devtools/client/netmonitor/src/components/SecurityState.js - devtools/client/themes/images/aboutdebugging-firefox-logo.svg - docshell/base/URIFixup.sys.mjs - docshell/base/nsAboutRedirector.cpp - docshell/base/nsDocShell.cpp - docshell/build/components.conf - dom/base/ContentAreaDropListener.sys.mjs - dom/base/Document.cpp - dom/base/Document.h - dom/base/nsContentUtils.cpp - dom/base/nsContentUtils.h - dom/base/nsCopySupport.cpp - dom/base/nsGlobalWindowOuter.cpp - dom/canvas/ClientWebGLContext.cpp - dom/ipc/BrowserParent.cpp - dom/ipc/BrowserParent.h - dom/ipc/PBrowser.ipdl - dom/ipc/WindowGlobalActor.cpp - dom/ipc/WindowGlobalChild.cpp - dom/media/systemservices/video_engine/desktop_device_info.cc - dom/media/webrtc/libwebrtcglue/VideoConduit.cpp - dom/media/webrtc/sdp/RsdparsaSdpAttributeList.cpp - dom/media/webrtc/transport/nrinterfaceprioritizer.cpp - dom/media/webrtc/transport/sigslot.h - dom/media/webrtc/transport/test/ice_unittest.cpp - dom/media/webrtc/transport/third_party/nICEr/src/net/local_addr.c - dom/media/webrtc/transport/third_party/nICEr/src/net/local_addr.h - dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c - dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-win32.c - dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs.c - dom/media/webrtc/transport/third_party/nrappkit/src/log/r_log.c - dom/media/webrtc/transport/third_party/nrappkit/src/registry/registry.c - dom/security/nsContentSecurityUtils.cpp - dom/security/nsMixedContentBlocker.cpp - dom/webidl/Document.webidl - dom/websocket/WebSocket.cpp - eslint-file-globals.config.mjs - eslint-ignores.config.mjs - extensions/auth/nsHttpNegotiateAuth.cpp - gfx/thebes/StandardFonts-linux.inc → gfx/thebes/StandardFonts-linux-upstream.inc - + gfx/thebes/StandardFonts-macos-bb.inc - gfx/thebes/StandardFonts-macos.inc → gfx/thebes/StandardFonts-macos-upstream.inc - + gfx/thebes/StandardFonts-win10-bb.inc - gfx/thebes/StandardFonts-win10.inc - gfx/thebes/gfxDWriteFontList.cpp - gfx/thebes/gfxFcPlatformFontList.cpp - gfx/thebes/gfxMacPlatformFontList.mm - gfx/thebes/gfxPlatformFontList.cpp - intl/l10n/Localization.h - intl/locale/LocaleService.cpp - js/xpconnect/src/xpc.msg - layout/base/nsLayoutUtils.cpp - mobile/android/android-components/components/browser/engine-gecko/build.gradle - mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt - mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngineSession.kt - mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/cookiebanners/GeckoCookieBannersStorage.kt - mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/cookiebanners/ReportSiteDomainsRepository.kt - mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt - mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/webextension/GeckoWebExtension.kt - mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/cookiebanners/GeckoCookieBannersStorageTest.kt - mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/cookiebanners/ReportSiteDomainsRepositoryTest.kt - mobile/android/android-components/components/browser/icons/src/main/java/mozilla/components/browser/icons/loader/HttpIconLoader.kt - mobile/android/android-components/components/browser/menu/src/main/java/mozilla/components/browser/menu/WebExtensionBrowserMenuBuilder.kt - mobile/android/android-components/components/browser/storage-sync/src/main/java/mozilla/components/browser/storage/sync/RemoteTabsStorage.kt - mobile/android/android-components/components/browser/thumbnails/src/main/java/mozilla/components/browser/thumbnails/utils/ThumbnailDiskCache.kt - mobile/android/android-components/components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/DisplayToolbar.kt - mobile/android/android-components/components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/SiteInfoIconView.kt - mobile/android/android-components/components/browser/toolbar/src/main/res/drawable/mozac_ic_site_info.xml - mobile/android/android-components/components/browser/toolbar/src/main/res/values/attrs_browser_toolbar.xml - mobile/android/android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/EngineSession.kt - mobile/android/android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/Settings.kt - mobile/android/android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/cookiehandling/CookieBannersStorage.kt - mobile/android/android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/webextension/WebExtension.kt - mobile/android/android-components/components/concept/engine/src/test/java/mozilla/components/concept/engine/SettingsTest.kt - mobile/android/android-components/components/concept/fetch/src/main/java/mozilla/components/concept/fetch/Request.kt - mobile/android/android-components/components/concept/sync/src/main/java/mozilla/components/concept/sync/AccountEvent.kt - mobile/android/android-components/components/concept/toolbar/src/main/java/mozilla/components/concept/toolbar/Toolbar.kt - mobile/android/android-components/components/feature/accounts/build.gradle - mobile/android/android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/AddonManager.kt - mobile/android/android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/amo/AMOAddonsProvider.kt - mobile/android/android-components/components/feature/app-links/build.gradle - mobile/android/android-components/components/feature/app-links/src/main/java/mozilla/components/feature/app/links/AppLinksFeature.kt - mobile/android/android-components/components/feature/app-links/src/main/java/mozilla/components/feature/app/links/AppLinksUseCases.kt - mobile/android/android-components/components/feature/awesomebar/src/main/java/mozilla/components/feature/awesomebar/provider/SessionAutocompleteProvider.kt - mobile/android/android-components/components/feature/awesomebar/src/main/java/mozilla/components/feature/awesomebar/provider/SessionSuggestionProvider.kt - mobile/android/android-components/components/feature/contextmenu/src/main/java/mozilla/components/feature/contextmenu/ContextMenuCandidate.kt - mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/AbstractFetchDownloadService.kt - mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadsFeature.kt - mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/DownloadsFeatureTest.kt - mobile/android/android-components/components/feature/fxsuggest/build.gradle - mobile/android/android-components/components/feature/search/build.gradle - mobile/android/android-components/components/feature/search/src/main/assets/search/list.json - + mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/ddg-onion.xml - mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/ddg.xml - + mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/startpage-onion.xml - + mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/startpage.xml - mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/SearchUseCases.kt - mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/ext/SearchEngine.kt - mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/internal/SearchUrlBuilder.kt - mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/middleware/SearchMiddleware.kt - mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/storage/SearchEngineReader.kt - mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/telemetry/SerpTelemetryRepository.kt - mobile/android/android-components/components/feature/search/src/test/java/mozilla/components/feature/search/telemetry/BaseSearchTelemetryTest.kt - mobile/android/android-components/components/feature/search/src/test/java/mozilla/components/feature/search/telemetry/SerpTelemetryRepositoryTest.kt - mobile/android/android-components/components/feature/toolbar/src/main/java/mozilla/components/feature/toolbar/ToolbarPresenter.kt - mobile/android/android-components/components/service/firefox-accounts/src/main/java/mozilla/components/service/fxa/FxaDeviceConstellation.kt - mobile/android/android-components/components/service/firefox-accounts/src/main/java/mozilla/components/service/fxa/Types.kt - mobile/android/android-components/components/service/firefox-accounts/src/main/java/mozilla/components/service/fxa/sync/WorkManagerSyncManager.kt - mobile/android/android-components/components/service/nimbus/build.gradle - mobile/android/android-components/components/support/appservices/src/main/java/mozilla/components/support/rustlog/RustLog.kt - mobile/android/android-components/components/support/ktx/src/main/java/mozilla/components/support/ktx/android/content/Context.kt - mobile/android/android-components/components/support/ktx/src/main/java/mozilla/components/support/ktx/kotlin/String.kt - mobile/android/android-components/components/support/remotesettings/src/main/java/mozilla/components/support/remotesettings/RemoteSettingsClient.kt - mobile/android/android-components/components/support/remotesettings/src/main/java/mozilla/components/support/remotesettings/RemoteSettingsService.kt - + mobile/android/android-components/components/support/utils/src/main/java/mozilla/components/support/utils/TorUtils.kt - mobile/android/android-components/components/support/webextensions/src/main/java/mozilla/components/support/webextensions/WebExtensionSupport.kt - + mobile/android/android-components/components/ui/icons/src/main/res/drawable/mozac_ic_onion.xml - mobile/android/android-components/plugins/config/src/main/java/ConfigPlugin.kt - mobile/android/android-components/plugins/dependencies/src/main/java/ApplicationServices.kt - mobile/android/android-components/samples/browser/src/main/res/layout/activity_installed_add_on_details.xml - + mobile/android/app/000-tor-browser-android.js - mobile/android/app/geckoview-prefs.js - mobile/android/app/moz.build - mobile/android/autopublish-settings.gradle - + mobile/android/basebrowser.configure - + mobile/android/branding/tb-alpha/configure.sh - + mobile/android/branding/tb-alpha/content/favicon32.png - + mobile/android/branding/tb-alpha/content/favicon64.png - + mobile/android/branding/tb-alpha/content/jar.mn - + mobile/android/branding/tb-alpha/content/moz.build - + mobile/android/branding/tb-alpha/locales/en-US/brand.ftl - + mobile/android/branding/tb-alpha/locales/en-US/brand.properties - + mobile/android/branding/tb-alpha/locales/jar.mn - + mobile/android/branding/tb-alpha/locales/moz.build - + mobile/android/branding/tb-alpha/moz.build - + mobile/android/branding/tb-nightly/configure.sh - + mobile/android/branding/tb-nightly/content/favicon32.png - + mobile/android/branding/tb-nightly/content/favicon64.png - + mobile/android/branding/tb-nightly/content/jar.mn - + mobile/android/branding/tb-nightly/content/moz.build - + mobile/android/branding/tb-nightly/locales/en-US/brand.ftl - + mobile/android/branding/tb-nightly/locales/en-US/brand.properties - + mobile/android/branding/tb-nightly/locales/jar.mn - + mobile/android/branding/tb-nightly/locales/moz.build - + mobile/android/branding/tb-nightly/moz.build - + mobile/android/branding/tb-release/configure.sh - + mobile/android/branding/tb-release/content/favicon32.png - + mobile/android/branding/tb-release/content/favicon64.png - + mobile/android/branding/tb-release/content/jar.mn - + mobile/android/branding/tb-release/content/moz.build - + mobile/android/branding/tb-release/locales/en-US/brand.ftl - + mobile/android/branding/tb-release/locales/en-US/brand.properties - + mobile/android/branding/tb-release/locales/jar.mn - + mobile/android/branding/tb-release/locales/moz.build - + mobile/android/branding/tb-release/moz.build - mobile/android/exoplayer2/src/main/java/org/mozilla/thirdparty/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java - mobile/android/fenix/.buildconfig.yml - mobile/android/fenix/app/build.gradle - mobile/android/fenix/app/lint-baseline.xml - mobile/android/fenix/app/nimbus.fml.yaml - mobile/android/fenix/app/onboarding.fml.yaml - mobile/android/fenix/app/proguard-rules.pro - + mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/AppStartupTest.kt - mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/onboarding/view/OnboardingMapperTest.kt - mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt - mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAboutRobot.kt - + mobile/android/fenix/app/src/beta/ic_launcher-playstore.png - + mobile/android/fenix/app/src/beta/res/drawable-hdpi/fenix_search_widget.png - − mobile/android/fenix/app/src/beta/res/drawable-hdpi/fenix_search_widget.webp - − mobile/android/fenix/app/src/beta/res/drawable/animated_splash_screen.xml - + mobile/android/fenix/app/src/beta/res/drawable/ic_launcher_background.xml - + mobile/android/fenix/app/src/beta/res/drawable/ic_launcher_monochrome_foreground.xml - mobile/android/fenix/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml → mobile/android/fenix/app/src/beta/res/mipmap-anydpi-v26/ic_launcher.xml - + mobile/android/fenix/app/src/beta/res/mipmap-anydpi-v26/ic_launcher_monochrome.xml - + mobile/android/fenix/app/src/beta/res/mipmap-anydpi-v26/ic_launcher_monochrome_round.xml - + mobile/android/fenix/app/src/beta/res/mipmap-anydpi-v26/ic_launcher_round.xml - mobile/android/fenix/app/src/beta/res/mipmap-hdpi/ic_launcher.webp - + mobile/android/fenix/app/src/beta/res/mipmap-hdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/beta/res/mipmap-hdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/beta/res/mipmap-hdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/beta/res/mipmap-hdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/beta/res/mipmap-mdpi/ic_launcher.webp - + mobile/android/fenix/app/src/beta/res/mipmap-mdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/beta/res/mipmap-mdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/beta/res/mipmap-mdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/beta/res/mipmap-mdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/beta/res/mipmap-xhdpi/ic_launcher.webp - + mobile/android/fenix/app/src/beta/res/mipmap-xhdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/beta/res/mipmap-xhdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/beta/res/mipmap-xhdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/beta/res/mipmap-xhdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/beta/res/mipmap-xxhdpi/ic_launcher.webp - + mobile/android/fenix/app/src/beta/res/mipmap-xxhdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/beta/res/mipmap-xxhdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/beta/res/mipmap-xxhdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/beta/res/mipmap-xxhdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/beta/res/mipmap-xxxhdpi/ic_launcher.webp - + mobile/android/fenix/app/src/beta/res/mipmap-xxxhdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/beta/res/mipmap-xxxhdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/beta/res/mipmap-xxxhdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/beta/res/mipmap-xxxhdpi/ic_launcher_round.webp - + mobile/android/fenix/app/src/beta/res/values/ic_launcher_monochrome_background.xml - mobile/android/fenix/app/src/beta/res/values/static_strings.xml - mobile/android/fenix/app/src/beta/res/xml/shortcuts.xml - − mobile/android/fenix/app/src/debug/ic_launcher-web.webp - + mobile/android/fenix/app/src/debug/res/drawable-hdpi/fenix_search_widget.png - − mobile/android/fenix/app/src/debug/res/drawable/animated_splash_screen.xml - + mobile/android/fenix/app/src/debug/res/drawable/ic_launcher_background.xml - + mobile/android/fenix/app/src/debug/res/drawable/ic_launcher_monochrome_foreground.xml - mobile/android/fenix/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml - + mobile/android/fenix/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_monochrome.xml - + mobile/android/fenix/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_monochrome_round.xml - mobile/android/fenix/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml - mobile/android/fenix/app/src/debug/res/mipmap-hdpi/ic_launcher.webp - mobile/android/fenix/app/src/debug/res/mipmap-hdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/debug/res/mipmap-hdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/debug/res/mipmap-hdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/debug/res/mipmap-hdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/debug/res/mipmap-mdpi/ic_launcher.webp - mobile/android/fenix/app/src/debug/res/mipmap-mdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/debug/res/mipmap-mdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/debug/res/mipmap-mdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/debug/res/mipmap-mdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/debug/res/mipmap-xhdpi/ic_launcher.webp - mobile/android/fenix/app/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/debug/res/mipmap-xhdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/debug/res/mipmap-xhdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/debug/res/mipmap-xhdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/debug/res/mipmap-xxhdpi/ic_launcher.webp - mobile/android/fenix/app/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/debug/res/mipmap-xxhdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/debug/res/mipmap-xxhdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/debug/res/mipmap-xxhdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.webp - mobile/android/fenix/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/debug/res/values/colors.xml - + mobile/android/fenix/app/src/debug/res/values/ic_launcher_monochrome_background.xml - mobile/android/fenix/app/src/debug/res/xml/shortcuts.xml - mobile/android/fenix/app/src/main/AndroidManifest.xml - + mobile/android/fenix/app/src/main/assets/common/torrc-defaults - − mobile/android/fenix/app/src/main/assets/searchplugins/reddit.xml - − mobile/android/fenix/app/src/main/assets/searchplugins/youtube.xml - − mobile/android/fenix/app/src/main/ic_launcher-web.webp - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/BrowserDirection.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FenixApplication.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/IntentReceiverActivity.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/OpenInAppOnboardingObserver.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/browsingmode/BrowsingModeManager.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Analytics.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Components.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/NotificationManager.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/TorBrowserFeatures.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/UseCases.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/appstate/setup/checklist/ChecklistItem.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/CustomTabMenu.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/middleware/MenuNavigationMiddleware.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/metrics/ActivationPing.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/metrics/AdjustMetricsService.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/metrics/GleanMetricsService.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/metrics/MetricController.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/metrics/MetricsUtils.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserMenuSignIn.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarCFRPresenter.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMenuController.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarMenu.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/compose/snackbar/Snackbar.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/customtabs/PoweredByNotification.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/experiments/view/ResearchSurfaceSurvey.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/ext/Activity.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/gecko/GeckoProvider.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeMenuView.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/intent/HomeDeepLinkIntentProcessor.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/recentsyncedtabs/view/RecentSyncedTab.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/ui/HomepageHeader.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/iconpicker/AppIcon.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/microsurvey/ui/MicrosurveyCompleted.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/microsurvey/ui/MicrosurveyHeader.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/microsurvey/ui/MicrosurveyRequestPrompt.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/MarketingDataOnboardingPage.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingPage.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingScreen.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/TermsOfServiceOnboardingPage.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/awesomebar/SearchSuggestionsProvidersBuilder.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/HttpsOnlyFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/PhoneFeature.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/TabsSettingsFragment.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/TorBridgeConfigFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/about/AboutFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/account/AccountSettingsFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/account/AccountUiView.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/advanced/DefaultLocaleSettingsController.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/advanced/LocaleSettingsFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/logins/view/SavedLoginsListView.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsSheetDialogFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/ProtectionsView.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/CookieBannerDetailsController.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/CookieBannerDetailsInteractor.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/CookieBannerHandlingDetailsView.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/CookieBannersStorageExt.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsManagePhoneFeatureFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SiteSettingsFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/share/ShareController.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/share/ShareFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/shortcut/PwaOnboardingObserver.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayBanner.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tabstray/syncedtabs/SyncedTabsList.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tabstray/ui/syncedtabs/SyncedTabsList.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/termsofuse/ui/TermsOfUseBottomSheet.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/ConnectAssistUiState.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/QuickstartViewModel.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorBootstrapProgressViewModel.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorBridgeTransports.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistFragment.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistViewModel.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorController.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorControllerGV.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorLog.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorLogsComposeFragment.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorLogsViewModel.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorSecurityLevel.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorSecurityLevelFragment.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/UrlQuickLoadViewModel.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/trackingprotection/ProtectionsStore.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/NotificationBase.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt - mobile/android/fenix/app/src/main/java/org/mozilla/gecko/search/SearchWidgetProvider.kt - + mobile/android/fenix/app/src/main/res/drawable-hdpi/fenix_search_widget.png - − mobile/android/fenix/app/src/main/res/drawable-hdpi/fenix_search_widget.webp - − mobile/android/fenix/app/src/main/res/drawable-hdpi/ic_logo_wordmark_normal.webp - − mobile/android/fenix/app/src/main/res/drawable-hdpi/ic_logo_wordmark_private.webp - − mobile/android/fenix/app/src/main/res/drawable-mdpi/ic_logo_wordmark_normal.webp - − mobile/android/fenix/app/src/main/res/drawable-mdpi/ic_logo_wordmark_private.webp - − mobile/android/fenix/app/src/main/res/drawable-night/onboarding_ctd_default_browser.xml - mobile/android/fenix/app/src/main/res/drawable-v23/splash_screen.xml - − mobile/android/fenix/app/src/main/res/drawable-xhdpi/ic_logo_wordmark_normal.webp - − mobile/android/fenix/app/src/main/res/drawable-xhdpi/ic_logo_wordmark_private.webp - − mobile/android/fenix/app/src/main/res/drawable-xxhdpi/ic_logo_wordmark_normal.webp - − mobile/android/fenix/app/src/main/res/drawable-xxhdpi/ic_logo_wordmark_private.webp - − mobile/android/fenix/app/src/main/res/drawable-xxxhdpi/ic_logo_wordmark_normal.webp - − mobile/android/fenix/app/src/main/res/drawable-xxxhdpi/ic_logo_wordmark_private.webp - − mobile/android/fenix/app/src/main/res/drawable/animated_splash_screen.xml - + mobile/android/fenix/app/src/main/res/drawable/browser_location.xml - + mobile/android/fenix/app/src/main/res/drawable/connect.xml - + mobile/android/fenix/app/src/main/res/drawable/connect_broken.xml - + mobile/android/fenix/app/src/main/res/drawable/globe_broken.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_account.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_account_warning.xml - + mobile/android/fenix/app/src/main/res/drawable/ic_favorite.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_firefox.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_fx_accounts_avatar.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_notification_permission.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_onboarding_key_features.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_onboarding_key_features_icons_only.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_onboarding_search_widget.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_onboarding_sync.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_onboarding_welcome.xml - + mobile/android/fenix/app/src/main/res/drawable/ic_onion_pattern.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_scan.xml - + mobile/android/fenix/app/src/main/res/drawable/ic_screenshot.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_sign_in.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_signed_out.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_status_logo.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_sync_disconnected.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_synced_tabs.xml - + mobile/android/fenix/app/src/main/res/drawable/ic_tor_config_bridge.xml - + mobile/android/fenix/app/src/main/res/drawable/ic_tor_network_settings.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_wordmark_logo.webp - − mobile/android/fenix/app/src/main/res/drawable/ic_wordmark_text_normal.webp - − mobile/android/fenix/app/src/main/res/drawable/ic_wordmark_text_private.webp - − mobile/android/fenix/app/src/main/res/drawable/microsurvey_success.xml - + mobile/android/fenix/app/src/main/res/drawable/new_circuit.xml - − mobile/android/fenix/app/src/main/res/drawable/onboarding_ctd_default_browser.xml - − mobile/android/fenix/app/src/main/res/drawable/onboarding_ctd_notification.xml - − mobile/android/fenix/app/src/main/res/drawable/onboarding_ctd_sync.xml - mobile/android/fenix/app/src/main/res/drawable/progress_gradient.xml - mobile/android/fenix/app/src/main/res/drawable-night/ic_logo_wordmark_normal.xml → mobile/android/fenix/app/src/main/res/drawable/rounded_corners.xml - + mobile/android/fenix/app/src/main/res/drawable/tor_bootstrap_background_gradient.xml - mobile/android/fenix/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml → mobile/android/fenix/app/src/main/res/drawable/tor_onboarding_donate_gradient.xml - mobile/android/fenix/app/src/main/res/mipmap-anydpi-v26/ic_launcher_private_round.xml → mobile/android/fenix/app/src/main/res/drawable/tor_onboarding_donate_rounded_corners.xml - mobile/android/fenix/app/src/main/res/layout/component_cookie_banner_details_panel.xml - mobile/android/fenix/app/src/main/res/layout/fragment_about.xml - mobile/android/fenix/app/src/main/res/layout/fragment_create_shortcut.xml - mobile/android/fenix/app/src/main/res/layout/fragment_home.xml - mobile/android/fenix/app/src/main/res/layout/fragment_locale_settings.xml - + mobile/android/fenix/app/src/main/res/layout/fragment_tor_connection_assist.xml - + mobile/android/fenix/app/src/main/res/layout/fragment_tor_security_level_preferences.xml - mobile/android/fenix/app/src/main/res/layout/fragment_turn_on_sync.xml - mobile/android/fenix/app/src/main/res/mipmap-anydpi-v26/ic_launcher_private.xml → mobile/android/fenix/app/src/main/res/layout/preference_quick_start.xml - mobile/android/fenix/app/src/main/res/layout/quicksettings_permissions.xml - mobile/android/fenix/app/src/main/res/layout/quicksettings_protections_panel.xml - mobile/android/fenix/app/src/main/res/layout/search_widget_extra_small_v1.xml - mobile/android/fenix/app/src/main/res/layout/search_widget_extra_small_v2.xml - mobile/android/fenix/app/src/main/res/layout/search_widget_large.xml - mobile/android/fenix/app/src/main/res/layout/search_widget_medium.xml - mobile/android/fenix/app/src/main/res/layout/search_widget_small.xml - mobile/android/fenix/app/src/main/res/layout/sign_in_preference.xml - mobile/android/fenix/app/src/main/res/mipmap-anydpi-v26/ic_launcher_alternative.xml - mobile/android/fenix/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round_alternative.xml - − mobile/android/fenix/app/src/main/res/mipmap-hdpi/ic_launcher.webp - − mobile/android/fenix/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp - − mobile/android/fenix/app/src/main/res/mipmap-mdpi/ic_launcher.webp - − mobile/android/fenix/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp - − mobile/android/fenix/app/src/main/res/mipmap-xhdpi/ic_launcher.webp - − mobile/android/fenix/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp - − mobile/android/fenix/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp - − mobile/android/fenix/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp - − mobile/android/fenix/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp - − mobile/android/fenix/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/main/res/navigation/nav_graph.xml - mobile/android/fenix/app/src/main/res/values-night-v27/styles.xml - mobile/android/fenix/app/src/main/res/values-night/styles.xml - mobile/android/fenix/app/src/main/res/values-v24/styles.xml - mobile/android/fenix/app/src/main/res/values-v27/styles.xml - mobile/android/fenix/app/src/main/res/values/attrs.xml - mobile/android/fenix/app/src/main/res/values/colors.xml - + mobile/android/fenix/app/src/main/res/values/ic_launcher_monochrome_background.xml - mobile/android/fenix/app/src/main/res/values/preference_keys.xml - mobile/android/fenix/app/src/main/res/values/static_strings.xml - mobile/android/fenix/app/src/main/res/values/styles.xml - + mobile/android/fenix/app/src/main/res/values/torbrowser_strings.xml - mobile/android/fenix/app/src/main/res/xml/logins_preferences.xml - mobile/android/fenix/app/src/main/res/xml/preferences.xml - mobile/android/fenix/app/src/main/res/xml/private_browsing_preferences.xml - mobile/android/fenix/app/src/main/res/xml/search_settings_preferences.xml - mobile/android/fenix/app/src/main/res/xml/shortcuts.xml - mobile/android/fenix/app/src/main/res/xml/site_permissions_details_exceptions_preferences.xml - mobile/android/fenix/app/src/main/res/xml/site_permissions_preferences.xml - mobile/android/fenix/app/src/main/res/xml/sync_problem.xml - + mobile/android/fenix/app/src/main/res/xml/tor_bridge_config_preferences.xml - + mobile/android/fenix/app/src/nightly/ic_launcher-playstore.png - + mobile/android/fenix/app/src/nightly/res/drawable-hdpi/fenix_search_widget.png - − mobile/android/fenix/app/src/nightly/res/drawable-hdpi/fenix_search_widget.webp - − mobile/android/fenix/app/src/nightly/res/drawable-hdpi/ic_logo_wordmark_normal.webp - − mobile/android/fenix/app/src/nightly/res/drawable-hdpi/ic_logo_wordmark_private.webp - − mobile/android/fenix/app/src/nightly/res/drawable-mdpi/ic_logo_wordmark_normal.webp - − mobile/android/fenix/app/src/nightly/res/drawable-mdpi/ic_logo_wordmark_private.webp - − mobile/android/fenix/app/src/nightly/res/drawable-xhdpi/ic_logo_wordmark_normal.webp - − mobile/android/fenix/app/src/nightly/res/drawable-xhdpi/ic_logo_wordmark_private.webp - − mobile/android/fenix/app/src/nightly/res/drawable-xxhdpi/ic_logo_wordmark_normal.webp - − mobile/android/fenix/app/src/nightly/res/drawable-xxhdpi/ic_logo_wordmark_private.webp - − mobile/android/fenix/app/src/nightly/res/drawable-xxxhdpi/ic_logo_wordmark_normal.webp - − mobile/android/fenix/app/src/nightly/res/drawable-xxxhdpi/ic_logo_wordmark_private.webp - − mobile/android/fenix/app/src/nightly/res/drawable/animated_splash_screen.xml - + mobile/android/fenix/app/src/nightly/res/drawable/ic_launcher_background.xml - − mobile/android/fenix/app/src/nightly/res/drawable/ic_launcher_foreground.xml - + mobile/android/fenix/app/src/nightly/res/drawable/ic_launcher_monochrome_foreground.xml - − mobile/android/fenix/app/src/nightly/res/drawable/ic_wordmark_logo.webp - − mobile/android/fenix/app/src/nightly/res/drawable/ic_wordmark_text_normal.webp - − mobile/android/fenix/app/src/nightly/res/drawable/ic_wordmark_text_private.webp - − mobile/android/fenix/app/src/nightly/res/ic_launcher-web.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-anydpi-v26/ic_launcher.xml - + mobile/android/fenix/app/src/nightly/res/mipmap-anydpi-v26/ic_launcher_monochrome.xml - + mobile/android/fenix/app/src/nightly/res/mipmap-anydpi-v26/ic_launcher_monochrome_round.xml - + mobile/android/fenix/app/src/nightly/res/mipmap-anydpi-v26/ic_launcher_round.xml - mobile/android/fenix/app/src/nightly/res/mipmap-hdpi/ic_launcher.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-hdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-hdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-hdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/nightly/res/mipmap-hdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/nightly/res/mipmap-mdpi/ic_launcher.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-mdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-mdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-mdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/nightly/res/mipmap-mdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/nightly/res/mipmap-xhdpi/ic_launcher.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-xhdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-xhdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-xhdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/nightly/res/mipmap-xhdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/nightly/res/mipmap-xxhdpi/ic_launcher.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-xxhdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-xxhdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-xxhdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/nightly/res/mipmap-xxhdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/nightly/res/mipmap-xxxhdpi/ic_launcher.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-xxxhdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-xxxhdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-xxxhdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/nightly/res/mipmap-xxxhdpi/ic_launcher_round.webp - + mobile/android/fenix/app/src/nightly/res/values/ic_launcher_monochrome_background.xml - mobile/android/fenix/app/src/nightly/res/values/static_strings.xml - mobile/android/fenix/app/src/nightly/res/xml/shortcuts.xml - + mobile/android/fenix/app/src/release/ic_launcher-playstore.png - + mobile/android/fenix/app/src/release/res/drawable-hdpi/fenix_search_widget.png - − mobile/android/fenix/app/src/release/res/drawable-hdpi/fenix_search_widget.webp - − mobile/android/fenix/app/src/release/res/drawable-hdpi/ic_logo_wordmark_normal.webp - − mobile/android/fenix/app/src/release/res/drawable-hdpi/ic_logo_wordmark_private.webp - − mobile/android/fenix/app/src/release/res/drawable/animated_splash_screen.xml - + mobile/android/fenix/app/src/release/res/drawable/ic_launcher_background.xml - + mobile/android/fenix/app/src/release/res/drawable/ic_launcher_monochrome_foreground.xml - + mobile/android/fenix/app/src/release/res/mipmap-anydpi-v26/ic_launcher.xml - + mobile/android/fenix/app/src/release/res/mipmap-anydpi-v26/ic_launcher_monochrome.xml - + mobile/android/fenix/app/src/release/res/mipmap-anydpi-v26/ic_launcher_monochrome_round.xml - + mobile/android/fenix/app/src/release/res/mipmap-anydpi-v26/ic_launcher_round.xml - mobile/android/fenix/app/src/release/res/mipmap-hdpi/ic_launcher.webp - + mobile/android/fenix/app/src/release/res/mipmap-hdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/release/res/mipmap-hdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/release/res/mipmap-hdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/release/res/mipmap-hdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/release/res/mipmap-mdpi/ic_launcher.webp - + mobile/android/fenix/app/src/release/res/mipmap-mdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/release/res/mipmap-mdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/release/res/mipmap-mdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/release/res/mipmap-mdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/release/res/mipmap-xhdpi/ic_launcher.webp - + mobile/android/fenix/app/src/release/res/mipmap-xhdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/release/res/mipmap-xhdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/release/res/mipmap-xhdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/release/res/mipmap-xhdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/release/res/mipmap-xxhdpi/ic_launcher.webp - + mobile/android/fenix/app/src/release/res/mipmap-xxhdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/release/res/mipmap-xxhdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/release/res/mipmap-xxhdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/release/res/mipmap-xxhdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/release/res/mipmap-xxxhdpi/ic_launcher.webp - + mobile/android/fenix/app/src/release/res/mipmap-xxxhdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/release/res/mipmap-xxxhdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/release/res/mipmap-xxxhdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/release/res/mipmap-xxxhdpi/ic_launcher_round.webp - + mobile/android/fenix/app/src/release/res/values/ic_launcher_monochrome_background.xml - mobile/android/fenix/app/src/release/res/values/static_strings.xml - mobile/android/fenix/app/src/release/res/xml/shortcuts.xml - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/components/menu/MenuNavigationMiddlewareTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/ext/ContextTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/onboarding/view/OnboardingMapperTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/onboarding/view/OnboardingPageUiDataTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/settings/SupportUtilsTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/settings/quicksettings/ProtectionsViewTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsSheetDialogFragmentTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/CookieBannerHandlingDetailsViewTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/DefaultCookieBannerDetailsControllerTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/trackingprotection/ProtectionsStoreTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/utils/SettingsTest.kt - mobile/android/fenix/build.gradle - + mobile/android/fenix/tools/tba-fetch-deps.sh - + mobile/android/fenix/tools/tba-sign-devbuilds.sh - mobile/android/geckoview/api.txt - mobile/android/geckoview/build.gradle - − mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/VideoCaptureTest.kt - mobile/android/geckoview/src/main/AndroidManifest.xml - mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoMediaDrmBridgeV21.java - mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java - mobile/android/geckoview/src/main/java/org/mozilla/geckoview/CrashReporter.java - mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java - mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java - mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSession.java - + mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorAndroidIntegration.java - + mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorBootstrappingStatus.java - + mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorConnectError.java - + mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorConnectStage.java - + mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorConnectStageName.java - + mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorSettings.java - mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebExtensionController.java - mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java - + mobile/android/geckoview/src/main/java/org/mozilla/geckoview/androidlegacysettings/Prefs.java - + mobile/android/geckoview/src/main/java/org/mozilla/geckoview/androidlegacysettings/TorLegacyAndroidSettings.java - mobile/android/gradle/with_gecko_binaries.gradle - mobile/android/installer/package-manifest.in - mobile/android/locales/filter.py - mobile/android/locales/jar.mn - mobile/android/locales/l10n.toml - mobile/android/moz.configure - mobile/android/shared-settings.gradle - mobile/locales/filter.py - mobile/shared/.eslintrc.mjs - mobile/shared/chrome/geckoview/geckoview.js - mobile/shared/components/geckoview/GeckoViewStartup.sys.mjs - mobile/shared/modules/geckoview/GeckoViewContent.sys.mjs - mobile/shared/modules/geckoview/GeckoViewProgress.sys.mjs - mobile/shared/modules/geckoview/GeckoViewWebExtension.sys.mjs - modules/libpref/Preferences.cpp - modules/libpref/init/StaticPrefList.yaml - modules/libpref/init/all.js - moz.configure - + mozconfig-android-aarch64 - + mozconfig-android-all - + mozconfig-android-armv7 - + mozconfig-android-x86 - + mozconfig-android-x86_64 - + mozconfig-linux-aarch64 - + mozconfig-linux-aarch64-dev - + mozconfig-linux-arm - + mozconfig-linux-i686 - + mozconfig-linux-x86_64 - + mozconfig-linux-x86_64-asan - + mozconfig-linux-x86_64-dev - + mozconfig-macos - + mozconfig-macos-dev - + mozconfig-windows-i686 - + mozconfig-windows-x86_64 - netwerk/base/nsNetUtil.cpp - netwerk/base/nsSocketTransport2.cpp - netwerk/build/components.conf - netwerk/build/nsNetCID.h - + netwerk/dns/IOnionAliasService.idl - + netwerk/dns/OnionAliasService.cpp - + netwerk/dns/OnionAliasService.h - netwerk/dns/effective_tld_names.dat - netwerk/dns/moz.build - netwerk/protocol/http/HttpBaseChannel.cpp - netwerk/protocol/http/nsHttpHandler.cpp - netwerk/protocol/http/nsHttpNTLMAuth.cpp - netwerk/sctp/src/moz.build - netwerk/sctp/src/netinet/sctp_cc_functions.c - netwerk/sctp/src/netinet/sctp_indata.c - netwerk/sctp/src/netinet/sctp_input.c - netwerk/sctp/src/netinet/sctp_output.c - netwerk/sctp/src/netinet/sctp_usrreq.c - netwerk/sctp/src/netinet/sctputil.c - netwerk/sctp/src/user_mbuf.c - netwerk/sctp/src/user_socket.c - netwerk/socket/nsSOCKSIOLayer.cpp - netwerk/system/android/nsAndroidNetworkLinkService.cpp - netwerk/system/linux/nsNetworkLinkService.cpp - netwerk/system/mac/nsNetworkLinkService.mm - netwerk/system/netlink/NetlinkService.cpp - netwerk/system/win32/nsNotifyAddrListener.cpp - netwerk/url-classifier/UrlClassifierFeatureBase.cpp - netwerk/url-classifier/components.conf - python/mach/mach/telemetry.py - python/mozbuild/mozbuild/artifacts.py - python/mozbuild/mozbuild/mach_commands.py - python/mozlint/mozlint/cli.py - python/sites/mach.txt - security/certverifier/CertVerifier.cpp - security/manager/ssl/NSSSocketControl.cpp - security/manager/ssl/RemoteSecuritySettings.sys.mjs - security/manager/ssl/SSLServerCertVerification.cpp - security/manager/ssl/SSLServerCertVerification.h - security/manager/ssl/StaticHPKPins.h - security/manager/ssl/nsSecureBrowserUI.cpp - security/moz.build - security/nss/lib/certhigh/ocsp.c - security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c - security/nss/lib/mozpkix/include/pkix/Result.h - security/nss/lib/mozpkix/include/pkix/pkixnss.h - security/nss/lib/ssl/Makefile - services/settings/Attachments.sys.mjs - services/settings/IDBHelpers.sys.mjs - services/settings/RemoteSettingsClient.sys.mjs - services/settings/dumps/gen_last_modified.py - services/settings/dumps/main/moz.build - services/settings/remote-settings.sys.mjs - services/settings/servicesSettings.manifest - services/settings/static-dumps/main/moz.build - + services/settings/static-dumps/main/query-stripping.json - services/sync/components.conf - testing/moz.build - testing/mozbase/mozinstall/mozinstall/mozinstall.py - testing/mozbase/setup_development.py - testing/mozharness/scripts/does_it_crash.py - testing/specialpowers/api.js - + testing/tor/marionette.toml - + testing/tor/test_network_check.py - third_party/abseil-cpp/absl/base/internal/thread_identity.cc - third_party/abseil-cpp/absl/base/internal/thread_identity.h - third_party/libwebrtc/modules/audio_coding/codecs/isac/main/source/os_specific_inline.h - third_party/libwebrtc/modules/desktop_capture/desktop_capture_types.h - third_party/libwebrtc/modules/desktop_capture/win/desktop_capture_utils.cc - third_party/libwebrtc/modules/desktop_capture/win/wgc_capture_session.cc - third_party/libwebrtc/modules/desktop_capture/win/wgc_capturer_win.cc - third_party/libwebrtc/modules/desktop_capture/win/wgc_capturer_win.h - third_party/libwebrtc/modules/video_capture/windows/device_info_ds.h - third_party/libwebrtc/rtc_base/platform_thread_types.cc - third_party/libwebrtc/rtc_base/socket.h - third_party/libwebrtc/rtc_base/system/file_wrapper.cc - third_party/libwebrtc/rtc_base/win/create_direct3d_device.h - third_party/sipcc/cpr_win_types.h - third_party/sipcc/sdp_token.c - toolkit/.eslintrc.mjs - toolkit/actors/AboutHttpsOnlyErrorParent.sys.mjs - + toolkit/actors/FilesFilterChild.sys.mjs - + toolkit/actors/FilesFilterParent.sys.mjs - toolkit/actors/NetErrorParent.sys.mjs - toolkit/actors/moz.build - toolkit/components/antitracking/antitracking.manifest - toolkit/components/antitracking/components.conf - toolkit/components/downloads/DownloadCore.sys.mjs - toolkit/components/downloads/DownloadIntegration.sys.mjs - toolkit/components/extensions/Extension.sys.mjs - toolkit/components/extensions/ExtensionParent.sys.mjs - toolkit/components/httpsonlyerror/content/errorpage.js - + toolkit/components/lox/Lox.sys.mjs - + toolkit/components/lox/content/lox_wasm_bg.wasm - + toolkit/components/lox/jar.mn - + toolkit/components/lox/lox_wasm.jsm - + toolkit/components/lox/moz.build - toolkit/components/moz.build - toolkit/components/places/PlacesUtils.sys.mjs - toolkit/components/remotebrowserutils/RemoteWebNavigation.sys.mjs - toolkit/components/resistfingerprinting/RFPHelper.sys.mjs - toolkit/components/resistfingerprinting/content/letterboxing.css - toolkit/components/search/ConfigSearchEngine.sys.mjs - toolkit/components/search/SearchEngine.sys.mjs - toolkit/components/search/SearchService.sys.mjs - + toolkit/components/search/content/duckduckgo.ico - + toolkit/components/search/content/startpage.png - + toolkit/components/search/content/torBrowserSearchEngineIcons.json - + toolkit/components/search/content/torBrowserSearchEngines.json - + toolkit/components/search/content/wikipedia.ico - + toolkit/components/search/jar.mn - toolkit/components/search/moz.build - + toolkit/components/securitylevel/SecurityLevel.manifest - + toolkit/components/securitylevel/SecurityLevel.sys.mjs - + toolkit/components/securitylevel/components.conf - + toolkit/components/securitylevel/moz.build - toolkit/components/telemetry/app/TelemetrySend.sys.mjs - toolkit/components/telemetry/moz.build - + toolkit/components/tor-launcher/TorBootstrapRequest.sys.mjs - + toolkit/components/tor-launcher/TorControlPort.sys.mjs - + toolkit/components/tor-launcher/TorDomainIsolator.sys.mjs - + toolkit/components/tor-launcher/TorLauncherUtil.sys.mjs - + toolkit/components/tor-launcher/TorParsers.sys.mjs - + toolkit/components/tor-launcher/TorProcess.sys.mjs - + toolkit/components/tor-launcher/TorProcessAndroid.sys.mjs - + toolkit/components/tor-launcher/TorProvider.sys.mjs - + toolkit/components/tor-launcher/TorProviderBuilder.sys.mjs - + toolkit/components/tor-launcher/TorStartupService.sys.mjs - + toolkit/components/tor-launcher/components.conf - + toolkit/components/tor-launcher/moz.build - + toolkit/components/tor-launcher/tor-launcher.manifest - + toolkit/components/torconnect/TorConnectChild.sys.mjs - + toolkit/components/torconnect/TorConnectParent.sys.mjs - + toolkit/components/torconnect/content/aboutTorConnect.css - + toolkit/components/torconnect/content/aboutTorConnect.html - + toolkit/components/torconnect/content/aboutTorConnect.js - + toolkit/components/torconnect/content/arrow-right.svg - + toolkit/components/torconnect/content/bridge.svg - + toolkit/components/torconnect/content/connection-failure.svg - + toolkit/components/torconnect/content/connection-location.svg - + toolkit/components/torconnect/content/tor-connect-broken.svg - + toolkit/components/torconnect/content/tor-connect.svg - + toolkit/components/torconnect/content/tor-not-connected-to-connected-animated.svg - + toolkit/components/torconnect/content/torConnectTitlebarStatus.css - + toolkit/components/torconnect/content/torConnectTitlebarStatus.js - + toolkit/components/torconnect/content/torConnectUrlbarButton.js - + toolkit/components/torconnect/jar.mn - + toolkit/components/torconnect/moz.build - toolkit/components/urlformatter/URLFormatter.sys.mjs - toolkit/components/windowwatcher/nsWindowWatcher.cpp - toolkit/content/.eslintrc.mjs - toolkit/content/aboutNetError.html - toolkit/content/aboutNetError.mjs - toolkit/content/aboutSupport.js - toolkit/content/jar.mn - toolkit/content/license.html - + toolkit/content/moat_countries_dev_build.json - + toolkit/content/pt_config.json - toolkit/content/widgets/infobar.css - toolkit/content/widgets/moz-message-bar/moz-message-bar.mjs - toolkit/content/widgets/moz-support-link/moz-support-link.mjs - toolkit/content/widgets/moz-toggle/moz-toggle.mjs - toolkit/content/widgets/notificationbox.js - + toolkit/locales-preview/base-browser-no-translate.ftl - + toolkit/locales-preview/tor-browser-no-translate.ftl - + toolkit/locales/en-US/toolkit/global/base-browser.ftl - + toolkit/locales/en-US/toolkit/global/tor-browser.ftl - toolkit/locales/jar.mn - toolkit/modules/ActorManagerParent.sys.mjs - toolkit/modules/AppConstants.sys.mjs - + toolkit/modules/Bech32Decode.sys.mjs - + toolkit/modules/BridgeDB.sys.mjs - + toolkit/modules/DomainFrontedRequests.sys.mjs - + toolkit/modules/DragDropFilter.sys.mjs - + toolkit/modules/Moat.sys.mjs - toolkit/modules/PopupNotifications.sys.mjs - + toolkit/modules/QRCode.sys.mjs - toolkit/modules/RemotePageAccessManager.sys.mjs - + toolkit/modules/TorAndroidIntegration.sys.mjs - + toolkit/modules/TorConnect.sys.mjs - + toolkit/modules/TorSettings.sys.mjs - + toolkit/modules/TorStrings.sys.mjs - toolkit/modules/UpdateUtils.sys.mjs - toolkit/modules/moz.build - toolkit/moz.build - toolkit/mozapps/extensions/AddonManager.sys.mjs - toolkit/mozapps/extensions/components.conf - toolkit/mozapps/extensions/content/aboutaddons.html - toolkit/mozapps/extensions/content/aboutaddons.js - toolkit/mozapps/extensions/internal/XPIDatabase.sys.mjs - toolkit/mozapps/extensions/internal/XPIInstall.sys.mjs - toolkit/mozapps/extensions/internal/XPIProvider.sys.mjs - toolkit/mozapps/extensions/test/browser/head.js - toolkit/mozapps/extensions/test/xpcshell/head_addons.js - toolkit/mozapps/installer/packager.mk - toolkit/mozapps/installer/upload-files.mk - toolkit/mozapps/update/UpdateService.sys.mjs - toolkit/mozapps/update/UpdateServiceStub.sys.mjs - toolkit/mozapps/update/common/updatehelper.cpp - toolkit/mozapps/update/updater/launchchild_osx.mm - toolkit/mozapps/update/updater/moz.build - toolkit/mozapps/update/updater/nightly_aurora_level3_primary.der - toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der - toolkit/mozapps/update/updater/release_primary.der - toolkit/mozapps/update/updater/release_secondary.der - toolkit/mozapps/update/updater/updater.cpp - toolkit/themes/shared/aboutNetError.css - toolkit/themes/shared/desktop-jar.inc.mn - + toolkit/themes/shared/icons/onion-site.svg - + toolkit/themes/shared/icons/onion-slash.svg - + toolkit/themes/shared/icons/onion-warning.svg - + toolkit/themes/shared/icons/torbrowser.png - toolkit/themes/shared/minimal-toolkit.jar.inc.mn - + toolkit/themes/shared/onion-pattern.css - + toolkit/themes/shared/onion-pattern.svg - + toolkit/themes/shared/tor-colors.css - + toolkit/torbutton/chrome/locale/en-US/onionLocation.properties - + toolkit/torbutton/chrome/locale/en-US/settings.properties - + toolkit/torbutton/chrome/locale/en-US/torConnect.properties - + toolkit/torbutton/chrome/locale/en-US/torlauncher.properties - + toolkit/torbutton/jar.mn - + toolkit/torbutton/moz.build - toolkit/xre/LauncherRegistryInfo.cpp - toolkit/xre/MacLaunchHelper.h - toolkit/xre/MacLaunchHelper.mm - toolkit/xre/MacRunFromDmgUtils.mm - toolkit/xre/ProfileReset.cpp - toolkit/xre/dllservices/mozglue/WindowsDllBlocklist.cpp - toolkit/xre/nsAppRunner.cpp - toolkit/xre/nsIXREDirProvider.idl - toolkit/xre/nsUpdateDriver.cpp - toolkit/xre/nsXREDirProvider.cpp - toolkit/xre/nsXREDirProvider.h - + tools/base-browser/git-rebase-fixup-preprocessor - + tools/base-browser/l10n/combine-translation-versions.py - + tools/base-browser/l10n/combine/__init__.py - + tools/base-browser/l10n/combine/combine.py - + tools/base-browser/l10n/combine/tests/README - + tools/base-browser/l10n/combine/tests/__init__.py - + tools/base-browser/l10n/combine/tests/test_android.py - + tools/base-browser/l10n/combine/tests/test_dtd.py - + tools/base-browser/l10n/combine/tests/test_fluent.py - + tools/base-browser/l10n/combine/tests/test_properties.py - + tools/base-browser/missing-css-variables.py - + tools/base-browser/tb-dev - + tools/geckoview/.gitignore - + tools/geckoview/Makefile - + tools/geckoview/android-env-linux-template.sh - + tools/geckoview/android-env-macos-template.sh - + tools/geckoview/build-fenix.sh - + tools/geckoview/build-geckoview.sh - + tools/geckoview/clobber.sh - + tools/geckoview/config.sh - + tools/geckoview/install-fenix.sh - + tools/geckoview/jslint.sh - tools/lint/fluent-lint/exclusions.yml - tools/lint/l10n.yml - + tools/torbrowser/Makefile - + tools/torbrowser/browser-self-sign-macos.sh - + tools/torbrowser/build.sh - + tools/torbrowser/clobber.sh - + tools/torbrowser/config.sh - + tools/torbrowser/deploy.sh - + tools/torbrowser/fetch.sh - + tools/torbrowser/generate-bugzilla-triage-csv.sh - + tools/torbrowser/ide.sh - + tools/torbrowser/jslint.sh - + tools/torbrowser/l10n/migrate.py - + tools/torbrowser/l10n/migrations/__init__.py - + tools/torbrowser/l10n/migrations/bug-41333-new-about-tor.py - + tools/torbrowser/l10n/migrations/bug-41622-neterror.py - + tools/torbrowser/l10n/migrations/bug-41820-moz-message-bar-download-warning.py - + tools/torbrowser/l10n/migrations/bug-42202-crypto-safety.py - + tools/torbrowser/l10n/migrations/bug-42203-about-dialog.py - + tools/torbrowser/l10n/migrations/bug-42206-rulesets.py - + tools/torbrowser/l10n/migrations/bug-42207-settings.py - + tools/torbrowser/l10n/migrations/bug-42209-tor-circuit.py - + tools/torbrowser/l10n/migrations/bug-42210-download-warning.py - + tools/torbrowser/l10n/migrations/bug-42211-new-identity.py - + tools/torbrowser/l10n/migrations/bug-42212-onion-services.py - + tools/torbrowser/l10n/migrations/bug-42214-security-level.py - + tools/torbrowser/l10n/migrations/bug-43531-bridge-dialog-buttons.py - + tools/torbrowser/prepare-tests.sh - + tools/torbrowser/update_emojis.py - tools/update-packaging/common.sh - tools/update-packaging/make_full_update.sh - tools/update-packaging/make_incremental_update.sh - uriloader/base/nsURILoader.cpp - uriloader/exthandler/nsExternalHelperAppService.cpp - widget/ScrollbarDrawingWin.cpp - widget/ScrollbarDrawingWin11.cpp - widget/android/WebExecutorSupport.cpp - widget/gtk/MPRISServiceHandler.cpp - widget/gtk/WidgetUtilsGtk.cpp - widget/windows/WinTaskbar.cpp - widget/windows/nsDataObj.cpp - xpcom/base/ErrorList.py - xpcom/ds/StaticAtoms.py - xpcom/io/CocoaFileUtils.mm - xpcom/io/nsAppFileLocationProvider.cpp - xpfe/appshell/AppWindow.cpp The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/fb215b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/fb215b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41474: update README to explain that moat-settings project requires jq to be installed
by morgan (＠morgan) 04 Sep '25

04 Sep '25

morgan pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: b597b58f by Morgan at 2025-09-03T13:42:04+00:00 Bug 41474: update README to explain that moat-settings project requires jq to be installed - - - - - 1 changed file: - README Changes: ===================================== README ===================================== @@ -15,6 +15,9 @@ be installed. Zstandard (zstd) is used to compress some tarballs and needs to be installed. You'll also need tar >= 1.31, for zstd support. +The jq tool is required to process the json used to generate the country +list used by the browser's censorship circumvention system. + You also need a few perl modules installed: - YAML::XS - File::Basename @@ -46,7 +49,7 @@ If you are running Debian or Ubuntu, you can install them with: libparallel-forkmanager-perl libpath-tiny-perl \ libsort-versions-perl libstring-shellquote-perl \ libtemplate-perl libxml-libxml-perl libxml-writer-perl \ - libyaml-libyaml-perl git uidmap zstd + libyaml-libyaml-perl git uidmap zstd jq If you are running Fedora, CentOS or RHEL, you can install them with: @@ -57,7 +60,7 @@ If you are running Fedora, CentOS or RHEL, you can install them with: "perl(File::Copy::Recursive)" "perl(String::ShellQuote)" \ "perl(Sort::Versions)" "perl(Digest::SHA)" "perl(Data::UUID)" \ "perl(Data::Dump)" "perl(DateTime)" "perl(XML::Writer)" \ - "perl(Parallel::ForkManager)" perl-ph git zstd + "perl(Parallel::ForkManager)" perl-ph git zstd jq If you are running an Arch based system, you should be able to install them with: @@ -67,7 +70,7 @@ If you are running an Arch based system, you should be able to install them with perl-sort-versions perl-data-uuid perl-data-dump perl-json \ perl-digest-sha1 perl-io-all perl-file-slurp perl-sys-syscall \ perl-parallel-forkmanager perl-xml-libxml perl-lwp-protocol-https \ - zstd + zstd jq On Arch based systems you also need to generate some .ph files RBM expects: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.2.0esr-15.0-1] 3 commits: fixup! BB 43564: Modify ./mach bootstrap for Base Browser
by brizental (＠brizental) 04 Sep '25

04 Sep '25

brizental pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 35347c26 by Beatriz Rizental at 2025-09-04T14:28:01+02:00 fixup! BB 43564: Modify ./mach bootstrap for Base Browser - - - - - f17c4e08 by Beatriz Rizental at 2025-09-04T14:28:30+02:00 fixup! BB 43564: Modify ./mach bootstrap for Tor Browser - - - - - c8b4882e by Beatriz Rizental at 2025-09-04T14:51:58+02:00 fixup! Add CI for Base Browser Run all of our python tests everytime. This is a quick workaround for tests to pass, before I address it properly in tor-browser#44149 - - - - - 5 changed files: - .gitlab/ci/jobs/test/python-test.yml - build/moz.configure/bootstrap.configure - python/mozbuild/mozbuild/tbbutils.py - python/mozbuild/mozbuild/test/python.toml - + python/mozbuild/mozbuild/test/test_tbbutils.py Changes: ===================================== .gitlab/ci/jobs/test/python-test.yml ===================================== @@ -17,7 +17,7 @@ python-test: - firefox script: - ./mach configure --with-base-browser-version=0.0.0 - - .gitlab/ci/jobs/helpers.py --get-changed-files | xargs -0 --no-run-if-empty ./mach python-test -v + - ./mach python-test --subsuite base-browser rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' || ($CI_COMMIT_BRANCH && $CI_COMMIT_REF_PROTECTED == 'true' && $CI_PIPELINE_SOURCE == 'push') changes: ===================================== build/moz.configure/bootstrap.configure ===================================== @@ -205,9 +205,7 @@ def bootstrap_path(path, **kwargs): if not target.tor_browser_build_alias: return False - artifact = mozbuild.tbbutils.get_artifact_name( - path_parts[0], target, tasks.prefix - ) + artifact = mozbuild.tbbutils.get_artifact_name(path_parts[0], tasks.prefix) if not artifact: log.info("%s is not mapped to a tbb artifact", path_parts[0]) return False ===================================== python/mozbuild/mozbuild/tbbutils.py ===================================== @@ -45,7 +45,7 @@ ARTIFACT_NAME_MAP = { } -def get_artifact_name(original_artifact_name, target, host): +def get_artifact_name(original_artifact_name, host): # These are not build artifacts, they are pre-built artifacts to be added to the final build, # therefore this check can come before the host check. if original_artifact_name in TOR_BROWSER_BUILD_ARTIFACTS: @@ -76,7 +76,7 @@ def get_artifact_path(url, artifact, target, prefix=""): def filter_files(files, keyword): return [file for file in files if keyword in file] - artifact_files = filter_files(files, artifact) + artifact_files = [file for file in files if file.startswith(artifact)] if len(artifact_files) == 1: return f"{url}/{path}/{artifact_files[0]}" @@ -84,8 +84,13 @@ def get_artifact_path(url, artifact, target, prefix=""): files_per_os = filter_files(artifact_files, target.tor_browser_build_alias) # If there are files in the folder, but they don't have the OS in the name - # it means we can get any of them because they can be used to build for any OS. - # So let's just get the first one. + # it probably means we can get any of them because they can be used to build + # for any OS. So let's just get the first one. + # + # Note: It could be the case that the artifact _is_ OS dependant, but there + # just are no files for the OS we are looking for. In that case, this will + # return an incorrect artifact. This should not happen often though and is + # something we cannot address until artifact names are standardized on tbb. if len(files_per_os) == 0: return f"{url}/{artifact}/{artifact_files[0]}" ===================================== python/mozbuild/mozbuild/test/python.toml ===================================== @@ -111,6 +111,9 @@ subsuite = "mozbuild" ["test_rewrite_mozbuild.py"] +["test_tbbutils.py"] +subsuite = "base-browser" + ["test_telemetry.py"] ["test_telemetry_settings.py"] ===================================== python/mozbuild/mozbuild/test/test_tbbutils.py ===================================== @@ -0,0 +1,151 @@ +import unittest +from types import SimpleNamespace +from unittest.mock import MagicMock, patch + +import mozunit + +from mozbuild.tbbutils import get_artifact_path, list_files_http + + +class TestGetArtifactName(unittest.TestCase): + def setUp(self): + self.artifact = "artifact" + self.host = "linux64" + + @patch("mozbuild.tbbutils.TOR_BROWSER_BUILD_ARTIFACTS", new=["artifact"]) + def test_artifact_in_tbb_artifacts(self): + from mozbuild.tbbutils import get_artifact_name + + result = get_artifact_name(self.artifact, self.host) + self.assertEqual(result, self.artifact) + + @patch("mozbuild.tbbutils.ARTIFACT_NAME_MAP", new={"artifact": "tcafitra"}) + def test_host_is_not_linux64(self): + from mozbuild.tbbutils import get_artifact_name + + result = get_artifact_name(self.artifact, "linux64-aarch64") + self.assertIsNone(result) + + @patch("mozbuild.tbbutils.ARTIFACT_NAME_MAP", new={"artifact": "tcafitra"}) + def test_mapped_artifact(self): + from mozbuild.tbbutils import get_artifact_name + + result = get_artifact_name(self.artifact, self.host) + self.assertEqual(result, self.artifact[::-1]) + + +class TestGetArtifactPath(unittest.TestCase): + def setUp(self): + self.url = "http://example.com" + self.artifact = "artifact" + # This is just an example target which is valid. But it doesn't make + # any difference and could be anything for these tests. + self.target = SimpleNamespace(tor_browser_build_alias="linux", cpu="x86_64") + + @patch("mozbuild.tbbutils.list_files_http") + def test_no_files_returns_none(self, mock_list_files): + mock_list_files.return_value = [] + result = get_artifact_path(self.url, self.artifact, self.target) + self.assertIsNone(result) + + @patch("mozbuild.tbbutils.list_files_http") + def test_single_artifact_match(self, mock_list_files): + mock_list_files.return_value = ["artifact-1.zip"] + result = get_artifact_path(self.url, self.artifact, self.target) + self.assertEqual(result, f"{self.url}/{self.artifact}/artifact-1.zip") + + @patch("mozbuild.tbbutils.list_files_http") + def test_artifact_without_os_returns_first(self, mock_list_files): + mock_list_files.return_value = ["artifact-1.zip", "artifact-2.zip"] + result = get_artifact_path(self.url, self.artifact, self.target) + self.assertTrue(result.startswith(f"{self.url}/{self.artifact}/")) + self.assertIn("artifact-", result) + + @patch("mozbuild.tbbutils.list_files_http") + def test_artifact_with_os_match(self, mock_list_files): + mock_list_files.return_value = [ + "artifact-windows.zip", + "artifact-linux.zip", + ] + result = get_artifact_path(self.url, self.artifact, self.target) + self.assertEqual(result, f"{self.url}/{self.artifact}/artifact-linux.zip") + + @patch("mozbuild.tbbutils.list_files_http") + def test_artifact_with_cpu_match(self, mock_list_files): + mock_list_files.return_value = [ + "artifact-linux-arm.zip", + "artifact-linux-x86_64.zip", + ] + result = get_artifact_path(self.url, self.artifact, self.target) + self.assertEqual( + result, f"{self.url}/{self.artifact}/artifact-linux-x86_64.zip" + ) + + @patch("mozbuild.tbbutils.list_files_http") + def test_artifact_with_prefix(self, mock_list_files): + mock_list_files.return_value = ["artifact-1.zip"] + + prefix = "prefix" + result = get_artifact_path(self.url, self.artifact, self.target, prefix=prefix) + self.assertEqual(result, f"{self.url}/{prefix}/artifact-1.zip") + mock_list_files.assert_called_with(f"{self.url}/{prefix}?C=M;O=D") + + +class TestListFilesHttp(unittest.TestCase): + def setUp(self): + self.url = "http://example.com" + + @patch("mozbuild.tbbutils.urlopen") + def test_non_200_status_returns_empty(self, mock_urlopen): + mock_resp = MagicMock() + mock_resp.status = 404 + mock_resp.read.return_value = b"" + mock_urlopen.return_value.__enter__.return_value = mock_resp + + result = list_files_http(self.url) + self.assertEqual(result, []) + + @patch("mozbuild.tbbutils.urlopen") + def test_exception_returns_empty(self, mock_urlopen): + mock_urlopen.side_effect = Exception("network error") + result = list_files_http(self.url) + self.assertEqual(result, []) + + @patch("mozbuild.tbbutils.urlopen") + def test_regular_links(self, mock_urlopen): + html = b""" + <html><body> + <a href="../">Parent</a> + <a href="file1.zip">file1</a> + <a href="file2.zip">file2</a> + </body></html> + """ + mock_resp = MagicMock() + mock_resp.status = 200 + mock_resp.read.return_value = html + mock_urlopen.return_value.__enter__.return_value = mock_resp + + result = list_files_http(self.url) + self.assertEqual(result, ["file1.zip", "file2.zip"]) + + @patch("mozbuild.tbbutils.urlopen") + def test_tor_expert_bundle_rewrites(self, mock_urlopen): + html = """ + <a href="tor-expert-bundle">bundle</a> + """ + mock_resp = MagicMock() + mock_resp.status = 200 + mock_resp.read.return_value = html.encode() + mock_urlopen.return_value.__enter__.return_value = mock_resp + + result = list_files_http(self.url) + self.assertEqual( + result, + [ + "tor-expert-bundle/tor-expert-bundle.tar.gz", + ], + ) + + +if __name__ == "__main__": + mozunit.main() View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/8a7c97… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/8a7c97… You're receiving this email because of your account on gitlab.torproject.org.

1 0