- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][tor-browser-128.7.0esr-14.5-1] 2 commits: dropme! BB 40925: Implemented the Security Level component
by morgan (＠morgan) 19 Feb '25

19 Feb '25

morgan pushed to branch tor-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 7fc0ffe8 by Pier Angelo Vendrame at 2025-02-19T08:57:31+01:00 dropme! BB 40925: Implemented the Security Level component BB 43498: Remove our old patch for 43129. This commit should be ignored at the next rebase (and we will likely have a conflict on the security level commit). - - - - - 7b27fd84 by Pier Angelo Vendrame at 2025-02-19T08:57:43+01:00 Bug 1923260 - Exempt Android resources from svg.disabled. r=peterv Differential Revision: https://phabricator.services.mozilla.com/D224895 - - - - - 1 changed file: - dom/base/nsNodeInfoManager.cpp Changes: ===================================== dom/base/nsNodeInfoManager.cpp ===================================== @@ -344,16 +344,6 @@ void nsNodeInfoManager::RemoveNodeInfo(NodeInfo* aNodeInfo) { } static bool IsSystemOrAddonOrAboutPrincipal(nsIPrincipal* aPrincipal) { -#ifdef ANDROID - if (aPrincipal->SchemeIs("resource")) { - nsAutoCString spec; - aPrincipal->GetAsciiSpec(spec); - if (StringBeginsWith(spec, "resource://android/assets/"_ns)) { - return true; - } - } -#endif - return aPrincipal->IsSystemPrincipal() || BasePrincipal::Cast(aPrincipal)->AddonPolicy() || // NOTE: about:blank and about:srcdoc inherit the principal of their @@ -361,6 +351,21 @@ static bool IsSystemOrAddonOrAboutPrincipal(nsIPrincipal* aPrincipal) { aPrincipal->SchemeIs("about"); } +static bool IsAndroidResource(nsIURI* aURI) { +#ifdef ANDROID + if (aURI->SchemeIs("resource")) { + nsAutoCString host, path; + aURI->GetHost(host); + aURI->GetFilePath(path); + if (host.EqualsLiteral("android") && + StringBeginsWith(path, "/assets/"_ns)) { + return true; + } + } +#endif + return false; +} + bool nsNodeInfoManager::InternalSVGEnabled() { MOZ_ASSERT(!mSVGEnabled, "Caller should use the cached mSVGEnabled!"); @@ -386,6 +391,7 @@ bool nsNodeInfoManager::InternalSVGEnabled() { // of system or add-on UI or about: page) bool conclusion = (SVGEnabled || IsSystemOrAddonOrAboutPrincipal(mPrincipal) || + IsAndroidResource(mDocument->GetDocumentURI()) || (loadInfo && (loadInfo->GetExternalContentPolicyType() == ExtContentPolicy::TYPE_IMAGE || View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/6fa642… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/6fa642… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] 3 commits: Bug 41363: Split update_responses files per platform
by morgan (＠morgan) 19 Feb '25

19 Feb '25

morgan pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 8b3ef788 by Nicolas Vigier at 2025-02-19T04:18:14+01:00 Bug 41363: Split update_responses files per platform To make reverting update for a single platform easier, we split update response files, using a separate directory for each platform. - - - - - 38dcaae7 by Nicolas Vigier at 2025-02-19T04:19:25+01:00 Bug 41363: Make separate update_responses commit for each platform - - - - - 7504979e by Nicolas Vigier at 2025-02-19T04:19:29+01:00 Bug 41363: Fix error message about $update_responses_repository_dir being undefined - - - - - 4 changed files: - projects/release/create_update_responses_tar - tools/signing/functions - tools/signing/upload-update_responses-to-staticiforme - tools/update-responses/update_responses Changes: ===================================== projects/release/create_update_responses_tar ===================================== @@ -1,9 +1,10 @@ #!/bin/bash [% c("var/set_default_env") -%] [% SET channel = c('var/channel') -%] +rm -Rf [% shell_quote(c("basedir")) %]/tools/update-responses/htdocs/[% channel %] [% shell_quote(c("basedir")) %]/tools/update-responses/update_responses [% channel %] mkdir -p [% shell_quote(path(dest_dir)) %]/update-responses mv [% shell_quote(c("basedir")) %]/tools/update-responses/htdocs/[% channel %] [% channel %] -chmod 775 [% channel %] -chmod 664 [% channel %]/.htaccess [% channel %]/* +find [% channel %] -type d -exec chmod 775 {} \; +find [% channel %] -type f -exec chmod 664 {} \; tar cf [% shell_quote(path(dest_dir)) %]/update-responses/update-responses-[% channel %]-[% c("version") %].tar [% channel %] ===================================== tools/signing/functions ===================================== @@ -23,7 +23,7 @@ function check_update_responses_repository_dir { if test -z "$update_responses_repository_dir" || ! test -d "$update_responses_repository_dir" then cat << 'EOF' > /dev/stderr -$aus1_repository_dir is not defined, or the directory does not exist +$update_responses_repository_dir is not defined, or the directory does not exist You should clone git@gitlab.torproject.org:tpo/applications/tor-browser-update-responses.git and set $update_responses_repository_dir in set-config.update-responses EOF ===================================== tools/signing/upload-update_responses-to-staticiforme ===================================== @@ -39,8 +39,32 @@ do mv "$file" "$tbb_version_type/$fname" done +# Keep directory from previous release if they are not in the new release. +# This happens when a release does not include some platforms. +for file in $(ls -1 "$old_ur/$tbb_version_type") +do + test -d "$old_ur/$tbb_version_type/$file" || continue + test -d "$tbb_version_type/$file" && continue + mv -f "$old_ur/$tbb_version_type/$file" "$tbb_version_type/$file" +done + +# Commit each sub-directory separately +for file in $(ls -1 "$tbb_version_type") +do + test -d "$tbb_version_type/$file" || continue + git add "$tbb_version_type/$file" + git add "$tbb_version_type/download-$file.json" + git diff --quiet --cached --exit-code || \ + git commit -m "$tbb_version_type: new version, $tbb_version ($file)" +done + +git add "$tbb_version_type"/download-android-*.json +git diff --quiet --cached --exit-code || \ + git commit -m "$tbb_version_type: new version, $tbb_version (android)" + git add "$tbb_version_type" -git commit -m "$tbb_version_type: new version, $tbb_version" +git diff --quiet --cached --exit-code || \ + git commit -m "$tbb_version_type: new version, $tbb_version" git push # we just need to push mullvadbrowser's update responses to git, not deploy to staticiforme ===================================== tools/update-responses/update_responses ===================================== @@ -29,7 +29,6 @@ setlocale(LC_ALL, "C"); my $htdocsdir = "$FindBin::Bin/htdocs"; my $config = LoadFile("$FindBin::Bin/config.yml"); -my %htdocsfiles; my $releases_dir = $config->{releases_dir}; $releases_dir = "$FindBin::Bin/$releases_dir" unless $releases_dir =~ m/^\//; my @check_errors; @@ -51,12 +50,6 @@ sub get_tmpdir { : ()); } -sub build_targets_by_os { - exit_error "Unknown build target for OS $_[0]" unless $config->{build_targets}{$_[0]}; - my $r = $config->{build_targets}{$_[0]}; - return ref $r eq 'ARRAY' ? @$r : ($r); -} - sub get_nbprocs { return $ENV{NUM_PROCS} if defined $ENV{NUM_PROCS}; if (-f '/proc/cpuinfo') { @@ -80,19 +73,11 @@ sub setup_martools { } sub write_htdocs { - my ($channel, $file, $content) = @_; + my ($channel, $dir, $file, $content) = @_; mkdir $htdocsdir unless -d $htdocsdir; mkdir "$htdocsdir/$channel" unless -d "$htdocsdir/$channel"; - write_file("$htdocsdir/$channel/$file", $content); - $htdocsfiles{$channel}->{$file} = 1; -} - -sub clean_htdocs { - my ($channel) = @_; - opendir(my $d, "$htdocsdir/$channel"); - my @files = grep { ! $htdocsfiles{$channel}->{$_} } readdir $d; - closedir $d; - unlink map { "$htdocsdir/$channel/$_" } @files; + mkdir "$htdocsdir/$channel/$dir" unless -d "$htdocsdir/$channel/$dir"; + write_file("$htdocsdir/$channel/$dir/$file", $content); } sub get_sha512_hex_of_file { @@ -418,24 +403,31 @@ sub write_responses { my $versions_str = join('+', @$versions); foreach my $os (keys %oses) { my $resp = get_response($config, $versions, $os); - write_htdocs($channel, "$versions_str-$os.xml", $resp); + write_htdocs($channel, $os, "$versions_str-$os.xml", $resp); foreach my $from_version (keys %from_versions) { $resp = get_response($config, $versions, $os, $from_version); - write_htdocs($channel, "$from_version-$versions_str-$os.xml", $resp); + write_htdocs($channel, $os, "$from_version-$versions_str-$os.xml", $resp); } + write_htdocs($channel, $os, 'no-update.xml', + '<?xml version="1.0" encoding="UTF-8"?>' + . "\n<updates></updates>\n"); } - write_htdocs($channel, 'no-update.xml', - '<?xml version="1.0" encoding="UTF-8"?>' - . "\n<updates></updates>\n"); } sub write_htaccess { my ($config, $channel) = @_; - my $flags = "[last]"; - my $htaccess = "RewriteEngine On\n"; - $htaccess .= $config->{htaccess_rewrite_rules}{$channel} // ''; + + my $htaccess_main = "RewriteEngine On\n"; + $htaccess_main .= $config->{htaccess_rewrite_rules}{$channel} // ''; my $versions = as_array($config->{channels}{$channel}); my $versions_str = join('+', @$versions); + foreach my $os (sort keys %{$config->{build_targets}}) { + foreach my $bt (@{ as_array($config->{build_targets}{$os}) }) { + $htaccess_main .= "RewriteRule ^$bt/(.*) $os/\$1 [last]\n"; + } + } + write_htdocs($channel, '.', '.htaccess', $htaccess_main); + my (%oses, %from_versions); foreach my $version (@$versions) { my $files = $config->{versions}{$version}{files}; @@ -445,20 +437,20 @@ sub write_htaccess { $from_versions{$from_version} = 1; } } - $htaccess .= "RewriteRule ^[^\/]+/$version/ no-update.xml $flags\n"; } - foreach my $os (sort keys %oses) { - foreach my $bt (build_targets_by_os($os)) { + foreach my $version (@$versions) { + my $files = $config->{versions}{$version}{files}; + foreach my $os (sort keys %oses) { + my $htaccess_os = "RewriteEngine On\n"; + $htaccess_os .= "RewriteRule ^$version/ no-update.xml [last]\n"; foreach my $from_version (sort keys %from_versions) { - $htaccess .= "RewriteRule ^$bt/$from_version/ALL " - . "$from_version-$versions_str-$os.xml $flags\n"; + $htaccess_os .= "RewriteRule ^$from_version/ " + . "$from_version-$versions_str-$os.xml [last]\n"; } - $htaccess .= "RewriteRule ^$bt/[^\/]+/ALL " - . "$versions_str-$os.xml $flags\n"; - $htaccess .= "RewriteRule ^$bt/ $versions_str-$os.xml $flags\n"; + $htaccess_os .= "RewriteRule ^[^\/]+/ $versions_str-$os.xml [last]\n"; + write_htdocs($channel, $os, '.htaccess', $htaccess_os); } } - write_htdocs($channel, '.htaccess', $htaccess); } sub write_downloads_json { @@ -472,11 +464,11 @@ sub write_downloads_json { tag => "$tag", downloads => get_version_downloads($config, $version), }; - write_htdocs($channel, 'downloads.json', + write_htdocs($channel, '.', 'downloads.json', JSON->new->utf8->canonical->encode($data)); my $pp_downloads = get_perplatform_downloads($config, $version, $tag); foreach my $os (keys %{$pp_downloads}) { - write_htdocs($channel, "download-$os.json", + write_htdocs($channel, '.', "download-$os.json", JSON->new->utf8->canonical->encode($pp_downloads->{$os})); } } @@ -636,11 +628,9 @@ my %actions = ( exit_error "Wrong arguments" unless @ARGV == 1; my $channel = $ARGV[0]; exit_error "Unknown channel $channel" unless $config->{channels}{$channel}; - $htdocsfiles{$channel} = { '.' => 1, '..' => 1 }; write_responses($config, $channel); write_htaccess($config, $channel); write_downloads_json($config, $channel); - clean_htdocs($channel); }, gen_incrementals => sub { my ($config) = @_; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] 3 commits: Bug 41374: Remove support for migrate_archs and migrate_langs in update_responses
by morgan (＠morgan) 18 Feb '25

18 Feb '25

morgan pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 8adf3820 by Nicolas Vigier at 2025-02-18T13:29:49+00:00 Bug 41374: Remove support for migrate_archs and migrate_langs in update_responses Those options have not been used for some time, and removing them simplifies the following changes we're doing to split files per platform. - - - - - 16dabc5e by Nicolas Vigier at 2025-02-18T13:29:49+00:00 Bug 40799: Remove legacy locale iteration in update-responses - - - - - 002fb3b9 by Nicolas Vigier at 2025-02-18T13:29:49+00:00 Bug 40799: Remove legacy locale support in tools/dmg2mar - - - - - 3 changed files: - projects/release/update_responses_config.yml - tools/dmg2mar - tools/update-responses/update_responses Changes: ===================================== projects/release/update_responses_config.yml ===================================== @@ -51,10 +51,6 @@ versions: - [% ver %] [% END; END -%] - # for example, osx32: osx64 - migrate_archs: - # for example, pt-PT: pt-BR - migrate_langs: # minSupportedOsVersion on macOS corresponds to the Darwin version ( https://en.wikipedia.org/wiki/Darwin_(operating_system) ) macos: # macOS v10.15.0 ===================================== tools/dmg2mar ===================================== @@ -102,7 +102,7 @@ sub get_dmg_files_from_sha256sums { next unless $filename; chomp $filename; next unless $filename =~ m/^$appname_dmg-macos-(.+)\.dmg$/; - push @files, { filename => $filename, version => $1, lang => 'ALL' }; + push @files, { filename => $filename, version => $1 }; } return @files; } @@ -116,11 +116,7 @@ sub convert_files { print "Finished $_[2]\n"; }); foreach my $file (get_dmg_files_from_sha256sums) { - # The 'ja' locale is a special case: it is called 'ja-JP-mac' - # internally on OSX, but the dmg file still uses 'ja' to avoid - # confusing users. - my $mar_lang = $file->{lang} eq 'ja' ? 'ja-JP-mac' : $file->{lang}; - my $output = "$appname_mar-macos-$file->{version}_$mar_lang.mar"; + my $output = "$appname_mar-macos-$file->{version}_ALL.mar"; my $step_name = "$file->{filename} -> $output"; print "Starting $step_name\n"; $pm->start($step_name) and next; ===================================== tools/update-responses/update_responses ===================================== @@ -113,9 +113,9 @@ sub get_version_files { foreach my $file (readdir $d) { next unless -f "$vdir/$file"; if ($file !~ m/incremental\.mar$/ && - $file =~ m/^$appname-(.+)-${version}_(.+)\.mar$/) { - my ($os, $lang) = ($1, $2); - $files->{$os}{$lang}{complete} = { + $file =~ m/^$appname-(.+)-${version}_ALL\.mar$/) { + my $os = $1; + $files->{$os}{complete} = { type => 'complete', URL => "$download_url/$file", size => -s "$vdir/$file", @@ -126,9 +126,9 @@ sub get_version_files { }; next; } - if ($file =~ m/^$appname-(.+)--(.+)-${version}_(.+)\.incremental\.mar$/) { - my ($os, $from_version, $lang) = ($1, $2, $3); - $files->{$os}{$lang}{partial}{$from_version} = { + if ($file =~ m/^$appname-(.+)--(.+)-${version}_ALL\.incremental\.mar$/) { + my ($os, $from_version) = ($1, $2); + $files->{$os}{partial}{$from_version} = { type => 'partial', URL => "$download_url/$file", size => -s "$vdir/$file", @@ -235,14 +235,14 @@ sub extract_mar { } sub mar_filename { - my ($config, $appname, $version, $os, $lang) = @_; - version_dir($config, $version) . "/$appname-$os-${version}_$lang.mar"; + my ($config, $appname, $version, $os) = @_; + version_dir($config, $version) . "/$appname-$os-${version}_ALL.mar"; } sub create_incremental_mar { - my ($config, $pm, $from_version, $new_version, $os, $lang, $channel) = @_; + my ($config, $pm, $from_version, $new_version, $os, $channel) = @_; my $appname = $config->{appname_marfile}; - my $mar_file = "$appname-$os--${from_version}-${new_version}_$lang.incremental.mar"; + my $mar_file = "$appname-$os--${from_version}-${new_version}_ALL.incremental.mar"; my $mar_file_path = version_dir($config, $new_version) . '/' . $mar_file; if ($ENV{MAR_SKIP_EXISTING} && -f $mar_file_path) { print "Skipping $mar_file\n"; @@ -253,7 +253,7 @@ sub create_incremental_mar { my $finished_file = sub { exit_error "Error creating $mar_file" unless $_[1] == 0; print "Finished $mar_file\n"; - $config->{versions}{$new_version}{files}{$os}{$lang}{partial}{$from_version} = { + $config->{versions}{$new_version}{files}{$os}{partial}{$from_version} = { type => 'partial', URL => "$download_url/$mar_file", size => -s $mar_file_path, @@ -267,9 +267,9 @@ sub create_incremental_mar { my $tmpdir = get_tmpdir($config); my $mar_c_from = get_config($config, $from_version, $os, 'mar_compression'); my $mar_c_new = get_config($config, $new_version, $os, 'mar_compression'); - extract_mar(mar_filename($config, $appname, $from_version, $os, $lang), + extract_mar(mar_filename($config, $appname, $from_version, $os), "$tmpdir/A", $mar_c_from); - extract_mar(mar_filename($config, $appname, $new_version, $os, $lang), + extract_mar(mar_filename($config, $appname, $new_version, $os), "$tmpdir/B", $mar_c_new); # bug 26054: make sure previous macOS version is code signed if (!$ENV{NO_CODESIGNATURE} && ($os eq 'macos') @@ -306,10 +306,8 @@ sub create_incremental_mars_for_version { get_version_files($config, $from_version); my $from_v = $config->{versions}{$from_version}; foreach my $os (keys %{$v->{files}}) { - foreach my $lang (keys %{$v->{files}{$os}}) { - next unless defined $from_v->{files}{$os}{$lang}{complete}; - create_incremental_mar($config, $pm, $from_version, $version, $os, $lang, $channel); - } + next unless defined $from_v->{files}{$os}{complete}; + create_incremental_mar($config, $pm, $from_version, $version, $os, $channel); } } $pm->wait_all_children; @@ -333,31 +331,29 @@ sub get_buildinfos { setup_martools; my $files = $config->{versions}{$version}{files}; foreach my $os (keys %$files) { - foreach my $lang (keys %{$files->{$os}}) { - next unless $files->{$os}{$lang}{complete}; - my $tmpdir = get_tmpdir($config); - my $mar_compression = get_config($config, $version, $os, 'mar_compression'); - extract_mar( - mar_filename($config, $config->{appname_marfile}, $version, $os, $lang), - "$tmpdir", - $mar_compression); - my $appfile = "$tmpdir/application.ini" if -f "$tmpdir/application.ini"; - $appfile = "$tmpdir/Contents/Resources/application.ini" - if -f "$tmpdir/Contents/Resources/application.ini"; - exit_error "Could not find application.ini" unless $appfile; - foreach my $line (read_file($appfile)) { - if ($line =~ m/^BuildID=(.*)$/) { - $config->{versions}{$version}{buildID} = $1; - return; - } + next unless $files->{$os}{complete}; + my $tmpdir = get_tmpdir($config); + my $mar_compression = get_config($config, $version, $os, 'mar_compression'); + extract_mar( + mar_filename($config, $config->{appname_marfile}, $version, $os), + "$tmpdir", + $mar_compression); + my $appfile = "$tmpdir/application.ini" if -f "$tmpdir/application.ini"; + $appfile = "$tmpdir/Contents/Resources/application.ini" + if -f "$tmpdir/Contents/Resources/application.ini"; + exit_error "Could not find application.ini" unless $appfile; + foreach my $line (read_file($appfile)) { + if ($line =~ m/^BuildID=(.*)$/) { + $config->{versions}{$version}{buildID} = $1; + return; } - exit_error "Could not extract buildID from application.ini"; } + exit_error "Could not extract buildID from application.ini"; } } sub get_response { - my ($config, $versions, $os, $lang, $from_version) = @_; + my ($config, $versions, $os, $from_version) = @_; my $res; my $writer = XML::Writer->new(OUTPUT => \$res, ENCODING => 'UTF-8'); $writer->xmlDecl; @@ -384,13 +380,13 @@ sub get_response { defined $minversion ? ( minSupportedOSVersion => $minversion ) : (), defined $mininstruc ? ( minSupportedInstructionSet => $mininstruc ) : (), ); - if (my $patch = $config->{versions}{$version}{files}{$os}{$lang}{complete}) { + if (my $patch = $config->{versions}{$version}{files}{$os}{complete}) { my @sorted_patch = map { $_ => $patch->{$_} } sort keys %$patch; $writer->startTag('patch', @sorted_patch); $writer->endTag('patch'); } if ($from_version) { - if (my $patch = $config->{versions}{$version}{files}{$os}{$lang}{partial}{$from_version}) { + if (my $patch = $config->{versions}{$version}{files}{$os}{partial}{$from_version}) { my @sorted_patch = map { $_ => $patch->{$_} } sort keys %$patch; $writer->startTag('patch', @sorted_patch); $writer->endTag('patch'); @@ -407,38 +403,25 @@ sub get_response { sub write_responses { my ($config, $channel) = @_; my $versions = as_array($config->{channels}{$channel}); - my (%oses, %langs, %from_versions); + my (%oses, %from_versions); foreach my $version (@$versions) { get_version_files($config, $version); get_buildinfos($config, $version); my $files = $config->{versions}{$version}{files}; - my $migrate_archs = $config->{versions}{$version}{migrate_archs} // {}; - foreach my $old_os (keys %$migrate_archs) { - my $new_os = $migrate_archs->{$old_os}; - foreach my $lang (keys %{$files->{$new_os}}) { - $files->{$old_os}{$lang}{complete} = - $files->{$new_os}{$lang}{complete}; - } - } foreach my $os (keys %$files) { $oses{$os} = 1; - foreach my $lang (keys %{$files->{$os}}) { - $langs{$lang} = 1; - foreach my $from_version (keys %{$files->{$os}{$lang}{partial}}) { - $from_versions{$from_version} = 1; - } + foreach my $from_version (keys %{$files->{$os}{partial}}) { + $from_versions{$from_version} = 1; } } } my $versions_str = join('+', @$versions); foreach my $os (keys %oses) { - foreach my $lang (keys %langs) { - my $resp = get_response($config, $versions, $os, $lang); - write_htdocs($channel, "$versions_str-$os-$lang.xml", $resp); - foreach my $from_version (keys %from_versions) { - $resp = get_response($config, $versions, $os, $lang, $from_version); - write_htdocs($channel, "$from_version-$versions_str-$os-$lang.xml", $resp); - } + my $resp = get_response($config, $versions, $os); + write_htdocs($channel, "$versions_str-$os.xml", $resp); + foreach my $from_version (keys %from_versions) { + $resp = get_response($config, $versions, $os, $from_version); + write_htdocs($channel, "$from_version-$versions_str-$os.xml", $resp); } } write_htdocs($channel, 'no-update.xml', @@ -453,38 +436,26 @@ sub write_htaccess { $htaccess .= $config->{htaccess_rewrite_rules}{$channel} // ''; my $versions = as_array($config->{channels}{$channel}); my $versions_str = join('+', @$versions); - my (%oses, %langs, %from_versions); - my $migrate_langs; + my (%oses, %from_versions); foreach my $version (@$versions) { - $migrate_langs = $config->{versions}{$version}{migrate_langs} - if $config->{versions}{$version}{migrate_langs}; my $files = $config->{versions}{$version}{files}; foreach my $os (keys %$files) { $oses{$os} = 1; - foreach my $lang (keys %{$files->{$os}}) { - $langs{$lang} = 1; - foreach my $from_version (keys %{$files->{$os}{$lang}{partial}}) { - $from_versions{$from_version} = 1; - } + foreach my $from_version (keys %{$files->{$os}{partial}}) { + $from_versions{$from_version} = 1; } } $htaccess .= "RewriteRule ^[^\/]+/$version/ no-update.xml $flags\n"; } foreach my $os (sort keys %oses) { foreach my $bt (build_targets_by_os($os)) { - foreach my $lang (sort keys %langs) { - foreach my $from_version (sort keys %from_versions) { - $htaccess .= "RewriteRule ^$bt/$from_version/$lang " - . "$from_version-$versions_str-$os-$lang.xml $flags\n"; - } - $htaccess .= "RewriteRule ^$bt/[^\/]+/$lang " - . "$versions_str-$os-$lang.xml $flags\n"; + foreach my $from_version (sort keys %from_versions) { + $htaccess .= "RewriteRule ^$bt/$from_version/ALL " + . "$from_version-$versions_str-$os.xml $flags\n"; } - foreach my $lang (sort keys %$migrate_langs) { - $htaccess .= "RewriteRule ^$bt/[^\/]+/$lang " - . "$versions_str-$os-$migrate_langs->{$lang}.xml $flags\n"; - } - $htaccess .= "RewriteRule ^$bt/ $versions_str-$os-ALL.xml $flags\n"; + $htaccess .= "RewriteRule ^$bt/[^\/]+/ALL " + . "$versions_str-$os.xml $flags\n"; + $htaccess .= "RewriteRule ^$bt/ $versions_str-$os.xml $flags\n"; } } write_htdocs($channel, '.htaccess', $htaccess); @@ -567,28 +538,26 @@ sub check_update_responses_channel { my $channel_versions = as_array($config->{channels}{$channel}); my ($channel_version) = @$channel_versions; foreach my $build_target (build_targets_list()) { - foreach my $lang (qw(en-US de)) { - my $url = "$base_url/$channel/$build_target/1.0/$lang"; - my $dom = get_remote_xml($url); - if ($dom) { - my $version = check_get_version($dom); - log_step($url, 'version', $version eq $channel_version, - "expected: $channel_version received: $version"); - } - $url = "$base_url/$channel/$build_target/$channel_version/$lang"; + my $url = "$base_url/$channel/$build_target/1.0/ALL"; + my $dom = get_remote_xml($url); + if ($dom) { + my $version = check_get_version($dom); + log_step($url, 'version', $version eq $channel_version, + "expected: $channel_version received: $version"); + } + $url = "$base_url/$channel/$build_target/$channel_version/ALL"; + $dom = get_remote_xml($url); + log_step($url, 'no_update', check_no_update($dom)) if $dom; + my @inc = @{$config->{versions}{$channel_version}{incremental_from}} + if $config->{versions}{$channel_version}{incremental_from}; + foreach my $inc_from (@inc) { + my $url = "$base_url/$channel/$build_target/$inc_from/ALL"; $dom = get_remote_xml($url); - log_step($url, 'no_update', check_no_update($dom)) if $dom; - my @inc = @{$config->{versions}{$channel_version}{incremental_from}} - if $config->{versions}{$channel_version}{incremental_from}; - foreach my $inc_from (@inc) { - my $url = "$base_url/$channel/$build_target/$inc_from/$lang"; - $dom = get_remote_xml($url); - next unless $dom; - my $version = check_get_version($dom); - log_step($url, 'version', $version eq $channel_version, - "expected: $channel_version received: $version"); - log_step($url, 'has_incremental', check_has_incremental($dom)); - } + next unless $dom; + my $version = check_get_version($dom); + log_step($url, 'version', $version eq $channel_version, + "expected: $channel_version received: $version"); + log_step($url, 'has_incremental', check_has_incremental($dom)); } } } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41372: Handle branding strings for tor-browser build.
by Pier Angelo Vendrame (＠pierov) 18 Feb '25

18 Feb '25

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 858ee2ee by Henry Wilkes at 2025-02-18T11:35:44+00:00 Bug 41372: Handle branding strings for tor-browser build. - - - - - 3 changed files: - projects/firefox/build - projects/firefox/config - + projects/firefox/rename-branding-strings.py Changes: ===================================== projects/firefox/build ===================================== @@ -136,15 +136,50 @@ branding_dir=browser/branding/[% c("var/branding_directory_prefix") %]-[% c("var [% IF c("var/tor-browser") -%] tar -C "$rootdir" -xf "$rootdir/[% c('input_files_by_name/translation-tor-browser') %]" + + # For the purpose of Weblate, all releases share a single brand.ftl and + # brand.properties file per locale in the translations repository. + # See tor-browser-build#41372. + # In brand.ftl, both `-brand-short-name` and `-brand-full-name` should + # differ between releases. As such, they have additional entries in the + # translations repository file (Weblate): + # -brand-short-name for the stable release. + # -brand-short-name_alpha for the alpha release. + # -brand-short-name_nightly for the nightly release. + # And similarly for -brand-full-name. + # For the final build, we only want to keep the string that matches the + # built release, and remove its suffix if it has one. So for the stable + # release we want to keep -brand-short-name. For the alpha release we want + # to keep -brand-short-name_alpha instead, and rename it to be + # -brand-short-name. + # + # As such, we parse the brand.ftl file to rename these strings to keep the + # version we want using rename-branding-strings.py. + # + # We do a similar thing with brandShortName and brandFullName in + # brand.properties. + + # Instructions for the script to perform the renames. + brand_ftl_renames='{ + "suffix": "[% c("var/branding_string_suffix") %]", + "ids": ["-brand-short-name", "-brand-full-name"] + }' + brand_properties_renames='{ + "suffix": "[% c("var/branding_string_suffix") %]", + "ids": ["brandShortName", "brandFullName"] + }' + pushd "$rootdir/translation-tor-browser" ln -s ja ja-JP-mac for lang in $supported_locales; do mv $lang/tor-browser.ftl "$l10ncentral/$lang/toolkit/toolkit/global/" - # Branding. Currently all releases use the same branding. + # Branding. l10n_branding_dir="$l10ncentral/$lang/$branding_dir/" mkdir -p "$l10n_branding_dir" - mv $lang/branding/brand.ftl "$l10n_branding_dir" - mv $lang/brand.properties "$l10n_branding_dir" + # Convert the translations repository branding files into files that work + # for this specific build. + python3 rename-branding-strings.py $lang/branding/brand.ftl "$brand_ftl_renames" > "$l10n_branding_dir/brand.ftl" + python3 rename-branding-strings.py $lang/brand.properties "$brand_properties_renames" > "$l10n_branding_dir/brand.properties" done popd ===================================== projects/firefox/config ===================================== @@ -54,6 +54,10 @@ var: rm -Rf "$rezip_tmpdir" l10n-changesets: '[% exec("git --no-pager show " _ c("git_hash") _ ":browser/locales/l10n-changesets.json", { exec_noco => 1 }) %]' + # The branding_string_suffix for the alpha and nightly should be + # '_alpha' and '_nightly', matching the "suffix" chosen in the + # tor-browser:update-translations.yml file. + branding_string_suffix: '_[% c("var/channel") %]' steps: src-tarballs: @@ -94,6 +98,12 @@ targets: var: nightly_updates_publish_dir_prefix: basebrowser- + release: + var: + # For the stable release, the suffix is empty. + # I.e. we want to select `-brand-short-name` directly. + branding_string_suffix: '' + nightly: git_hash: '[% c("var/project-name") %]-[% c("var/firefox_version") %]-[% c("var/browser_branch") %]' tag_gpg_id: 0 @@ -183,6 +193,8 @@ input_files: - project: binutils name: binutils enable: '[% c("var/linux") && ! c("var/linux-cross") %]' + - filename: rename-branding-strings.py + enable: '[% c("var/has_l10n") && c("var/tor-browser") %]' - filename: fix-info-plist.py enable: '[% c("var/macos") %]' - filename: nsis-uninstall.patch ===================================== projects/firefox/rename-branding-strings.py ===================================== @@ -0,0 +1,96 @@ +import argparse +import json +import re + +arg_parser = argparse.ArgumentParser( + description="Filter a branding file to only include the expected strings" +) +arg_parser.add_argument("file", metavar="<file>", help="branding file to process") +arg_parser.add_argument( + "details", metavar="<details>", help="JSON specification for renaming" +) + +args = arg_parser.parse_args() +details_dict = json.loads(args.details) +# The suffix we want to search for or remove. +# Can be empty if we want to select the IDs that have no suffix. +suffix = details_dict["suffix"] +# The string IDs we want to rename. +rename_ids = details_dict["ids"] + + +def parse_ids(string, pattern): + """ + Extract the IDs found in a string. + + :param string: The string to parse. + :param pattern: The pattern to capture IDs. + + :yields: A tuple containing a chunk of string and whether the chunk + is an ID. + """ + regex = re.compile(pattern, flags=re.MULTILINE + re.ASCII) + while True: + match = regex.search(string) + if not match: + yield string, False + return + + yield string[: match.start("id")], False + yield match.group("id"), True + string = string[match.end("id") :] + + +# We want to parse the file and rename the IDs we are interested in. +# If the ID starts with one of the `rename_ids` but the suffix does +# not match we append an "_UNUSED" suffix to the ID, to keep it in the output +# but functionally unused in the final build. +# Otherwise, if the ID starts with one of the `rename_ids` and the suffix +# matches we will remove the suffix from the ID, so that it is used in the +# final build. +# Everything else found in the file, like entry values, comments and blank +# lines, will be included in the output as it was. +# +# NOTE: This script is constructed to be *independent* of the order in which +# strings are present in the file. Weblate does not guarantee the order of +# translated files to use the same ordering as the original en-US file. +# +# NOTE: This script should work for all locales. In particular, for Fluent files +# it needs to be able to handle Fluent Terms that are multi-valued (conditional) +# and Terms with attributes. Therefore, whilst we could have written a script to +# *remove* unwanted strings, the parsing logic would have been far more complex +# to be able to handle all these cases. Hence why we only parse for the Fluent +# IDs and rename them, which is much simpler. +with open(args.file, "r") as file: + if file.name.endswith(".ftl"): + # A Fluent ID is the identifier for a Message or Term, which always + # starts on a newline, and will be followed by an "=" character. + id_pattern = r"^(?P<id>-?[a-zA-Z][a-zA-Z0-9_-]*) *=" + elif file.name.endswith(".properties"): + # A properties ID can be preceded by whitespace, and can be any + # character other than whitespace, ":" or "=". The first character also + # cannot be "!" or "#" since this starts a comment. Technically the + # Java ".properties" spec allows a ID to include one of these characters + # if it is escaped by a "\", but we don't expect or care about such IDs. + # The Java spec also has a limited set of whitespace, which excludes + # "\v", but we do not expect Weblate or any other serialiser to + # insert whitespace beyond "\n", "\r", "\t" or " ". + id_pattern = r"^\s*(?P<id>[^!#:=\s][^:=\s]*)" + else: + raise ValueError(f"Unknown file type {file.name}") + + for part, is_id in parse_ids(file.read(), id_pattern): + if is_id: + for string_id in rename_ids: + if part.startswith(string_id): + if part == string_id + suffix: + # This string matches the suffix, so we want to use its + # value. We adjust the ID to remove the suffix before + # printing. + part = string_id + else: + # Keep this entry in the output, but make it unused by + # appending to the ID. + part += "_UNUSED" + break + print(part, end="") View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.7.0esr-14.5-1] 3 commits: fixup! Add CI for Tor Browser
by Pier Angelo Vendrame (＠pierov) 18 Feb '25

18 Feb '25

Pier Angelo Vendrame pushed to branch tor-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: d9fe34de by Henry Wilkes at 2025-02-18T10:08:15+00:00 fixup! Add CI for Tor Browser TB 43446: Include alpha and nightly branding in the translation CI. - - - - - 34838694 by Henry Wilkes at 2025-02-18T10:10:32+00:00 fixup! BB 42305: Add script to combine translation files across versions. TB 43446: Allow the combine translation script to select some branding strings from different files. - - - - - 6fa642ea by Henry Wilkes at 2025-02-18T10:10:33+00:00 fixup! TB 2176: Rebrand Firefox to TorBrowser TB 43446: Change the branding name for the alpha and nightly releases. - - - - - 13 changed files: - .gitlab/ci/jobs/update-translations.yml - browser/branding/tb-alpha/locales/en-US/brand.ftl - browser/branding/tb-alpha/locales/en-US/brand.properties - browser/branding/tb-nightly/locales/en-US/brand.ftl - browser/branding/tb-nightly/locales/en-US/brand.properties - browser/branding/tb-release/locales/en-US/brand.ftl - browser/branding/tb-release/locales/en-US/brand.properties - tools/base-browser/l10n/combine-translation-versions.py - tools/base-browser/l10n/combine/combine.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 Changes: ===================================== .gitlab/ci/jobs/update-translations.yml ===================================== @@ -17,12 +17,48 @@ { "name": "brand.ftl", "where": ["browser/branding/tb-release", "toolkit/torbutton"], + "branding": { + "versions": [ + { + "name": "Alpha", + "suffix": "_alpha", + "where": ["browser/branding/tb-alpha"] + }, + { + "name": "Nightly", + "suffix": "_nightly", + "where": ["browser/branding/tb-nightly"] + } + ], + "ids": [ + "-brand-short-name", + "-brand-full-name" + ] + }, "branch": "tor-browser", "directory": "branding" }, { "name": "brand.properties", "where": ["browser/branding/tb-release", "toolkit/torbutton"], + "branding": { + "versions": [ + { + "name": "Alpha", + "suffix": "_alpha", + "where": ["browser/branding/tb-alpha"] + }, + { + "name": "Nightly", + "suffix": "_nightly", + "where": ["browser/branding/tb-nightly"] + } + ], + "ids": [ + "brandShortName", + "brandFullName" + ] + }, "branch": "tor-browser" }, { "name": "tor-browser.ftl", "branch": "tor-browser" }, ===================================== browser/branding/tb-alpha/locales/en-US/brand.ftl ===================================== @@ -2,12 +2,16 @@ # that is used by Firefox) to avoid picking up the -brand-short-name values # that Mozilla includes in the Firefox language packs. +# The shortened application name for Tor Browser. Shared between versions. -brand-shorter-name = Tor Browser --brand-short-name = Tor Browser --brand-full-name = Tor Browser +# The default application name for the "alpha" release. +-brand-short-name = Tor Browser Alpha +# The full application name for the "alpha" release. +-brand-full-name = Tor Browser Alpha # This brand name can be used in messages where the product name needs to # remain unchanged across different versions (Nightly, Beta, etc.). -brand-product-name = Tor Browser +# The name of the Tor Project organisation. -vendor-short-name = Tor Project # "Tor" is a trademark names, so should not be translated (not including the quote marks, which can be localized). # "The Tor Project, Inc." is an organisation name. ===================================== browser/branding/tb-alpha/locales/en-US/brand.properties ===================================== @@ -3,6 +3,9 @@ # 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/. +# The shortened application name for Tor Browser. Shared between versions. brandShorterName=Tor Browser -brandShortName=Tor Browser -brandFullName=Tor Browser +# The default application name for the "alpha" release. +brandShortName=Tor Browser Alpha +# The full application name for the "alpha" release. +brandFullName=Tor Browser Alpha ===================================== browser/branding/tb-nightly/locales/en-US/brand.ftl ===================================== @@ -2,12 +2,16 @@ # that is used by Firefox) to avoid picking up the -brand-short-name values # that Mozilla includes in the Firefox language packs. +# The shortened application name for Tor Browser. Shared between versions. -brand-shorter-name = Tor Browser --brand-short-name = Tor Browser --brand-full-name = Tor Browser +# The default application name for the "nightly" release. +-brand-short-name = Tor Browser Nightly +# The full application name for the "nightly" release. +-brand-full-name = Tor Browser Nightly # This brand name can be used in messages where the product name needs to # remain unchanged across different versions (Nightly, Beta, etc.). -brand-product-name = Tor Browser +# The name of the Tor Project organisation. -vendor-short-name = Tor Project # "Tor" is a trademark names, so should not be translated (not including the quote marks, which can be localized). # "The Tor Project, Inc." is an organisation name. ===================================== browser/branding/tb-nightly/locales/en-US/brand.properties ===================================== @@ -3,6 +3,9 @@ # 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/. +# The shortened application name for Tor Browser. Shared between versions. brandShorterName=Tor Browser -brandShortName=Tor Browser -brandFullName=Tor Browser +# The default application name for the "nightly" release. +brandShortName=Tor Browser Nightly +# The full application name for the "nightly" release. +brandFullName=Tor Browser Nightly ===================================== browser/branding/tb-release/locales/en-US/brand.ftl ===================================== @@ -2,12 +2,16 @@ # that is used by Firefox) to avoid picking up the -brand-short-name values # that Mozilla includes in the Firefox language packs. +# The shortened application name for Tor Browser. Shared between versions. -brand-shorter-name = Tor Browser +# The default application name for the stable release. -brand-short-name = Tor Browser +# The full application name for the stable release. -brand-full-name = Tor Browser # This brand name can be used in messages where the product name needs to # remain unchanged across different versions (Nightly, Beta, etc.). -brand-product-name = Tor Browser +# The name of the Tor Project organisation. -vendor-short-name = Tor Project # "Tor" is a trademark names, so should not be translated (not including the quote marks, which can be localized). # "The Tor Project, Inc." is an organisation name. ===================================== browser/branding/tb-release/locales/en-US/brand.properties ===================================== @@ -3,6 +3,9 @@ # 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/. +# The shortened application name for Tor Browser. Shared between versions. brandShorterName=Tor Browser +# The default application name for the stable release. brandShortName=Tor Browser +# The full application name for the stable release. brandFullName=Tor Browser ===================================== tools/base-browser/l10n/combine-translation-versions.py ===================================== @@ -306,9 +306,34 @@ for file_dict in json.loads(args.files): f"{current_file.path} : {stable_file.path}" ) + content = None if current_file is None else current_file.content + + # If we have a branding file, we want to also include strings from the other + # branding directories that differ from the stable release. + # The strings that *differ* per release should be specified in + # file_dict["branding"]["ids"]. These strings will be copied from the other + # release's branding directory, with an addition suffix added to their ID, + # as specified in the version_dict["suffix"]. + branding = file_dict.get("branding", None) + if branding: + include_ids = branding["ids"] + for version_dict in branding["versions"]: + branding_dirs = version_dict.get("where", None) + branding_file = current_branch.get_file(name, branding_dirs) + if branding_file is None: + raise Exception(f"{name} does not exist in {branding_dirs}") + content = combine_files( + name, + content, + branding_file.content, + f'{version_dict["name"]} Release.', + include_ids, + version_dict["suffix"], + ) + content = combine_files( name, - None if current_file is None else current_file.content, + content, None if stable_file is None else stable_file.content, f"Will be unused in {current_branch.browser_version_name}!", ) ===================================== tools/base-browser/l10n/combine/combine.py ===================================== @@ -14,26 +14,32 @@ if TYPE_CHECKING: def combine_files( filename: str, - new_content: str | None, - old_content: str | None, + primary_content: str | None, + alternative_content: str | None, comment_prefix: str, + include_ids: list[str] | None = None, + alternative_suffix: str = "", ) -> str | None: """Combine two translation files into one to include all strings from both. - The new content is presented first, and any strings only found in the old - content are placed at the end with an additional comment. + The primary content is presented first, followed by the alternative content + at the end with an additional comment. :param filename: The filename for the file, determines the format. - :param new_content: The new content for the file, or None if it has been - deleted. - :param old_content: The old content for the file, or None if it did not - exist before. - :comment_prefix: A comment to include for any strings that are only found in - the old content. This will be placed before any other comments for the - string. + :param primary_content: The primary content for the file, or None if it does + not exist. + :param alternative_content: The alternative content for the file, or None if + it does not exist. + :param comment_prefix: A comment to include for any strings that are + appended to the content. This will be placed before any other comments for + the string. + :param include_ids: String IDs from `alternative_content` we want to + include. If this is `None` then we include all strings that do not already + have a matching ID in `primary_content`. + :param duplicate_suffix: The suffix to apply to the alternative IDs. :returns: The combined content, or None if both given contents are None. """ - if new_content is None and old_content is None: + if primary_content is None and alternative_content is None: return None # getParser from compare_locale returns the same instance for the same file @@ -41,7 +47,7 @@ def combine_files( parser = getParser(filename) is_android = filename.endswith(".xml") - if new_content is None: + if primary_content is None: if is_android: # File was deleted, add some document parts. content_start = ( @@ -54,7 +60,7 @@ def combine_files( content_end = "" existing_keys = [] else: - parser.readUnicode(new_content) + parser.readUnicode(primary_content) # Start with the same content as the current file. # For android strings, we want to keep the final "</resources>" until after. @@ -96,8 +102,8 @@ def combine_files( entry_iter: Iterable[Any] = () # If the file does not exist in the old branch, don't make any additions. - if old_content is not None: - parser.readUnicode(old_content) + if alternative_content is not None: + parser.readUnicode(alternative_content) entry_iter = parser.walk(only_localizable=False) for entry in entry_iter: if isinstance(entry, Junk): @@ -134,13 +140,19 @@ def combine_files( if not isinstance(entry, Entity): raise ValueError(f"Unexpected type: {entry.__class__.__name__}") - if entry.key in existing_keys: - # Already included this string in the new translation file. + if include_ids is None: + # We include the entry if it is not already included. + include_entry = entry.key not in existing_keys + else: + # We include the entry if it is in our list. + include_entry = entry.key in include_ids + if not include_entry: # Drop the gathered comments for this Entity. stacked_comments.clear() continue if isinstance(entry, FluentEntity): + id_regex = rf"^({re.escape(entry.key)})( *=)" if fluent_group_comment is not None: # We have a found GroupComment which has not been included yet. # All following Entity's will be under its scope, until the next @@ -149,12 +161,15 @@ def combine_files( # Added GroupComment, so don't need to add again. fluent_group_comment = None elif isinstance(entry, DTDEntity): + id_regex = rf"^(\s*<!ENTITY\s*{re.escape(entry.key)})(\s)" # Include our additional comment before we print the rest for this # Entity. additions.append(f"") elif isinstance(entry, PropertiesEntity): + id_regex = rf"^({re.escape(entry.key)})( *=)" additions.append(f"# {comment_prefix}") elif isinstance(entry, AndroidEntity): + id_regex = rf'^(\s*<string\s[^>]*name="{re.escape(entry.key)})(")' additions.append(f"") else: raise ValueError(f"Unexpected Entity type: {entry.__class__.__name__}") @@ -162,7 +177,17 @@ def combine_files( # Add any other comment lines that came directly before this Entity. additions.extend(stacked_comments) stacked_comments.clear() - additions.append(entry.all) + entry_content = entry.all + if alternative_suffix: + # NOTE: compare_locales does not allow us to set the entry.key + # value. Instead we use a regular expression to append the suffix to + # the expected key. + entry_content, count = re.subn( + id_regex, rf"\1{alternative_suffix}\2", entry_content, flags=re.M + ) + if count != 1: + raise ValueError(f"Failed to substitute the ID for {entry.key}") + additions.append(entry_content) content_middle = "" ===================================== tools/base-browser/l10n/combine/tests/test_android.py ===================================== @@ -24,6 +24,20 @@ def assert_result(new_content, old_content, expect): ) +def assert_alternative(content, alternative_content, alternative_ids, expect): + content = wrap_in_xml(content) + alternative_content = wrap_in_xml(alternative_content) + expect = wrap_in_xml(expect) + assert expect == combine_files( + "test_strings.xml", + content, + alternative_content, + "ALTERNATIVE STRING", + alternative_ids, + "_alt", + ) + + def test_combine_empty(): assert_result(None, None, None) @@ -328,3 +342,74 @@ def test_removed_string_with_comment(): <string name="removed_4">Fourth removed</string> """, ) + + +def test_alternatives(): + assert_alternative( + """\ + <string name="string_1">First string</string> + """, + """\ + <string name="string_1">Alternative string</string> + """, + ["string_1"], + """\ + <string name="string_1">First string</string> + +  + <string name="string_1_alt">Alternative string</string> + """, + ) + assert_alternative( + """\ +  + <string name="string_1">First string</string> +  + <string name="string_2">Second string</string> + <string name="string_3">Third string</string> + """, + """\ + <string name="string_1">First string</string> +  + <string name="string_2">Alternative string</string> + <string name="string_3">Third string different</string> + <string name="string_4">Other string</string> + """, + ["string_2"], + """\ +  + <string name="string_1">First string</string> +  + <string name="string_2">Second string</string> + <string name="string_3">Third string</string> + +  +  + <string name="string_2_alt">Alternative string</string> + """, + ) + assert_alternative( + """\ + <string name="string_1">First string</string> + <string name="string_2">Second string</string> + <string name="string_3">Third string</string> + """, + """\ + <string name="string_1">Alternative string</string> + <string name="string_3">Third string</string> +  + <string name="string_4">Other string</string> + """, + ["string_1", "string_4"], + """\ + <string name="string_1">First string</string> + <string name="string_2">Second string</string> + <string name="string_3">Third string</string> + +  + <string name="string_1_alt">Alternative string</string> +  +  + <string name="string_4_alt">Other string</string> + """, + ) ===================================== tools/base-browser/l10n/combine/tests/test_dtd.py ===================================== @@ -16,6 +16,23 @@ def assert_result(new_content, old_content, expect): ) +def assert_alternative(content, alternative_content, alternative_ids, expect): + if content is not None: + content = textwrap.dedent(content) + if alternative_content is not None: + alternative_content = textwrap.dedent(alternative_content) + if expect is not None: + expect = textwrap.dedent(expect) + assert expect == combine_files( + "test.dtd", + content, + alternative_content, + "ALTERNATIVE STRING", + alternative_ids, + ".alt", + ) + + def test_combine_empty(): assert_result(None, None, None) @@ -323,3 +340,74 @@ def test_removed_string_with_comment(): <!ENTITY removed.4 "Fourth removed"> """, ) + + +def test_alternatives(): + assert_alternative( + """\ + <!ENTITY string.1 "First string"> + """, + """\ + <!ENTITY string.1 "Alternative string"> + """, + ["string.1"], + """\ + <!ENTITY string.1 "First string"> + +  + <!ENTITY string.1.alt "Alternative string"> + """, + ) + assert_alternative( + """\ +  + <!ENTITY string.1 "First string"> +  + <!ENTITY string.2 "Second string"> + <!ENTITY string.3 "Third string"> + """, + """\ + <!ENTITY string.1 "First string"> +  + <!ENTITY string.2 "Alternative string"> + <!ENTITY string.3 "Third string different"> + <!ENTITY string.4 "Other string"> + """, + ["string.2"], + """\ +  + <!ENTITY string.1 "First string"> +  + <!ENTITY string.2 "Second string"> + <!ENTITY string.3 "Third string"> + +  +  + <!ENTITY string.2.alt "Alternative string"> + """, + ) + assert_alternative( + """\ + <!ENTITY string.1 "First string"> + <!ENTITY string.2 "Second string"> + <!ENTITY string.3 "Third string"> + """, + """\ + <!ENTITY string.1 "Alternative string"> + <!ENTITY string.3 "Third string"> +  + <!ENTITY string.4 "Other string"> + """, + ["string.1", "string.4"], + """\ + <!ENTITY string.1 "First string"> + <!ENTITY string.2 "Second string"> + <!ENTITY string.3 "Third string"> + +  + <!ENTITY string.1.alt "Alternative string"> +  +  + <!ENTITY string.4.alt "Other string"> + """, + ) ===================================== tools/base-browser/l10n/combine/tests/test_fluent.py ===================================== @@ -16,6 +16,23 @@ def assert_result(new_content, old_content, expect): ) +def assert_alternative(content, alternative_content, alternative_ids, expect): + if content is not None: + content = textwrap.dedent(content) + if alternative_content is not None: + alternative_content = textwrap.dedent(alternative_content) + if expect is not None: + expect = textwrap.dedent(expect) + assert expect == combine_files( + "test.ftl", + content, + alternative_content, + "ALTERNATIVE STRING", + alternative_ids, + "-alt", + ) + + def test_combine_empty(): assert_result(None, None, None) @@ -342,3 +359,119 @@ def test_removed_string_with_comment(): removed-4 = Fourth removed """, ) + + +def test_alternatives(): + assert_alternative( + """\ + string-1 = First string + .title = hello + """, + """\ + string-1 = Alternative string + .title = different + """, + ["string-1"], + """\ + string-1 = First string + .title = hello + + + ## ALTERNATIVE STRING + + string-1-alt = Alternative string + .title = different + """, + ) + assert_alternative( + """\ + string-1 = First string + .title = hello + """, + """\ + string-1 = Alternative string + """, + ["string-1"], + """\ + string-1 = First string + .title = hello + + + ## ALTERNATIVE STRING + + string-1-alt = Alternative string + """, + ) + assert_alternative( + """\ + -term-1 = First string + """, + """\ + -term-1 = Alternative string + """, + ["-term-1"], + """\ + -term-1 = First string + + + ## ALTERNATIVE STRING + + -term-1-alt = Alternative string + """, + ) + assert_alternative( + """\ + # Comment 1 + string-1 = First string + # Comment 2 + string-2 = Second string + string-3 = Third string + """, + """\ + string-1 = First string + # Alt comment + string-2 = Alternative string + string-3 = Third string different + string-4 = Other string + """, + ["string-2"], + """\ + # Comment 1 + string-1 = First string + # Comment 2 + string-2 = Second string + string-3 = Third string + + + ## ALTERNATIVE STRING + + # Alt comment + string-2-alt = Alternative string + """, + ) + assert_alternative( + """\ + string-1 = First string + string-2 = Second string + string-3 = Third string + """, + """\ + string-1 = Alternative string + string-3 = Third string + # comment + -string-4 = Other string + """, + ["string-1", "-string-4"], + """\ + string-1 = First string + string-2 = Second string + string-3 = Third string + + + ## ALTERNATIVE STRING + + string-1-alt = Alternative string + # comment + -string-4-alt = Other string + """, + ) ===================================== tools/base-browser/l10n/combine/tests/test_properties.py ===================================== @@ -16,6 +16,23 @@ def assert_result(new_content, old_content, expect): ) +def assert_alternative(content, alternative_content, alternative_ids, expect): + if content is not None: + content = textwrap.dedent(content) + if alternative_content is not None: + alternative_content = textwrap.dedent(alternative_content) + if expect is not None: + expect = textwrap.dedent(expect) + assert expect == combine_files( + "test.properties", + content, + alternative_content, + "ALTERNATIVE STRING", + alternative_ids, + ".alt", + ) + + def test_combine_empty(): assert_result(None, None, None) @@ -320,3 +337,74 @@ def test_removed_string_with_comment(): removed.4 = Fourth removed """, ) + + +def test_alternatives(): + assert_alternative( + """\ + string.1 = First string + """, + """\ + string.1 = Alternative string + """, + ["string.1"], + """\ + string.1 = First string + + # ALTERNATIVE STRING + string.1.alt = Alternative string + """, + ) + assert_alternative( + """\ + # Comment 1 + string.1 = First string + # Comment 2 + string.2 = Second string + string.3 = Third string + """, + """\ + string.1 = First string + # Alt comment + string.2 = Alternative string + string.3 = Third string different + string.4 = Other string + """, + ["string.2"], + """\ + # Comment 1 + string.1 = First string + # Comment 2 + string.2 = Second string + string.3 = Third string + + # ALTERNATIVE STRING + # Alt comment + string.2.alt = Alternative string + """, + ) + assert_alternative( + """\ + string.1 = First string + string.2 = Second string + string.3 = Third string + """, + """\ + string.1 = Alternative string + string.3 = Third string + # comment + string.4 = Other string + """, + ["string.1", "string.4"], + """\ + string.1 = First string + string.2 = Second string + string.3 = Third string + + # ALTERNATIVE STRING + string.1.alt = Alternative string + # ALTERNATIVE STRING + # comment + string.4.alt = Other string + """, + ) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/d94603… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/d94603… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-14.0] MB 394: Fix package dependency for Debian Trixie
by boklm (＠boklm) 18 Feb '25

18 Feb '25

boklm pushed to branch maint-14.0 at The Tor Project / Applications / tor-browser-build Commits: 119ce448 by Nicolas Vigier at 2025-02-18T12:01:51+01:00 MB 394: Fix package dependency for Debian Trixie The libgdk-pixbuf2.0-0 package has been removed from Debian Trixie. We update the symbols file to depend on both libgdk-pixbuf2.0-0 and libgdk-pixbuf-2.0-0. https://bugzilla.mozilla.org/show_bug.cgi?id=1933835 - - - - - 1 changed file: - projects/linux-packages/config Changes: ===================================== projects/linux-packages/config ===================================== @@ -31,6 +31,11 @@ targets: # some :i386 packages fail to install when /var/lib/dpkg/available # does not exist, so create it as an empty file echo > /var/lib/dpkg/available + post_pkginst: | + # Alter the symbols file for libgdk-pixbuf to handle the transition to libgdk-pixbuf-2.0-0 + # This is only necessary until we upgrade to something newer than buster. + # See mullvad-browser#394 and https://bugzilla.mozilla.org/show_bug.cgi?id=1933835 + find /var/lib/dpkg/info/ -name libgdk-pixbuf2.0-0*symbols | xargs sed -i "/libgdk-pixbuf2.0-0/s/libgdk-pixbuf2.0-0/libgdk-pixbuf2.0-0 #MINVER# | libgdk-pixbuf-2.0-0/" arch_deps: # Packages needed to build the deb package - dpkg-dev View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] MB 394: Fix package dependency for Debian Trixie
by boklm (＠boklm) 18 Feb '25

18 Feb '25

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 15aae5bd by Nicolas Vigier at 2025-02-17T12:47:15+01:00 MB 394: Fix package dependency for Debian Trixie The libgdk-pixbuf2.0-0 package has been removed from Debian Trixie. We update the symbols file to depend on both libgdk-pixbuf2.0-0 and libgdk-pixbuf-2.0-0. https://bugzilla.mozilla.org/show_bug.cgi?id=1933835 - - - - - 1 changed file: - projects/linux-packages/config Changes: ===================================== projects/linux-packages/config ===================================== @@ -32,6 +32,11 @@ targets: # some foreign-arch packages fail to install when /var/lib/dpkg/available # does not exist, so create it as an empty file echo > /var/lib/dpkg/available + post_pkginst: | + # Alter the symbols file for libgdk-pixbuf to handle the transition to libgdk-pixbuf-2.0-0 + # This is only necessary until we upgrade to something newer than buster. + # See mullvad-browser#394 and https://bugzilla.mozilla.org/show_bug.cgi?id=1933835 + find /var/lib/dpkg/info/ -name libgdk-pixbuf2.0-0*symbols | xargs sed -i "/libgdk-pixbuf2.0-0/s/libgdk-pixbuf2.0-0/libgdk-pixbuf2.0-0 #MINVER# | libgdk-pixbuf-2.0-0/" arch_deps: # Packages needed to build the deb package - dpkg-dev @@ -67,6 +72,11 @@ targets: # some foreign-arch packages fail to install when /var/lib/dpkg/available # does not exist, so create it as an empty file echo > /var/lib/dpkg/available + post_pkginst: | + # Alter the symbols file for libgdk-pixbuf to handle the transition to libgdk-pixbuf-2.0-0 + # This is only necessary until we upgrade to something newer than buster. + # See mullvad-browser#394 and https://bugzilla.mozilla.org/show_bug.cgi?id=1933835 + find /var/lib/dpkg/info/ -name libgdk-pixbuf2.0-0*symbols | xargs sed -i "/libgdk-pixbuf2.0-0/s/libgdk-pixbuf2.0-0/libgdk-pixbuf2.0-0 #MINVER# | libgdk-pixbuf-2.0-0/" arch_deps: # Packages needed to build the deb package - dpkg-dev View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.7.0esr-14.5-1] 2 commits: fixup! TB 42247: Android helpers for the TorProvider
by Pier Angelo Vendrame (＠pierov) 17 Feb '25

17 Feb '25

Pier Angelo Vendrame pushed to branch tor-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 14d735fe by Dan Ballard at 2025-02-13T11:58:47-08:00 fixup! TB 42247: Android helpers for the TorProvider Rename TorIntegrationAndroid.java to TorAndroidIntegration.java - - - - - d94603fa by Dan Ballard at 2025-02-13T12:00:18-08:00 fixup! [android] Implement Android-native Connection Assist UI rename TorIntegrationAndroid.java to TorAndroidIntegration.java - - - - - 4 changed files: - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorControllerGV.kt - mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java - mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorIntegrationAndroid.java → mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorAndroidIntegration.java Changes: ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt ===================================== @@ -156,7 +156,7 @@ import mozilla.components.browser.engine.gecko.GeckoEngine import org.mozilla.fenix.components.FenixSnackbar import org.mozilla.fenix.home.HomeFragment import org.mozilla.fenix.tor.TorConnectionAssistViewModel -import org.mozilla.geckoview.TorIntegrationAndroid +import org.mozilla.geckoview.TorAndroidIntegration /** * The main activity of the application. The application is primarily a single Activity (this one) @@ -165,7 +165,7 @@ import org.mozilla.geckoview.TorIntegrationAndroid * - browser screen */ @SuppressWarnings("TooManyFunctions", "LargeClass", "LongMethod") -open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity, TorIntegrationAndroid.BootstrapStateChangeListener { +open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity, TorAndroidIntegration.BootstrapStateChangeListener { private lateinit var binding: ActivityHomeBinding lateinit var themeManager: ThemeManager lateinit var browsingModeManager: BrowsingModeManager ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorControllerGV.kt ===================================== @@ -8,9 +8,9 @@ import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import mozilla.components.browser.engine.gecko.GeckoEngine import org.mozilla.fenix.ext.components -import org.mozilla.geckoview.TorIntegrationAndroid -import org.mozilla.geckoview.TorIntegrationAndroid.BootstrapStateChangeListener -import org.mozilla.geckoview.TorIntegrationAndroid.TorLogListener +import org.mozilla.geckoview.TorAndroidIntegration +import org.mozilla.geckoview.TorAndroidIntegration.BootstrapStateChangeListener +import org.mozilla.geckoview.TorAndroidIntegration.TorLogListener import org.mozilla.geckoview.TorSettings import org.mozilla.geckoview.TorSettings.BridgeBuiltinType import org.mozilla.geckoview.TorSettings.BridgeSource @@ -73,7 +73,7 @@ class TorControllerGV( override val isBootstrapped get() = isTorBootstrapped override val isConnected get() = (_lastKnownStatus.value.isStarted() && !isTorRestarting) - private fun getTorIntegration(): TorIntegrationAndroid { + private fun getTorIntegration(): TorAndroidIntegration { return (context.components.core.engine as GeckoEngine).getTorIntegrationController() } ===================================== mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java ===================================== @@ -244,7 +244,7 @@ public final class GeckoRuntime implements Parcelable { private final ProfilerController mProfilerController; private final GeckoScreenChangeListener mScreenChangeListener; - private TorIntegrationAndroid mTorIntegration; + private TorAndroidIntegration mTorIntegration; private GeckoRuntime() { mWebExtensionController = new WebExtensionController(this); @@ -495,7 +495,7 @@ public final class GeckoRuntime implements Parcelable { mScreenChangeListener.enable(); } - mTorIntegration = new TorIntegrationAndroid(context); + mTorIntegration = new TorAndroidIntegration(context); mProfilerController.addMarker( "GeckoView Initialization START", mProfilerController.getProfilerTime()); @@ -1015,7 +1015,7 @@ public final class GeckoRuntime implements Parcelable { * Get the Tor integration controller for this runtime. */ @UiThread - public @NonNull TorIntegrationAndroid getTorIntegrationController() { + public @NonNull TorAndroidIntegration getTorIntegrationController() { return mTorIntegration; } ===================================== mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorIntegrationAndroid.java → mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorAndroidIntegration.java ===================================== @@ -29,8 +29,8 @@ import org.mozilla.gecko.util.EventCallback; import org.mozilla.gecko.util.GeckoBundle; import org.mozilla.geckoview.androidlegacysettings.TorLegacyAndroidSettings; -public class TorIntegrationAndroid implements BundleEventListener { - private static final String TAG = "TorIntegrationAndroid"; +public class TorAndroidIntegration implements BundleEventListener { + private static final String TAG = "TorAndroidIntegration"; // Events we listen to private static final String EVENT_TOR_START = "GeckoView:Tor:StartTor"; @@ -88,7 +88,7 @@ public class TorIntegrationAndroid implements BundleEventListener { */ private TorSettings mSettings = null; - /* package */ TorIntegrationAndroid(Context context) { + /* package */ TorAndroidIntegration(Context context) { mLibraryDir = context.getApplicationInfo().nativeLibraryDir; mCacheDir = context.getCacheDir().getAbsolutePath(); mIpcDirectory = mCacheDir + "/tor-private"; @@ -269,7 +269,7 @@ public class TorIntegrationAndroid implements BundleEventListener { public void run() { cleanIpcDirectory(); - final String ipcDir = TorIntegrationAndroid.this.mIpcDirectory; + final String ipcDir = TorAndroidIntegration.this.mIpcDirectory; final ArrayList<String> args = new ArrayList<>(); args.add(mLibraryDir + "/libTor.so"); args.add("DisableNetwork"); @@ -354,7 +354,7 @@ public class TorIntegrationAndroid implements BundleEventListener { } private void cleanIpcDirectory() { - File directory = new File(TorIntegrationAndroid.this.mIpcDirectory); + File directory = new File(TorAndroidIntegration.this.mIpcDirectory); if (!directory.isDirectory()) { if (!directory.mkdirs()) { Log.e(TAG, "Failed to create the IPC directory."); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/22ad3e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/22ad3e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.7.0esr-14.5-1] 2 commits: fixup! TB 42669: [android] Use custom no-op app-services
by Dan Ballard (＠dan) 13 Feb '25

13 Feb '25

Dan Ballard pushed to branch tor-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: b374c1f2 by Dan Ballard at 2025-02-13T11:43:11-08:00 fixup! TB 42669: [android] Use custom no-op app-services Bug 42669: get latest application services by date and put in tools - - - - - 22ad3eca by Dan Ballard at 2025-02-13T11:43:11-08:00 fixup! [android] Modify build system Bug 42669: Inject gradle property for nimbus-fml path for application services - - - - - 3 changed files: - .gitignore - mobile/android/fenix/app/build.gradle - mobile/android/fenix/tools/tba-fetch-deps.sh Changes: ===================================== .gitignore ===================================== @@ -359,7 +359,7 @@ media/libvpx/config/**/config.log mobile/android/.experimenter.json # Tor libraries for local builds -mobile/android/fenix/app/nimbus-fml +mobile/android/fenix/tools/nimbus-fml mobile/android/fenix/app/tor-expert-bundle.aar mobile/android/fenix/app/src/main/assets/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi ===================================== mobile/android/fenix/app/build.gradle ===================================== @@ -315,6 +315,8 @@ android.applicationVariants.configureEach { variant -> if (project.hasProperty("disableTor")) { disableTor = project.getProperty("disableTor") } + System.setProperty("nimbusFml", rootProject.projectDir.toPath().resolve("tools").resolve("nimbus-fml").toAbsolutePath().toString()) + println("----------------------------------------------") println("Variant name: " + variant.name) @@ -323,6 +325,7 @@ android.applicationVariants.configureEach { variant -> println("Flavor: " + variant.flavorName) println("Telemetry enabled: " + !isDebugOrDCD) println("Tor is disabled: " + disableTor) + println("nimbusFml: " + System.getProperty("nimbusFml")) buildConfigField "boolean", "DISABLE_TOR", "$disableTor" ===================================== mobile/android/fenix/tools/tba-fetch-deps.sh ===================================== @@ -47,7 +47,7 @@ if [ "$os" = "unsupported" ] || [ "$arch" = "unsupported" ]; then exit 2 fi -app_services="$(find "$TOR_BROWSER_BUILD/out/application-services" -name 'application-services*.tar.zst' -print | sort | tail -1)" +app_services="$(ls -1t "$TOR_BROWSER_BUILD/out/application-services/"application-services*.tar.zst | head -1)" mkdir -p "$GRADLE_MAVEN_REPOSITORIES/org/mozilla" if [ -f "$app_services" ]; then tar -C /tmp -xf "$app_services" @@ -67,14 +67,14 @@ if [ -f "$app_services" ]; then unzip -d /tmp/nimbus-fml /tmp/nimbus-fml.zip nimbus_fml="$(find "/tmp/nimbus-fml/" -name 'nimbus-fml*' | grep "$arch-$os")" echo "Using nimbus-fml binary: $nimbus_fml" - cp $nimbus_fml app/ + cp $nimbus_fml tools/ rm -rf /tmp/nimbus-fml rm /tmp/nimbus-fml.zip else - cp /tmp/application-services/nimbus-fml app/ + cp /tmp/application-services/nimbus-fml tools/ fi - chmod +x app/nimbus-fml + chmod +x tools/nimbus-fml rm -rf /tmp/application-services else View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/e01fb0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/e01fb0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Update MR template and add Uplift issue template
by morgan (＠morgan) 13 Feb '25

13 Feb '25

morgan pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: f48f1e95 by Morgan at 2025-02-13T16:56:36+00:00 Update MR template and add Uplift issue template - - - - - 2 changed files: - + .gitlab/issue_templates/Uplift.md - .gitlab/merge_request_templates/default.md Changes: ===================================== .gitlab/issue_templates/Uplift.md ===================================== @@ -0,0 +1,18 @@ + + +# Uplift Patchset + +## Gitlab Issue(s) +- tor-browser-build#12345 + +## Upstream Project Issue(s): + + +## Notes + + + +/label ~"Apps::Type::Uplift" ===================================== .gitlab/merge_request_templates/default.md ===================================== @@ -42,6 +42,9 @@ ### Issue Tracking - [ ] Link resolved issues with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort… for changelog generation +### Uplifting +- [ ] Patchset is a candidate for uplift to upstream projects (e.g. mingw, clang, etc) + ### Review #### Request Reviewer View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.7.0esr-14.5-1] fixup! Adding issue and merge request templates
by morgan (＠morgan) 13 Feb '25

13 Feb '25

morgan pushed to branch tor-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: e01fb03c by Morgan at 2025-02-13T16:26:45+00:00 fixup! Adding issue and merge request templates add issue template for mozilla uplifts and tweak MR template to signal to merger an uplift issue should be created after merge - - - - - 2 changed files: - + .gitlab/issue_templates/Uplift.md - .gitlab/merge_request_templates/default.md Changes: ===================================== .gitlab/issue_templates/Uplift.md ===================================== @@ -0,0 +1,19 @@ + + +# Uplift Patchset + +## Gitlab Issue(s) +- tor-browser#12345 +- mullvad-browser#12345 + +## Upstream Mozilla Issue(s): +- https://bugzilla.mozilla.org/show_bug.cgi?id=12345 + +## Notes + + + +/label ~"Apps::Type::Uplift" ===================================== .gitlab/merge_request_templates/default.md ===================================== @@ -48,6 +48,9 @@ - [ ] **Localization**: typos and other localization changes that should be also in the release branch - [ ] **Other**: please explain +### Uplifting +- [ ] Patchset is a candidate for uplift to Firefox + ### Issue Tracking - [ ] Link resolved issues with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort… for changelog generation View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e01fb03… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e01fb03… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 42669: Add ability for patched application services to take a gradle...
by Dan Ballard (＠dan) 13 Feb '25

13 Feb '25

Dan Ballard pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 5616f8f6 by Dan Ballard at 2025-02-13T16:48:29+00:00 Bug 42669: Add ability for patched application services to take a gradle property to get path to nimbus-fml binary (for use in local dev builds) - - - - - 1 changed file: - projects/application-services/offline-nimbus-fml.diff Changes: ===================================== projects/application-services/offline-nimbus-fml.diff ===================================== @@ -14,7 +14,7 @@ index 67c9e66d0..6dd949c92 100644 import javax.inject.Inject import groovy.transform.Immutable -@@ -84,46 +89,13 @@ abstract class NimbusAssembleToolsTask extends DefaultTask { +@@ -84,46 +89,17 @@ abstract class NimbusAssembleToolsTask extends DefaultTask { @TaskAction void assembleTools() { @@ -48,8 +48,14 @@ index 67c9e66d0..6dd949c92 100644 - fmlBinary.get().asFile.setExecutable(true) - } - visitedFilePaths.add(details.relativePath) -- } -- } ++ String nimbusFmlPath = System.getenv("NIMBUS_FML") ++ Path source ++ if (nimbusFmlPath == null) { ++ nimbusFmlPath = System.getProperty("nimbusFml") ++ if (nimbusFmlPath == null) { ++ throw new GradleException("NIMBUS_FML and property nimbusFml are not defined.") + } + } - - if (visitedFilePaths.empty) { - throw new GradleException("Couldn't find any files in archive matching unzip spec: (${unzipSpec.includePatterns.get().collect { "`$it`" }.join(' | ')})") @@ -57,11 +63,8 @@ index 67c9e66d0..6dd949c92 100644 - - if (visitedFilePaths.size() > 1) { - throw new GradleException("Ambiguous unzip spec matched ${visitedFilePaths.size()} files in archive: ${visitedFilePaths.collect { "`$it`" }.join(', ')}") -+ String nimbusFmlPath = System.getenv("NIMBUS_FML"); -+ if (nimbusFmlPath == null) { -+ throw new GradleException("NIMBUS_FML is not defined.") - } -+ Path source = Paths.get(nimbusFmlPath) +- } ++ source = Paths.get(nimbusFmlPath) + Path dest = fmlBinary.get().asFile.toPath() + Files.copy(source, dest, StandardCopyOption.REPLACE_EXISTING) } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] bug 41337: always copy gcc/stdlibc++ into firefox and remove from tor-expert-bundle
by Dan Ballard (＠dan) 13 Feb '25

13 Feb '25

Dan Ballard pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: aa8564bd by Dan Ballard at 2025-02-13T07:51:19-08:00 bug 41337: always copy gcc/stdlibc++ into firefox and remove from tor-expert-bundle - - - - - 4 changed files: - projects/browser/build - projects/firefox/build - projects/tor/README.md - projects/tor/build Changes: ===================================== projects/browser/build ===================================== @@ -120,12 +120,6 @@ mv [% c('input_files_by_name/noscript') %] "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b # Move tor and dependencies to where TB expects them mv_tbdir tor/* "$TORBINPATH" - # on linux, libstdc++ lives in it's own directory - [% IF c("var/linux") %] - mkdir -p "$TBDIR/$TORBINPATH/libstdc++" - mv "$TBDIR/$TORBINPATH"/libstdc++.so.* "$TBDIR/$TORBINPATH/libstdc++" - [% END %] - # the expert bundle includes tor-gencert, which isn't needed for browser releases [% IF c("var/windows") %] rm "$TBDIR/$TORBINPATH/tor-gencert.exe" @@ -189,6 +183,13 @@ tar -C "${TB_STAGE_DIR}" -xf [% c('input_files_by_name/firefox') %]/browser.tar. done popd rm -rf $TMP_MANUAL_PATH + + # on linux, libstdc++ lives in it's own directory + [% IF c("var/linux") %] + # For legacy reasons, libstdc++ is with tor binaries in Tor Browser. + # We would have to test the updater to move it outside. + mv "$TBDIR/libstdc++" "$TBDIR/$TORBINPATH/libstdc++" + [% END %] [% END -%] [% IF c("var/namecoin") %] ===================================== projects/firefox/build ===================================== @@ -347,20 +347,24 @@ END; [% IF c("var/linux") -%] /var/tmp/dist/gcc/bin/"${CROSS_PREFIX}g++" $rootdir/abicheck.cc -o Browser/abicheck -std=c++17 - [% IF !c("var/tor-browser") -%] - libdest=Browser/libstdc++ - mkdir -p "$libdest" - libdir=[% c("var/libdir") %] - [% IF c("var/linux-cross") -%] - libdir="[% c("var/crosstarget") %]/$libdir" - [% END -%] - # FIXME: tor-browser-build#40749 - cp "/var/tmp/dist/gcc/$libdir/libstdc++.so."* "$libdest" - [% IF c("var/asan") -%] - cp "/var/tmp/dist/gcc/$libdir/libasan.so."* "$libdest" - cp "/var/tmp/dist/gcc/$libdir/libubsan.so."* "$libdest" - [% END -%] + libdest=Browser/libstdc++ + mkdir -p "$libdest" + libdir=[% c("var/libdir") %] + [% IF c("var/linux-cross") -%] + libdir="[% c("var/crosstarget") %]/$libdir" [% END -%] + # Not copying libstdc++.so.* as that dups with the full libstdc++.so.6.0.xx the .6 links to + # and libstdc++.so.6.0.28-gdb.py which is also not needed + cp "/var/tmp/dist/gcc/$libdir/libstdc++.so.6" "$libdest" + [% IF c("var/asan") -%] + cp "/var/tmp/dist/gcc/$libdir/libasan.so."* "$libdest" + cp "/var/tmp/dist/gcc/$libdir/libubsan.so."* "$libdest" + [% END -%] + # Strip and generate debuginfo for libs + for LIB in "$libdest"/*so* + do + "$STRIP" "$LIB" + done [% END -%] echo "Starting to package artifacts $(date)" ===================================== projects/tor/README.md ===================================== @@ -38,8 +38,5 @@ We plan to do it also on desktop platforms, see ## Other Linux libraries -For Linux we also include here libstdc++ (and the sanitizers, if enabled), even -though they aren't needed by tor. - -Also, on we provide debug symbols, but only for Linux, and only in +For Linux we provide debug symbols, but only for Linux, and only in `tor-expert-bundle`. ===================================== projects/tor/build ===================================== @@ -52,22 +52,7 @@ openssldir=/var/tmp/dist/openssl cp $openssldir/lib/libssl.so.3 "$TORBINDIR" cp $openssldir/lib/libcrypto.so.3 "$TORBINDIR" cp $libeventdir/lib/libevent-2.1.so.7 "$TORBINDIR" - # We need to copy the libstdc++.so.6 for Tor Browser on older Linux distros. - # Copying it into /Browser, which feels more natural, and amending - # LD_LIBRARY_PATH breaks updates from a Tor Browser with the old - # LD_LIBRARY_PATH value to the Tor Browser with the newer one. Thus, we copy - # the libstdc++ into the directory with the libs tor depends on, too. See bug - # 13359 for further details. - libdir=[% c("var/libdir") %] - [% IF c("var/linux-cross") -%] - libdir="[% c("var/crosstarget") %]/$libdir" - [% END -%] - cp "/var/tmp/dist/gcc/$libdir/libstdc++.so.6" "$TORBINDIR" - [% IF c("var/asan") -%] - cp "/var/tmp/dist/gcc/$libdir/libasan.so.6" "$TORBINDIR" - cp "/var/tmp/dist/gcc/$libdir/libubsan.so.1" "$TORBINDIR" - [% END -%] - chmod 700 "$TORBINDIR"/*.so* + # This is needed to make RPATH unavailable. See bug 9150. export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$TORBINDIR" [% END %] @@ -136,17 +121,9 @@ cd $distdir do LIB=`basename $i` - if [ $LIB == 'libstdc++.so.6' ]; then - # keeping this separate to maintain reproducibility; we can probably - # treat this the same as the rest (though it seems libstdc++ doesn't come with - # any useful debug symbols since we don't build it, so maybe we should figure - # out how to package them - "$STRIP" "$TORBINDIR/$LIB" - else - "$OBJCOPY" --only-keep-debug "$TORBINDIR/$LIB" "$TORDEBUGDIR/$LIB" - "$STRIP" "$TORBINDIR/$LIB" - "$OBJCOPY" --add-gnu-debuglink="$TORDEBUGDIR/$LIB" "$TORBINDIR/$LIB" - fi + "$OBJCOPY" --only-keep-debug "$TORBINDIR/$LIB" "$TORDEBUGDIR/$LIB" + "$STRIP" "$TORBINDIR/$LIB" + "$OBJCOPY" --add-gnu-debuglink="$TORDEBUGDIR/$LIB" "$TORBINDIR/$LIB" done [% END %] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.20.0esr-13.5-1] fixup! Bug 43125: Extend the 13.5 EOL expiry date for tor-browser.
by morgan (＠morgan) 12 Feb '25

12 Feb '25

morgan pushed to branch tor-browser-115.20.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 6339dfa6 by Henry Wilkes at 2025-02-12T15:58:14+00:00 fixup! Bug 43125: Extend the 13.5 EOL expiry date for tor-browser. TB 43168: Extend the 13.5 EOL to 16th September 2025. - - - - - 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; - // Firefox moved ESR 115 EOL to 1st April 2025. - const isExpired = Date.now() > Date.UTC(2025, 3, 1); + // Firefox moved ESR 115 EOL to 16th September 2025. + const isExpired = Date.now() > Date.UTC(2025, 8, 16); if ( AppConstants.platform === "macosx" && View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6339dfa… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6339dfa… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new tag mullvad-browser-129.0a1-15.0-2-build1
by Pier Angelo Vendrame (＠pierov) 12 Feb '25

12 Feb '25

Pier Angelo Vendrame pushed new tag mullvad-browser-129.0a1-15.0-2-build1 at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/mullv… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-129.0a1-15.0-2] 25 commits: MB 38: Mullvad Browser configuration
by Pier Angelo Vendrame (＠pierov) 12 Feb '25

12 Feb '25

Pier Angelo Vendrame pushed to branch mullvad-browser-129.0a1-15.0-2 at The Tor Project / Applications / Mullvad Browser Commits: 922e6c7c by Pier Angelo Vendrame at 2025-02-12T10:34:32+01:00 MB 38: Mullvad Browser configuration - - - - - 48c1d10e by Pier Angelo Vendrame at 2025-02-12T10:51:08+01:00 MB 1: Mullvad Browser branding See also: mullvad-browser#5: Product name and directory customization mullvad-browser#12: Create new branding directories and integrate Mullvad icons+branding mullvad-browser#14: Remove Default Built-in bookmarks mullvad-browser#35: Add custom PDF icons for Windows builds mullvad-browser#48: Replace Mozilla copyright and legal trademarks in mullvadbrowser.exe metadata mullvad-browser#51: Update trademark string mullvad-browser#104: Update shipped dll metadata copyright/licensing info mullvad-browser#107: Add alpha and nightly icons - - - - - 1b30b272 by Pier Angelo Vendrame at 2025-02-12T10:51:09+01:00 fixup! MB 1: Mullvad Browser branding TB 43323: Add an asset for sanity tests. - - - - - 63677f38 by Henry Wilkes at 2025-02-12T10:51:09+01:00 Mullvad Browser strings This commit adds strings needed by the following Mullvad Browser patches. - - - - - d5aa41b3 by Pier Angelo Vendrame at 2025-02-12T10:51:09+01:00 MB 20: Allow packaged-addons in PBM. We install a few addons from the distribution directory, but they are not automatically enabled for PBM mode. This commit modifies the code that installs them to also add the PBM permission to the known ones. - - - - - 03c15a61 by Pier Angelo Vendrame at 2025-02-12T10:51:09+01:00 MB 63: Customize some about pages for Mullvad Browser Also: mullvad-browser#57: Purge unneeded about: pages - - - - - a0278973 by Pier Angelo Vendrame at 2025-02-12T10:51:10+01:00 MB 37: Customization for the about dialog - - - - - 46ffae13 by Henry Wilkes at 2025-02-12T10:51:10+01:00 MB 39: Add home page about:mullvad-browser - - - - - f5fc0983 by hackademix at 2025-02-12T10:51:10+01:00 MB 97: Remove UI cues to install new extensions. - - - - - e6a472a3 by hackademix at 2025-02-12T10:51:10+01:00 MB 47: uBlock Origin customization - - - - - 8ec8943a by Pier Angelo Vendrame at 2025-02-12T10:54:44+01:00 MB 21: Disable the password manager This commit disables the about:login page and removes the "Login and Password" section of about:preferences. We do not do anything to the real password manager of Firefox, that is in toolkit: it contains C++ parts that make it difficult to actually prevent it from being built.. Finally, we modify the the function that opens about:login to report an error in the console so that we can quickly get a backtrace to the code that tries to use it. - - - - - 6fa1ed3a by Pier Angelo Vendrame at 2025-02-12T10:54:47+01:00 MB 112: Updater customization for Mullvad Browser MB 71: Set the updater base URL to Mullvad domain - - - - - 6aa0126a by Nicolas Vigier at 2025-02-12T10:54:48+01:00 MB 79: Add Mullvad Browser MAR signing keys MB 256: Add mullvad-browser nightly mar signing key - - - - - 05013dd9 by Pier Angelo Vendrame at 2025-02-12T10:54:48+01:00 MB 34: Hide unsafe and unwanted preferences UI about:preferences allow to override some of our defaults, that could be fingeprintable or have some other unwanted consequences. - - - - - 7f26f3a9 by Pier Angelo Vendrame at 2025-02-12T10:54:48+01:00 MB 160: Disable the cookie exceptions button Besides disabling the "Delete on close checkbox", disable also the "Manage Exceptions" button when always using PBM. - - - - - 0a9fc75e by hackademix at 2025-02-12T10:54:48+01:00 MB 163: prevent uBlock Origin from being uninstalled/disabled - - - - - c206ab70 by Richard Pospesel at 2025-02-12T10:54:49+01:00 MB 188: Customize Gitlab Issue and Merge templates - - - - - 9d1c9b18 by rui hildt at 2025-02-12T11:00:17+01:00 MB 213: Customize the search engines list MB 328: Refactor the search engine patch. Upstream switched to a completely different search engine configuration between ESR 115 and ESR 128. We moved our configuration to a couple of JSON files that do not follow upstream's schemas, as they are overcomplicated for our needs. Also, we keep the old search engine extensions for now, as upstream also kept them, and planned of removing them with Bug 1885953. - - - - - 55ea4493 by hackademix at 2025-02-12T11:00:18+01:00 MB 214: Enable cross-tab identity leak protection in "quiet" mode - - - - - 789d1538 by Pier Angelo Vendrame at 2025-02-12T11:00:18+01:00 MB 80: Enable Mullvad Browser as a default browser - - - - - 23129a84 by Pier Angelo Vendrame at 2025-02-12T11:00:18+01:00 MB 320: Temporarily disable WebRTC and WDBA on Windows. WebRTC should be re-enabled when tor-browser#42758 is resolved, and and the default browser agent when in general we make this feature work again. - - - - - c229d0b8 by Henry Wilkes at 2025-02-12T11:00:19+01:00 MB 329: Customize toolbar for mullvad-browser. - - - - - 923b05aa by Henry Wilkes at 2025-02-12T11:00:19+01:00 Add CI for Mullvad Browser - - - - - b83b3924 by Henry Wilkes at 2025-02-12T11:00:19+01:00 fixup! Add CI for Mullvad Browser MB 324: Remove trailing comma from translation JSON. - - - - - 7240a0b4 by Beatriz Rizental at 2025-02-12T11:05:09+01:00 fixup! Add CI for Base Browser Extend CI to support listing changes from rapid-release branches - - - - - 256 changed files: - .gitlab/ci/jobs/lint/helpers.py - .gitlab/ci/jobs/update-translations.yml - .gitlab/issue_templates/Emergency Security Issue.md - + .gitlab/issue_templates/Rebase Browser - Alpha.md - + .gitlab/issue_templates/Rebase Browser - Stable.md - .gitlab/merge_request_templates/default.md - browser/app/Makefile.in - browser/app/macbuild/Contents/Info.plist.in - browser/app/module.ver - browser/app/firefox.exe.manifest → browser/app/mullvadbrowser.exe.manifest - + browser/app/profile/000-mullvad-browser.js - browser/app/profile/001-base-profile.js - browser/base/content/aboutDialog.xhtml - browser/base/content/appmenu-viewcache.inc.xhtml - browser/base/content/browser-menubar.inc - browser/base/content/browser-places.js - browser/base/content/browser.js - browser/base/content/default-bookmarks.html - browser/base/content/nsContextMenu.sys.mjs - browser/base/content/overrides/app-license.html - browser/base/content/pageinfo/pageInfo.xhtml - browser/base/content/utilityOverlay.js - browser/branding/branding-common.mozbuild - + browser/branding/mb-alpha/VisualElements_150.png - + browser/branding/mb-alpha/VisualElements_70.png - + browser/branding/mb-alpha/configure.sh - + browser/branding/mb-alpha/content/about-logo.png - + browser/branding/mb-alpha/content/about-logo.svg - + browser/branding/mb-alpha/content/about-logo(a)2x.png - + browser/branding/mb-alpha/content/about-wordmark.svg - + browser/branding/mb-alpha/content/about.png - + browser/branding/mb-alpha/content/aboutDialog.css - + browser/branding/mb-alpha/content/firefox-wordmark.svg - + browser/branding/mb-alpha/content/icon128.png - + browser/branding/mb-alpha/content/icon16.png - + browser/branding/mb-alpha/content/icon256.png - + browser/branding/mb-alpha/content/icon32.png - + browser/branding/mb-alpha/content/icon48.png - + browser/branding/mb-alpha/content/icon64.png - + browser/branding/mb-alpha/content/jar.mn - + browser/branding/mb-alpha/content/moz.build - + browser/branding/mb-alpha/default128.png - + browser/branding/mb-alpha/default16.png - + browser/branding/mb-alpha/default22.png - + browser/branding/mb-alpha/default24.png - + browser/branding/mb-alpha/default256.png - + browser/branding/mb-alpha/default32.png - + browser/branding/mb-alpha/default48.png - + browser/branding/mb-alpha/default64.png - + browser/branding/mb-alpha/document.icns - + browser/branding/mb-alpha/document.ico - + browser/branding/mb-alpha/document_pdf.ico - + browser/branding/mb-alpha/firefox.icns - + browser/branding/mb-alpha/firefox.ico - + browser/branding/mb-alpha/firefox.svg - + browser/branding/mb-alpha/locales/en-US/brand.ftl - + browser/branding/mb-alpha/locales/en-US/brand.properties - + browser/branding/mb-alpha/locales/jar.mn - + browser/branding/mb-alpha/locales/moz.build - + browser/branding/mb-alpha/moz.build - + browser/branding/mb-alpha/mullvadbrowser.VisualElementsManifest.xml - + browser/branding/mb-alpha/newtab.ico - + browser/branding/mb-alpha/newwindow.ico - + browser/branding/mb-alpha/pbmode.ico - + browser/branding/mb-alpha/pref/firefox-branding.js - + browser/branding/mb-nightly/VisualElements_150.png - + browser/branding/mb-nightly/VisualElements_70.png - + browser/branding/mb-nightly/configure.sh - + browser/branding/mb-nightly/content/about-logo.png - + browser/branding/mb-nightly/content/about-logo.svg - + browser/branding/mb-nightly/content/about-logo(a)2x.png - + browser/branding/mb-nightly/content/about-wordmark.svg - + browser/branding/mb-nightly/content/about.png - + browser/branding/mb-nightly/content/aboutDialog.css - + browser/branding/mb-nightly/content/firefox-wordmark.svg - + browser/branding/mb-nightly/content/icon128.png - + browser/branding/mb-nightly/content/icon16.png - + browser/branding/mb-nightly/content/icon256.png - + browser/branding/mb-nightly/content/icon32.png - + browser/branding/mb-nightly/content/icon48.png - + browser/branding/mb-nightly/content/icon64.png - + browser/branding/mb-nightly/content/jar.mn - + browser/branding/mb-nightly/content/moz.build - + browser/branding/mb-nightly/default128.png - + browser/branding/mb-nightly/default16.png - + browser/branding/mb-nightly/default22.png - + browser/branding/mb-nightly/default24.png - + browser/branding/mb-nightly/default256.png - + browser/branding/mb-nightly/default32.png - + browser/branding/mb-nightly/default48.png - + browser/branding/mb-nightly/default64.png - + browser/branding/mb-nightly/document.icns - + browser/branding/mb-nightly/document.ico - + browser/branding/mb-nightly/document_pdf.ico - + browser/branding/mb-nightly/firefox.icns - + browser/branding/mb-nightly/firefox.ico - + browser/branding/mb-nightly/firefox.svg - + browser/branding/mb-nightly/locales/en-US/brand.ftl - + browser/branding/mb-nightly/locales/en-US/brand.properties - + browser/branding/mb-nightly/locales/jar.mn - + browser/branding/mb-nightly/locales/moz.build - + browser/branding/mb-nightly/moz.build - + browser/branding/mb-nightly/mullvadbrowser.VisualElementsManifest.xml - + browser/branding/mb-nightly/newtab.ico - + browser/branding/mb-nightly/newwindow.ico - + browser/branding/mb-nightly/pbmode.ico - + browser/branding/mb-nightly/pref/firefox-branding.js - + browser/branding/mb-release/VisualElements_150.png - + browser/branding/mb-release/VisualElements_70.png - + browser/branding/mb-release/configure.sh - + browser/branding/mb-release/content/about-logo.png - + browser/branding/mb-release/content/about-logo.svg - + browser/branding/mb-release/content/about-logo(a)2x.png - + browser/branding/mb-release/content/about-wordmark.svg - + browser/branding/mb-release/content/about.png - + browser/branding/mb-release/content/aboutDialog.css - + browser/branding/mb-release/content/firefox-wordmark.svg - + browser/branding/mb-release/content/icon128.png - + browser/branding/mb-release/content/icon16.png - + browser/branding/mb-release/content/icon256.png - + browser/branding/mb-release/content/icon32.png - + browser/branding/mb-release/content/icon48.png - + browser/branding/mb-release/content/icon64.png - + browser/branding/mb-release/content/jar.mn - + browser/branding/mb-release/content/moz.build - + browser/branding/mb-release/default128.png - + browser/branding/mb-release/default16.png - + browser/branding/mb-release/default22.png - + browser/branding/mb-release/default24.png - + browser/branding/mb-release/default256.png - + browser/branding/mb-release/default32.png - + browser/branding/mb-release/default48.png - + browser/branding/mb-release/default64.png - + browser/branding/mb-release/document.icns - + browser/branding/mb-release/document.ico - + browser/branding/mb-release/document_pdf.ico - + browser/branding/mb-release/firefox.icns - + browser/branding/mb-release/firefox.ico - + browser/branding/mb-release/firefox.svg - + browser/branding/mb-release/locales/en-US/brand.ftl - + browser/branding/mb-release/locales/en-US/brand.properties - + browser/branding/mb-release/locales/jar.mn - + browser/branding/mb-release/locales/moz.build - + browser/branding/mb-release/moz.build - + browser/branding/mb-release/mullvadbrowser.VisualElementsManifest.xml - + browser/branding/mb-release/newtab.ico - + browser/branding/mb-release/newwindow.ico - + browser/branding/mb-release/pbmode.ico - + browser/branding/mb-release/pref/firefox-branding.js - browser/components/BrowserContentHandler.sys.mjs - browser/components/BrowserGlue.sys.mjs - browser/components/about/AboutRedirector.cpp - browser/components/about/components.conf - browser/components/customizableui/CustomizableUI.sys.mjs - browser/components/moz.build - + browser/components/mullvad-browser/AboutMullvadBrowserChild.sys.mjs - + browser/components/mullvad-browser/AboutMullvadBrowserParent.sys.mjs - + browser/components/mullvad-browser/content/2728-sparkles.svg - + browser/components/mullvad-browser/content/aboutMullvadBrowser.css - + browser/components/mullvad-browser/content/aboutMullvadBrowser.js - + browser/components/mullvad-browser/content/aboutMullvadBrowser.xhtml - + browser/components/mullvad-browser/content/mullvadBrowserFont.css - + browser/components/mullvad-browser/jar.mn - + browser/components/mullvad-browser/moz.build - browser/components/newtab/AboutNewTabService.sys.mjs - browser/components/preferences/home.inc.xhtml - browser/components/preferences/main.js - browser/components/preferences/preferences.xhtml - browser/components/preferences/privacy.inc.xhtml - browser/components/preferences/privacy.js - browser/components/preferences/search.inc.xhtml - + browser/components/search/extensions/brave/favicon.svg - + browser/components/search/extensions/brave/manifest.json - + browser/components/search/extensions/ddg-html/favicon.ico - + browser/components/search/extensions/ddg-html/manifest.json - browser/components/search/extensions/ddg/manifest.json - + browser/components/search/extensions/metager/favicon.ico - + browser/components/search/extensions/metager/manifest.json - + browser/components/search/extensions/mojeek/favicon.ico - + browser/components/search/extensions/mojeek/manifest.json - + browser/components/search/extensions/mullvad-leta/favicon.svg - + browser/components/search/extensions/mullvad-leta/manifest.json - + browser/components/search/extensions/startpage/favicon.png - + browser/components/search/extensions/startpage/manifest.json - browser/components/shell/ShellService.sys.mjs - browser/components/shell/WindowsDefaultBrowser.cpp - browser/components/shell/nsWindowsShellService.cpp - browser/config/mozconfigs/base-browser - + browser/config/mozconfigs/mullvad-browser - browser/confvars.sh - browser/installer/package-manifest.in - browser/installer/windows/nsis/updater_append.ini - browser/modules/HomePage.sys.mjs - browser/moz.build - browser/moz.configure - config/create_rc.py - devtools/client/aboutdebugging/src/actions/runtimes.js - devtools/client/aboutdebugging/src/components/sidebar/Sidebar.js - devtools/client/jar.mn - devtools/client/themes/images/aboutdebugging-firefox-aurora.svg - devtools/client/themes/images/aboutdebugging-firefox-beta.svg - devtools/client/themes/images/aboutdebugging-firefox-logo.svg - devtools/client/themes/images/aboutdebugging-firefox-nightly.svg - devtools/client/themes/images/aboutdebugging-firefox-release.svg - + devtools/client/themes/images/aboutdebugging-mullvadbrowser-logo.svg - docshell/base/nsAboutRedirector.cpp - docshell/build/components.conf - moz.configure - mozconfig-linux-aarch64 - mozconfig-linux-aarch64-dev - mozconfig-linux-x86_64 - mozconfig-linux-x86_64-asan - mozconfig-linux-x86_64-dev - mozconfig-macos - mozconfig-macos-dev - mozconfig-windows-x86_64 - + other-licenses/nsis/Contrib/ApplicationID/Makefile - + other-licenses/nsis/Contrib/CityHash/Makefile - toolkit/components/extensions/child/ext-storage.js - toolkit/components/extensions/parent/ext-storage.js - toolkit/components/passwordmgr/LoginHelper.sys.mjs - toolkit/components/search/AppProvidedSearchEngine.sys.mjs - toolkit/components/search/SearchService.sys.mjs - + toolkit/components/search/content/brave.svg - + toolkit/components/search/content/duckduckgo.ico - + toolkit/components/search/content/metager.ico - + toolkit/components/search/content/mojeek.ico - + toolkit/components/search/content/mullvad-leta.svg - + toolkit/components/search/content/mullvadBrowserSearchEngineIcons.json - + toolkit/components/search/content/mullvadBrowserSearchEngines.json - + toolkit/components/search/content/startpage.png - + toolkit/components/search/jar.mn - toolkit/components/search/moz.build - toolkit/components/securitylevel/SecurityLevel.sys.mjs - + toolkit/content/aboutRightsMullvad.xhtml - + toolkit/content/aboutTelemetryMullvad.xhtml - toolkit/content/jar.mn - toolkit/content/license.html - toolkit/content/widgets/moz-support-link/moz-support-link.mjs - + toolkit/locales/en-US/toolkit/global/mullvad-browser.ftl - toolkit/mozapps/defaultagent/EventLog.h - toolkit/mozapps/defaultagent/SetDefaultBrowser.cpp - toolkit/mozapps/extensions/AddonManager.sys.mjs - toolkit/mozapps/extensions/content/aboutaddons.css - toolkit/mozapps/extensions/internal/XPIDatabase.sys.mjs - toolkit/mozapps/extensions/internal/XPIProvider.sys.mjs - 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/themes/shared/icons/mullvadbrowser.png - toolkit/themes/shared/minimal-toolkit.jar.inc.mn - toolkit/xre/nsAppRunner.cpp - tools/lint/fluent-lint/exclusions.yml - widget/windows/WinTaskbar.cpp - widget/windows/moz.build The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/45… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/45… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new branch mullvad-browser-129.0a1-15.0-2
by Pier Angelo Vendrame (＠pierov) 12 Feb '25

12 Feb '25

Pier Angelo Vendrame pushed new branch mullvad-browser-129.0a1-15.0-2 at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/mullv… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag base-browser-129.0a1-15.0-2-build1
by Pier Angelo Vendrame (＠pierov) 12 Feb '25

12 Feb '25

Pier Angelo Vendrame pushed new tag base-browser-129.0a1-15.0-2-build1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/base-brow… 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-129.0a1-15.0-2-build1
by Pier Angelo Vendrame (＠pierov) 12 Feb '25

12 Feb '25

Pier Angelo Vendrame pushed new tag tor-browser-129.0a1-15.0-2-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-128.7.0esr-14.5-1] fixup! Add CI for Base Browser
by Pier Angelo Vendrame (＠pierov) 12 Feb '25

12 Feb '25

Pier Angelo Vendrame pushed to branch mullvad-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 5ba50ab2 by Beatriz Rizental at 2025-02-12T10:57:08+01:00 fixup! Add CI for Base Browser Extend CI to support listing changes from rapid-release branches - - - - - 1 changed file: - .gitlab/ci/jobs/lint/helpers.py Changes: ===================================== .gitlab/ci/jobs/lint/helpers.py ===================================== @@ -42,18 +42,27 @@ def get_firefox_tag(reference): else: raise ValueError(f"Failed to extract version from reference '{reference}'.") - tag = f"FIREFOX_{firefox_version.replace('.', '_')}_" + major_version = firefox_version.split(".")[0] + minor_patch_version = "_".join(firefox_version.split(".")[1:]) + remote_tags = git("ls-remote --tags origin") # Each line looks like: # 9edd658bfd03a6b4743ecb75fd4a9ad968603715 refs/tags/FIREFOX_91_9_0esr_BUILD1 - pattern = rf"(.*){re.escape(tag)}(.*)$" + pattern = ( + rf"(.*)FIREFOX_{re.escape(major_version)}_{re.escape(minor_patch_version)}(.*)$" + ) match = re.search(pattern, remote_tags, flags=re.MULTILINE) + if not match: + # Attempt to match with a nightly tag, in case the ESR tag is not found + pattern = rf"(.*)FIREFOX_NIGHTLY_{re.escape(major_version)}(.*)$" + match = re.search(pattern, remote_tags, flags=re.MULTILINE) + if match: return match.group(0).split()[0] else: raise ValueError( - f"Failed to find reference specifier for Firefox tag '{tag}' from '{reference}'." + f"Failed to find reference specifier for Firefox tag of version '{firefox_version}' from '{reference}'." ) View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/5ba… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/5ba… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.7.0esr-14.5-1] fixup! Add CI for Base Browser
by Pier Angelo Vendrame (＠pierov) 12 Feb '25

12 Feb '25

Pier Angelo Vendrame pushed to branch base-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 52363905 by Beatriz Rizental at 2025-02-12T10:55:59+01:00 fixup! Add CI for Base Browser Extend CI to support listing changes from rapid-release branches - - - - - 1 changed file: - .gitlab/ci/jobs/lint/helpers.py Changes: ===================================== .gitlab/ci/jobs/lint/helpers.py ===================================== @@ -42,18 +42,27 @@ def get_firefox_tag(reference): else: raise ValueError(f"Failed to extract version from reference '{reference}'.") - tag = f"FIREFOX_{firefox_version.replace('.', '_')}_" + major_version = firefox_version.split(".")[0] + minor_patch_version = "_".join(firefox_version.split(".")[1:]) + remote_tags = git("ls-remote --tags origin") # Each line looks like: # 9edd658bfd03a6b4743ecb75fd4a9ad968603715 refs/tags/FIREFOX_91_9_0esr_BUILD1 - pattern = rf"(.*){re.escape(tag)}(.*)$" + pattern = ( + rf"(.*)FIREFOX_{re.escape(major_version)}_{re.escape(minor_patch_version)}(.*)$" + ) match = re.search(pattern, remote_tags, flags=re.MULTILINE) + if not match: + # Attempt to match with a nightly tag, in case the ESR tag is not found + pattern = rf"(.*)FIREFOX_NIGHTLY_{re.escape(major_version)}(.*)$" + match = re.search(pattern, remote_tags, flags=re.MULTILINE) + if match: return match.group(0).split()[0] else: raise ValueError( - f"Failed to find reference specifier for Firefox tag '{tag}' from '{reference}'." + f"Failed to find reference specifier for Firefox tag of version '{firefox_version}' from '{reference}'." ) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5236390… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5236390… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-129.0a1-15.0-2] 259 commits: Bug 1899516 - Warn user when missing unprivileged user namespace...
by Pier Angelo Vendrame (＠pierov) 12 Feb '25

12 Feb '25

Pier Angelo Vendrame pushed to branch tor-browser-129.0a1-15.0-2 at The Tor Project / Applications / Tor Browser Commits: 3b736527 by Alexandre Lissy at 2025-01-23T08:48:52+01:00 Bug 1899516 - Warn user when missing unprivileged user namespace r=firefox-desktop-core-reviewers ,fluent-reviewers,Gijs,flod, a=dmeehan, l10n=bolsson Differential Revision: https://phabricator.services.mozilla.com/D212024 - - - - - a8ee62d4 by Alexandre Lissy at 2025-01-23T08:48:59+01:00 Bug 1909616 - Do not report userns notification on Flatpak/Snap/Deb r=gcp, a=dmeehan Differential Revision: https://phabricator.services.mozilla.com/D217558 - - - - - e2648efa by Pier Angelo Vendrame at 2025-02-11T19:00:10+01:00 Bug 1840385 - Do not spoof the OS in HTTP User Agent. r=tjr Differential Revision: https://phabricator.services.mozilla.com/D234835 - - - - - 0f3e31a3 by Filipe Laíns at 2025-02-11T19:00:19+01:00 Bug 1935621 - Fix virtual environment sysconfig path calculation r=firefox-build-system-reviewers,ahochheiden Signed-off-by: Filipe Laíns <lains(a)riseup.net> Signed-off-by: Filipe Laíns <lains(a)riseup.net> Signed-off-by: Filipe Laíns <lains(a)riseup.net> Differential Revision: https://phabricator.services.mozilla.com/D231480 - - - - - a6f72b77 by Henry Wilkes at 2025-02-11T19:00:19+01:00 BB 41454: Move focus after calling openPreferences for a sub-category. Temporary fix until mozilla bug 1799153 gets a patch upstream. - - - - - 23045342 by Henry Wilkes at 2025-02-11T19:00:20+01: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. - - - - - 10d68ac9 by Henry Wilkes at 2025-02-11T19:00:20+01: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. - - - - - 508c1a54 by hackademix at 2025-02-11T19:00:21+01:00 BB 42194: Fix blank net error page on failed DNS resolution with active proxy. - - - - - 6c326227 by Henry Wilkes at 2025-02-11T19:00:21+01:00 BB 41483: Remove the firefox override for appstrings.properties Remove this patch after upstream bugzilla bug 1790187 - - - - - 68696a34 by hackademix at 2025-02-11T19:00:21+01:00 BB 43101: Deep link to the startup security warning explanation. - - - - - ecce7181 by Marco Simonelli at 2025-02-11T19:00:22+01:00 BB 41459: WebRTC fails to build under mingw (Part 1) - properly define NOMINMAX for just MSVC builds - - - - - 181fca1e by Marco Simonelli at 2025-02-11T19:00:22+01:00 BB 41459: WebRTC fails to build under mingw (Part 2) - fixes required to build third_party/libwebrtc - - - - - 3ab94ff4 by Marco Simonelli at 2025-02-11T19:00:22+01:00 BB 41459: WebRTC fails to build under mingw (Part 3) - fixes required to build third_party/sipcc - - - - - 68cec313 by Marco Simonelli at 2025-02-11T19:00:23+01:00 BB 41459: WebRTC fails to build under mingw (Part 4) - fixes requried to build netwerk/sctp - - - - - 13dca964 by Marco Simonelli at 2025-02-11T19:00:23+01:00 BB 41459: WebRTC fails to build under mingw (Part 5) - fixes required to build dom/media/webrtc - - - - - c6cc6d8b by Marco Simonelli at 2025-02-11T19:00:24+01:00 BB 41459: WebRTC fails to build under mingw (Part 6) - fixes required to build dom/media/systemservices - - - - - 56a426d8 by june wilde at 2025-02-11T19:00:24+01:00 BB 42758: Fix WebRTC build errors. - - - - - 24074d71 by hackademix at 2025-02-11T19:00:24+01:00 BB 41854: Allow overriding download spam protection. - - - - - cd7be4cf by hackademix at 2025-02-11T19:00:25+01:00 BB 42832: Download spam prevention exemption for browser extensions. - - - - - 06708ac9 by Pier Angelo Vendrame at 2025-02-11T19:00:25+01: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. - - - - - 57c28a43 by hackademix at 2025-02-11T19:00:25+01:00 BB 42835: Create an actor to filter file data transfers - - - - - f5791233 by Beatriz Rizental at 2025-02-11T19:00:26+01:00 BB 42728: Modify ./mach lint to skip unused linters - - - - - a8dcb820 by Gaba at 2025-02-11T19:00:26+01:00 Adding issue and merge request templates - - - - - f13be57a by Pier Angelo Vendrame at 2025-02-11T19:00:26+01:00 fixup! Adding issue and merge request templates Remove "Emergency" from security updates as per today's meeting. Our policy usually is to backport (almost) all emergency fixes, sooner or later. The actual emergency can be inferred from the timeline. - - - - - ea74e30c by Richard Pospesel at 2025-02-11T19:00:27+01:00 BB 42683: Create script to generate issue triage csv file from bugzilla query and git logs - - - - - 1f501ff5 by Henry Wilkes at 2025-02-11T19:00:27+01:00 BB 42305: Add script to combine translation files across versions. - - - - - bc9e05e3 by Henry Wilkes at 2025-02-11T19:00:28+01:00 fixup! BB 42305: Add script to combine translation files across versions. MB 324: Make the added comments also work for Mullvad Browser. - - - - - 4b422da7 by Beatriz Rizental at 2025-02-11T19:00:28+01:00 Add CI for Base Browser - - - - - aaf1fd03 by Henry Wilkes at 2025-02-11T19:00:28+01:00 fixup! Add CI for Base Browser MB 324: Move update-translations CI to base-browser. - - - - - b4233ae7 by Henry Wilkes at 2025-02-11T19:00:29+01:00 fixup! Add CI for Base Browser MB 324: Move update-translations from tor-browser to base-browser. - - - - - 8940113a by Beatriz Rizental at 2025-02-11T19:00:29+01:00 fixup! Add CI for Base Browser Attempt to download MR branch in case fetching fails due to the pipeline running in the parent project context. - - - - - 1969f0a5 by Beatriz Rizental at 2025-02-11T19:00:29+01:00 fixup! Add CI for Base Browser - - - - - 8244e69a by Beatriz Rizental at 2025-02-11T19:00:30+01:00 fixup! Add CI for Base Browser - - - - - b03c4d2e by Beatriz Rizental at 2025-02-11T19:00:30+01:00 fixup! Add CI for Base Browser Fetch specific branch when prepopulating history from local repository. - - - - - 40317427 by Beatriz Rizental at 2025-02-11T19:00:31+01:00 fixup! Add CI for Base Browser - - - - - ef926e28 by Pier Angelo Vendrame at 2025-02-11T19:00:31+01: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 - - - - - 4ade64af by Pier Angelo Vendrame at 2025-02-11T19:00:31+01: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. - - - - - eedc7598 by Pier Angelo Vendrame at 2025-02-11T19:00:32+01:00 BB 29320: Replace the gnu target with gnullvm for Rust. - - - - - 2c7950b8 by Pier Angelo Vendrame at 2025-02-11T19:00:32+01: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. - - - - - 7e000d75 by Pier Angelo Vendrame at 2025-02-11T19:00:32+01:00 BB 41108: Remove privileged macOS installation from 102 - - - - - 24810ce7 by Dan Ballard at 2025-02-11T19:00:33+01:00 BB 41149: Re-enable DLL injection protection in all builds not just nightlies - - - - - f92ea779 by Henry Wilkes at 2025-02-11T19:00:33+01:00 BB 43092: Disable wayland by default in Base Browser. - - - - - 782af82a by Matthew Finkel at 2025-02-11T19:00:35+01: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. - - - - - 2a8006c5 by Matthew Finkel at 2025-02-11T19:00:35+01:00 BB 28125: Prevent non-Necko network connections - - - - - a9b181cd by Mike Perry at 2025-02-11T19:00:36+01: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 - - - - - 3dc5885f by cypherpunks1 at 2025-02-11T19:00:36+01:00 BB 40717: Hide Windows SSO in settings - - - - - 3ce83dd9 by Georg Koppen at 2025-02-11T19:00:36+01: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. - - - - - 21667dfd by Kathy Brade at 2025-02-11T19:00:37+01:00 BB 21431: Clean-up system extensions shipped in Firefox Only ship the pdfjs extension. - - - - - 35964d5b by Henry Wilkes at 2025-02-11T19:00:37+01:00 BB 42831: Remove the shopping components. - - - - - 0e8bf141 by Kathy Brade at 2025-02-11T19:00:38+01: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. - - - - - 42bf9357 by Alex Catarineu at 2025-02-11T19:00:38+01:00 BB 41457: Remove Mozilla permissions Bug 40025: Remove Mozilla add-on install permissions - - - - - 378f9479 by Kathy Brade at 2025-02-11T19:00:38+01:00 BB 40002: Remove about:ion Firefox Ion (previously Firefox Pioneer) is an opt-in program in which people volunteer to participate in studies that collect detailed, sensitive data about how they use their browser. Bug 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. - - - - - 2dc53be3 by Morgan at 2025-02-11T19:00:39+01:00 BB 42716: Disable unwanted about: pages - - - - - d823a139 by Arthur Edelstein at 2025-02-11T19:00:39+01: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. - - - - - fe6bcc56 by Alex Catarineu at 2025-02-11T19:00:39+01: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. - - - - - 1823b8cf by cypherpunks1 at 2025-02-11T19:00:40+01:00 BB 41092: Add a RemoteSettings JSON dump for query-stripping - - - - - f2f7bd5e by cypherpunks1 at 2025-02-11T19:00:40+01:00 BB 42730: Patch RemoteSettings to use only local dumps as a data source - - - - - 9101e644 by Pier Angelo Vendrame at 2025-02-11T19:00:40+01:00 BB 41635: Disable the Normandy component Do not include Normandy at all whenever MOZ_NORMANDY is False. - - - - - ba2fc9c4 by Georg Koppen at 2025-02-11T19:00:41+01:00 BB 30541: Disable WebGL readPixel() for web content Related Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1428034 - - - - - 931ee3c9 by Alex Catarineu at 2025-02-11T19:00:41+01:00 BB 28369: Stop shipping pingsender executable - - - - - a88e62c4 by Henry Wilkes at 2025-02-11T19:00:42+01:00 BB 42630: Disable LaterRun module. - - - - - 5287082a by Pier Angelo Vendrame at 2025-02-11T19:00:42+01: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 - - - - - ec06d381 by Pier Angelo Vendrame at 2025-02-11T19:00:42+01: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". - - - - - 7375b1c7 by Richard Pospesel at 2025-02-11T19:00:43+01:00 BB 41327: Disable UrlbarProviderInterventions - - - - - 17130025 by Richard Pospesel at 2025-02-11T19:00:43+01:00 BB 42037: Disable about:firefoxview page - - - - - 6d08bb35 by Mike Perry at 2025-02-11T19:00:43+01:00 Firefox preference overrides. - - - - - 4f478eb4 by Pier Angelo Vendrame at 2025-02-11T19:00:44+01:00 fixup! Firefox preference overrides. BB 43236: Disable vsync on Wayland. Vsync leaks the monitor refresh rate, therefore it is already disabled on other platforms, including Linux/X11 and Windows. - - - - - 2167d37e by Pier Angelo Vendrame at 2025-02-11T19:00:44+01:00 fixup! Firefox preference overrides. BB 41065: Hardcode the limit of storage quota. Currently, we return min(10GB, 0.2 * available space in the fs). This is bad for systems that have less than 50GB free, especially live systems, such as Tails. Set a pref to replace the available space with a hardcoded limit (5GiB). - - - - - 23881d73 by Pier Angelo Vendrame at 2025-02-11T19:00:45+01:00 fixup! Firefox preference overrides. BB 43402: set browser.startup.blankWindow false. - - - - - 6f4d15bf by Pier Angelo Vendrame at 2025-02-11T19:00:45+01: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. - - - - - 40b9bcab by Pier Angelo Vendrame at 2025-02-11T19:00:45+01:00 BB 41901: Hardcode normalized FontSubstitutes. Windows has a system to set font aliases through the registry. This allows some customization that could be used as a fingerprinting vector. Moreover, this mechanism is used by Windows itself, and different SKUs might have different default FontSubstitutes. - - - - - 58f845f0 by Pier Angelo Vendrame at 2025-02-11T19:00:46+01: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. - - - - - cebf98fd by Alex Catarineu at 2025-02-11T19:00:46+01: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 - - - - - 5f8e10eb by Pier Angelo Vendrame at 2025-02-11T19:00:46+01: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. - - - - - 8a39a18d by Alex Catarineu at 2025-02-11T19:00:47+01:00 BB 40171: Make WebRequest and GeckoWebExecutor First-Party aware - - - - - f31608f7 by Alex Catarineu at 2025-02-11T19:00:47+01:00 BB 26345: Hide tracking protection UI - - - - - 82d6b4b9 by Henry Wilkes at 2025-02-11T19:00:47+01:00 BB 43109: Hide Firefox Relay from settings. This should remain disabled, see tor-browser#42814. - - - - - d05ba764 by Henry Wilkes at 2025-02-11T19:00:48+01: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. - - - - - 1f0d58ea by Morgan at 2025-02-11T19:00:48+01:00 BB 42070: Hide "Use smooth scrolling" from settings - - - - - c809ba93 by Arthur Edelstein at 2025-02-11T19:00:49+01:00 BB 18905: Hide unwanted items from help menu Bug 25660: Remove the "New Private Window" option - - - - - 38be0e92 by Pier Angelo Vendrame at 2025-02-11T19:00:49+01:00 BB 41739: Remove "Website appearance" from about:preferences. It is ignored because of RFP and it is confusing for users. - - - - - 64a035ed by Henry Wilkes at 2025-02-11T19:00:49+01:00 BB 43117: Hide "Always underline links" from settings. - - - - - 248027ac by Pier Angelo Vendrame at 2025-02-11T19:00:53+01:00 BB 42774: Always hide the third-pary certs UI. - - - - - 35daa84d by Henry Wilkes at 2025-02-11T19:00:54+01:00 BB 43118: Hide feature recommendation (CFR) settings. - - - - - 245ef3f7 by Pier Angelo Vendrame at 2025-02-11T19:00:54+01: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). - - - - - e29c8936 by Pier Angelo Vendrame at 2025-02-11T19:00:54+01: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. - - - - - 92d9e73f by Alex Catarineu at 2025-02-11T19:00:55+01:00 BB 27604: Fix addon issues when moving the profile directory Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1429838 - - - - - b14ef634 by Mike Perry at 2025-02-11T19:00:55+01: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 - - - - - af83bd1e by Pier Angelo Vendrame at 2025-02-11T19:00:56+01: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. - - - - - ca4b91c6 by Matthew Finkel at 2025-02-11T19:00:56+01:00 BB 40432: Prevent probing installed applications Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1711084 - - - - - e7478e65 by cypherpunks1 at 2025-02-11T19:00:56+01:00 BB 33955: When copying an image only copy the image contents to the clipboard - - - - - df6909c8 by cypherpunks1 at 2025-02-11T19:00:57+01:00 BB 41791: Omit the source URL when copying page contents to the clipboard - - - - - cc666674 by hackademix at 2025-02-11T19:00:57+01:00 BB 42288: Allow language spoofing in status messages. - - - - - d697d9db by Pier Angelo Vendrame at 2025-02-11T19:00:57+01: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. - - - - - 068c81b1 by Pier Angelo Vendrame at 2025-02-11T19:00:58+01:00 Base Browser strings This commit adds all the strings needed by following Base Browser patches. - - - - - b5156b55 by Henry Wilkes at 2025-02-11T19:00:58+01:00 BB 42583: Modify moz-support-link for Base Browser. - - - - - 9e88dea9 by Pier Angelo Vendrame at 2025-02-11T19:00:58+01: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. - - - - - 49283bfe by p13dz at 2025-02-11T19:00:59+01:00 BB 40283: Workaround for the file upload bug - - - - - 7f58a9df by hackademix at 2025-02-11T19:00:59+01:00 BB 42019: Empty browser's clipboard on browser shutdown - - - - - cfba2b7a by hackademix at 2025-02-11T19:01:00+01:00 BB 42084: Ensure English spoofing works even if preferences are set out of order. - - - - - 43416d98 by Pier Angelo Vendrame at 2025-02-11T19:01:00+01:00 BB 41930: Remove the UI to customize accept_languages. - - - - - 0797cd33 by hackademix at 2025-02-11T19:01:00+01:00 BB 41434: Letterboxing, improve logging. - - - - - 1cdc1ab2 by hackademix at 2025-02-11T19:01:01+01:00 BB 41434: Letterboxing, preemptively apply margins in a global CSS rule to mitigate race conditions on newly created windows and tabs. - - - - - 147791b7 by hackademix at 2025-02-11T19:01:01+01:00 BB 31064: Letterboxing, exempt browser extensions. - - - - - 06276172 by hackademix at 2025-02-11T19:01:01+01:00 BB 32411: Letterboxing, exempt view-source: URIs. - - - - - 941b323b by hackademix at 2025-02-11T19:01:02+01:00 BB 42574: Letterboxing, exempt pdf.js. - - - - - 39495960 by hackademix at 2025-02-11T19:01:02+01:00 BB 32308: Use direct browser sizing for letterboxing. Bug 30556: align letterboxing with 200x100 new win width stepping - - - - - 7849c8af by hackademix at 2025-02-11T19:01:03+01:00 BB 41631: Prevent weird initial window dimensions caused by subpixel computations - - - - - f37f1f47 by hackademix at 2025-02-11T19:01:03+01:00 BB 41918: Option to reuse last window size when letterboxing is enabled. - - - - - 51ad8124 by hackademix at 2025-02-11T19:01:03+01:00 BB 41916: Letterboxing preferences UI - - - - - 1ae8dadc by hackademix at 2025-02-11T19:01:04+01:00 BB 41695: Warn on window maximization without letterboxing in RFPHelper module - - - - - d8efb4c7 by hackademix at 2025-02-11T19:01:04+01:00 BB 42443: Shrink window to match letterboxing size when the emtpy area is clicked. - - - - - 6de042bb by Henry Wilkes at 2025-02-11T19:01:04+01:00 BB 42528: Don't leak system scrollbar size on windows. - - - - - 7047a40d by Henry Wilkes at 2025-02-11T19:01:05+01:00 BB 31575: Disable Firefox Home (Activity Stream) Treat about:blank as the default home page and new tab page. Avoid loading AboutNewTab in BrowserGlue.sys.mjs in order to avoid several network requests that we do not need. Bug 41624: Disable about:pocket-* pages. Bug 40144: Redirect about:privatebrowsing to the user's home - - - - - 795b8940 by Kathy Brade at 2025-02-12T10:13:36+01: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. - - - - - 00f00c9d by Pier Angelo Vendrame at 2025-02-12T10:13:48+01:00 BB 42061: Create an alpha update channel. - - - - - 1f814519 by Nicolas Vigier at 2025-02-12T10:13:49+01:00 BB 41682: Add base-browser nightly mar signing key - - - - - d2dcb4e3 by Pier Angelo Vendrame at 2025-02-12T10:13:49+01: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/. - - - - - 5ccc8f3a by Pier Angelo Vendrame at 2025-02-12T10:13:49+01:00 BB 41698: Reword the recommendation badges in about:addons Firefox strings use { -brand-product-name }. As a result, it seems that the fork is recommending extensions, whereas AMO curators are doing that. So, we replace the strings with custom ones that clarify that Mozilla is recommending them. We assign the strings with JS because our translation backend does not support Fluent attributes, yet, but once it does, we should switch to them, instead. Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1825033 - - - - - 2b070f36 by Pier Angelo Vendrame at 2025-02-12T10:13:50+01: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. - - - - - f145bbd1 by Alex Catarineu at 2025-02-12T10:13:50+01:00 BB 40069: Add helpers for message passing with extensions - - - - - 47024425 by Matthew Finkel at 2025-02-12T10:13:50+01:00 BB 41598: Prevent NoScript from being removed/disabled. Bug 40253: Explicitly allow NoScript in Private Browsing mode. - - - - - abf139a4 by Henry Wilkes at 2025-02-12T10:13:51+01: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). - - - - - 8d55285b by hackademix at 2025-02-12T10:13:51+01:00 BB 41834: Hide "Can't Be Removed - learn more" menu line for uninstallable add-ons - - - - - 3363c4e5 by Pier Angelo Vendrame at 2025-02-12T10:13:51+01: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 - - - - - 31d12b32 by Pier Angelo Vendrame at 2025-02-12T10:13:52+01:00 BB 40926: Implemented the New Identity feature - - - - - 821313e4 by Henry Wilkes at 2025-02-12T10:13:52+01:00 BB 41736: Customize toolbar for base-browser. - - - - - 4519bd3c by Pier Angelo Vendrame at 2025-02-12T10:13:52+01:00 BB 42027: Base Browser migration procedures. This commit implmenents the the Base Browser's version of _migrateUI. - - - - - a4bfb05f by Henry Wilkes at 2025-02-12T10:13:53+01: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. - - - - - 03333e4b by Richard Pospesel at 2025-02-12T10:13:53+01:00 TB 41649: Create rebase and security backport gitlab issue templates - - - - - 1b3e000e by Morgan at 2025-02-12T10:13:53+01:00 fixup! TB 41649: Create rebase and security backport gitlab issue templates - TB 43298: add rebase template for nightly-based Tor Browser Alpha and Bugzilla Triage Issue generation - TB 43341: Create Firefox Nightly Rebase Issue Template - - - - - 267997e3 by Beatriz Rizental at 2025-02-12T10:13:54+01:00 Add CI for Tor Browser - - - - - 95e801fe by Beatriz Rizental at 2025-02-12T10:13:54+01:00 fixup! Add CI for Tor Browser - - - - - e784e743 by Henry Wilkes at 2025-02-12T10:13:55+01:00 fixup! Add CI for Tor Browser MB 324: Re-introduce tor-browser changes to update-translations - - - - - ba40f469 by Beatriz Rizental at 2025-02-12T10:13:55+01:00 fixup! Add CI for Tor Browser Implement Nightly startup tests for Android - - - - - eb5a63af by Richard Pospesel at 2025-02-12T10:13:55+01:00 TB 41089: Add tor-browser build scripts + Makefile to tor-browser - - - - - 9792a90d by Henry Wilkes at 2025-02-12T10:13:56+01:00 TB 41803: Add some developer tools for working on tor-browser. - - - - - 94334a49 by Kathy Brade at 2025-02-12T10:13:56+01:00 TB 11641: Disable remoting by default. Unless the -osint command line flag is used, the browser now defaults to the equivalent of -no-remote. There is a new -allow-remote flag that may be used to restore the original (Firefox-like) default behavior. - - - - - 37b7d6d7 by Alex Catarineu at 2025-02-12T10:13:56+01:00 Add TorStrings module for localization - - - - - 1b16116e by Henry Wilkes at 2025-02-12T10:13:57+01:00 Tor Browser strings This commit adds all the strings needed for Tor Browser patches. - - - - - d660ed73 by Henry Wilkes at 2025-02-12T10:13:57+01:00 Tor Browser localization migration scripts. - - - - - 8b016d8d by Mike Perry at 2025-02-12T10:13:57+01: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). - - - - - f451288d by Pier Angelo Vendrame at 2025-02-12T10:13:58+01:00 fixup! TB 2176: Rebrand Firefox to TorBrowser TB 43323: Add an asset for sanity tests. - - - - - 26e9fd00 by Henry Wilkes at 2025-02-12T10:13:58+01:00 Customize moz-toggle for tor-browser. - - - - - 021a3c3e by Henry Wilkes at 2025-02-12T10:13:58+01:00 TB 43087: Add onion-pattern to be used on Tor pages. - - - - - 6c429542 by hackademix at 2025-02-12T10:14:01+01:00 TB 41917: Tor brand-specific styles. - - - - - b7ae876b by Henry Wilkes at 2025-02-12T10:14:01+01:00 TB 41817: tor-browser semantic colors. - - - - - b38fe45a by Henry Wilkes at 2025-02-12T10:14:02+01:00 TB 42110: Add TorUIUtils module for common tor component methods. - - - - - 59f5316c by Henry Wilkes at 2025-02-12T10:14:02+01:00 Add purple tor version of the loading APNG. - - - - - 0e205f96 by Henry Wilkes at 2025-02-12T10:14:02+01:00 TB 42583: Modify moz-support-link for Tor Browser. - - - - - f40b7dc1 by sanketh at 2025-02-12T10:14:03+01: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 - - - - - 8987821f by Mike Perry at 2025-02-12T10:14:03+01: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 - - - - - ef0af752 by Henry Wilkes at 2025-02-12T10:14:04+01:00 TB 41340: Enable TOR_BROWSER_NIGHTLY_BUILD features for dev and nightly builds tor-browser#41285: Enable fluent warnings. - - - - - 60c4e5e7 by Pier Angelo Vendrame at 2025-02-12T10:14:04+01: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. - - - - - 3df6484a by Henry Wilkes at 2025-02-12T10:14:04+01:00 fixup! TB 40562: Added Tor Browser preferences to 000-tor-browser.js TB 41921: Set default TorSetting setting values in 000-tor-browser.js. - - - - - 7027a629 by Pier Angelo Vendrame at 2025-02-12T10:14:05+01: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. - - - - - 36eadc2a by Pier Angelo Vendrame at 2025-02-12T10:14:05+01:00 TB 40933: Add tor-launcher functionality Bug 41926: Reimplement the control port - - - - - da263d35 by Henry Wilkes at 2025-02-12T10:14:05+01:00 fixup! TB 40933: Add tor-launcher functionality TB 41921: Use temporary bridges for TorProvider initialisation. It is unlikely that temporary bridges would be present when TorProvider is initialised, but it should be using whatever TorSettings.applySettings uses. - - - - - cfbeee6e by Henry Wilkes at 2025-02-12T10:14:06+01:00 fixup! TB 40933: Add tor-launcher functionality TB 41921: Move prompt_at_startup preference from TorProvider to TorConnect only. - - - - - dd4efcd8 by Henry Wilkes at 2025-02-12T10:14:06+01:00 fixup! TB 40933: Add tor-launcher functionality TB 41921: Add a NOTE for future development ensuring that writeSettings is not subject to any races between sequential calls. - - - - - 50ae81a1 by Henry Wilkes at 2025-02-12T10:14:06+01:00 fixup! TB 40933: Add tor-launcher functionality TB 41921: Ensure shouldStartAndOwnTor is constant per-session. TorConnect and TorSettings `enabled` properties depend on this value, and shouldn't change per session. - - - - - 7350bfda by Henry Wilkes at 2025-02-12T10:14:07+01:00 fixup! TB 40933: Add tor-launcher functionality TB 41921: Ensure TorProviderBuilder.build can be called immediately after TorProviderBuilder.init returns (without await). We make sure that the `#provider` instance is created before any break in execution caused by an `await`. - - - - - 7528c21f by Henry Wilkes at 2025-02-12T10:14:07+01:00 fixup! TB 40933: Add tor-launcher functionality TB 41921: Add a note to TorBootstrapRequest explaining the expectation that the TorProvider has already read from TorSettings before it connects. - - - - - b75d8c9b by clairehurst at 2025-02-12T10:14:07+01:00 fixup! TB 40933: Add tor-launcher functionality Bug 43222: Fix tor logs timestamps - - - - - ccf12a43 by Cecylia Bocovich at 2025-02-12T10:14:08+01:00 Lox integration - - - - - 064164a0 by Richard Pospesel at 2025-02-12T10:14:08+01: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 - - - - - bbe02c60 by Henry Wilkes at 2025-02-12T10:14:08+01:00 fixup! TB 40597: Implement TorSettings module TB 41921: Return only the bridge settings from Moat. Rather than return { bridges: enabled: true, ... } from MoatRPC API, we just return the relevant parts. This should make it clearer that Moat can *only* change TorSettings.bridges, and nothing else. - - - - - 72fa5715 by Henry Wilkes at 2025-02-12T10:14:09+01:00 fixup! TB 40597: Implement TorSettings module TB 41921: Have Moat bridges pass through TorSettings rather than using TorProvider directly. TorSettings should be the only caller to TorProvider.writeSettings, so we can establish more control over which bridges are in use at any given moment in one place. Also add some sanitation to the Moat response. - - - - - 3b33cd26 by Henry Wilkes at 2025-02-12T10:14:09+01:00 fixup! TB 40597: Implement TorSettings module TB 41921: Only use TorSettings.changeSettings to change the Tor settings and apply them in one method. The granular methods have been made private. - - - - - 3be15c17 by Henry Wilkes at 2025-02-12T10:14:09+01:00 fixup! TB 40597: Implement TorSettings module TB 41921: Make the TorSettings properties read-only outside of the TorSettings modules. Within TorSettings we make all post initialisation changes in changeSettings. This means we can simplify the class and move all the setter logic into one place. - - - - - cc74acab by Henry Wilkes at 2025-02-12T10:14:10+01:00 fixup! TB 40597: Implement TorSettings module TB 41921: Move prompt_at_startup pref from TorProvider to TorConnect only. This simplifies the logic, where we set the preference any time we have a bootstrap error and clear it when we are bootstrapped. - - - - - 8983bf83 by Henry Wilkes at 2025-02-12T10:14:10+01:00 fixup! TB 40597: Implement TorSettings module TB 41921: Flush TorSettings settings every time they are saved. - - - - - fb755186 by Henry Wilkes at 2025-02-12T10:14:10+01:00 fixup! TB 40597: Implement TorSettings module TB 41921: Tighten up TorSettings. We ensure TorSettings is enabled before certain operations. Also tidy up uninit to account for early calls (before init completes) or repeat calls. Also stop using "torbrowser.settings.enabled" preference, and read from the preferences for the first run. Also make TorSettings.initailizedPromise read-only. - - - - - 19f665c5 by Henry Wilkes at 2025-02-12T10:14:11+01:00 fixup! TB 40597: Implement TorSettings module TB 41921: Move quickstart setting from TorSettings to TorConnect. - - - - - 02844505 by Henry Wilkes at 2025-02-12T10:14:11+01:00 fixup! TB 40597: Implement TorSettings module TB 41921: Do not wait for TorSettings to initialise before allowing a bootstrap. Instead, we wait for TorSettings as required: for preparing AutoBootstrap attempts, and TorBootstrapRequest should already wait for TorSettings before attempting to connect. - - - - - 9621ce2b by Henry Wilkes at 2025-02-12T10:14:11+01:00 fixup! TB 40597: Implement TorSettings module TB 41921: Reset bootstrap stage when bridge settings change. In particular, this will cancel an autobootstrap when the user manually changes the bridge settings. However we apply this to all bootstrap attempts for consistency. By resetting to the Start stage, we also ensure that about:torconnect UI no longer shows the "Try bridges" pages when the user manually changes their bridges themselves. - - - - - 985b0da6 by Henry Wilkes at 2025-02-12T10:14:12+01:00 fixup! TB 40597: Implement TorSettings module TB 43254: Allow some DomainFrontedRequests to be cancelled. This is used by some of the Moat calls to stop abandoned requests running in the background: 1. Cancelled AutoBootstraps. 2. Cancelled CAPTCHA request/submissions. - - - - - f65799c4 by Arthur Edelstein at 2025-02-12T10:14:12+01: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 - - - - - c3dd26df by Henry Wilkes at 2025-02-12T10:14:12+01:00 TB 41600: Add a tor circuit display panel. - - - - - 0cfee2d7 by Pier Angelo Vendrame at 2025-02-12T10:14:13+01: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. - - - - - 861250dc by Henry Wilkes at 2025-02-12T10:14:13+01:00 fixup! TB 42247: Android helpers for the TorProvider TB 41921: Only use TorSettings.changeSettings to change the Tor settings and apply them in one method. We drop redundant arguments and unused methods from android integration. - - - - - 1c165076 by Henry Wilkes at 2025-02-12T10:14:14+01:00 fixup! TB 42247: Android helpers for the TorProvider TB 41921: Move quickstart setting from TorSettings to TorConnect. - - - - - 495506df by Henry Wilkes at 2025-02-12T10:14:14+01:00 fixup! TB 42247: Android helpers for the TorProvider TB 41921: Do not wait for TorProviderBuilder.init since it is no longer async. - - - - - 39d89c33 by Pier Angelo Vendrame at 2025-02-12T10:14:14+01:00 fixup! TB 42247: Android helpers for the TorProvider Add a missing return to #getAllSettings(). - - - - - 5905d04d by clairehurst at 2025-02-12T10:14:15+01:00 fixup! TB 42247: Android helpers for the TorProvider Bug 43222: Fix tor logs timestamps - - - - - 638eddce by hackademix at 2025-02-12T10:14:15+01:00 TB 8324: Prevent DNS proxy bypasses caused by Drag&Drop Bug 41613: Skip Drang & Drop filtering for DNS-safe URLs - - - - - 2022315d by Matthew Finkel at 2025-02-12T10:14:15+01: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. - - - - - 4c801ff4 by Pier Angelo Vendrame at 2025-02-12T10:14:17+01:00 TB 40807: Added QRCode.js to toolkit/modules - - - - - 30d5720c by Richard Pospesel at 2025-02-12T10:14:18+01: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 - - - - - 228ca000 by Henry Wilkes at 2025-02-12T10:14:18+01:00 fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection TB 41921: Only use TorSettings.changeSettings to change the Tor settings and apply them in one method. - - - - - d2afb9a1 by Henry Wilkes at 2025-02-12T10:14:18+01:00 fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection TB 41921: Pass in the BridgeDB bridge_strings as an Array to TorSettings. - - - - - f4c5856a by Henry Wilkes at 2025-02-12T10:14:19+01:00 fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection TB 41921: Move flushSettings call to TorSettings. The call in connectionPane will not necessarily run when the preference tab is closed, nor will it trigger for bridges added through auto-bootstrapping. - - - - - 9f27f5cf by Henry Wilkes at 2025-02-12T10:14:19+01:00 fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection TB 41921: Move quickstart setting from TorSettings to TorConnect. - - - - - c80f2762 by Henry Wilkes at 2025-02-12T10:14:19+01:00 fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection TB 41921: Also show the "Connect" button for bridge dialogs when we have an ongoing bootstrap attempt. With the new behaviour, changing the settings while not bootstrapped will cancel any ongoing bootstrap. Therefore, we can start a new bootstrap using the new settings. - - - - - 46799132 by Henry Wilkes at 2025-02-12T10:14:20+01:00 fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection TB 43254: Cancel Moat requests when the CAPTHCA dialog is closed. - - - - - 30cfebbe by Richard Pospesel at 2025-02-12T10:14:20+01: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. - - - - - 3edc677a by Henry Wilkes at 2025-02-12T10:14:20+01:00 fixup! TB 27476: Implement about:torconnect captive portal within Tor Browser TB 41921: Only use TorSettings.changeSettings to change the Tor settings and apply them in one method. - - - - - 804f48c7 by Henry Wilkes at 2025-02-12T10:14:21+01:00 fixup! TB 27476: Implement about:torconnect captive portal within Tor Browser TB 41921: Move quickstart setting from TorSettings to TorConnect. This also means we no longer need to listen for TorSettingsTopics.Ready for the initial value. Also fix typo in signal name: "quickstart-changed" to "quickstart-change". - - - - - 6fa9edff by Pier Angelo Vendrame at 2025-02-12T10:14:21+01:00 Temporary changes to about:torconnect for Android. We are planning of tempoorarily using about:torconnect on Android, until the native UX is ready. - - - - - 77a28c9d by Henry Wilkes at 2025-02-12T10:14:21+01: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. - - - - - a454965d by Pier Angelo Vendrame at 2025-02-12T10:14:22+01: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. - - - - - 6e721438 by Kathy Brade at 2025-02-12T10:14:22+01:00 TB 12647: Support symlinks in the updater. - - - - - 406ab1ae by Georg Koppen at 2025-02-12T10:14:22+01: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 - - - - - 0c187a6a by Pier Angelo Vendrame at 2025-02-12T10:14:23+01: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. - - - - - 4d6ad620 by Alex Catarineu at 2025-02-12T10:14:23+01:00 TB 40073: Disable remote Public Suffix List fetching In https://bugzilla.mozilla.org/show_bug.cgi?id=1563246 Firefox implemented fetching the Public Suffix List via RemoteSettings and replacing the default one at runtime, which we do not want. - - - - - eadab16a by Henry Wilkes at 2025-02-12T10:14:23+01:00 TB 41906: Hide DNS over HTTPS preferences. - - - - - 2b2b2602 by Richard Pospesel at 2025-02-12T10:14:24+01: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. - - - - - e7abb50d by Kathy Brade at 2025-02-12T10:14:24+01: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. - - - - - 4c4bac7c by Alex Catarineu at 2025-02-12T10:14:24+01: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. - - - - - c53530e1 by Pier Angelo Vendrame at 2025-02-12T10:14:25+01: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. - - - - - 14e5c2dd by Henry Wilkes at 2025-02-12T10:14:25+01:00 fixup! TB 40458: Implement .tor.onion aliases TB 41831: Add additional effective TLD for abc.au.securedrop.tor.onion exception. - - - - - 56f0a442 by Pier Angelo Vendrame at 2025-02-12T10:14:26+01: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. - - - - - 38e78687 by Pier Angelo Vendrame at 2025-02-12T10:14:26+01: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. - - - - - 3eeea2bc by Henry Wilkes at 2025-02-12T10:14:26+01:00 fixup! TB 41435: Add a Tor Browser migration function TB 41921: Clear out unused "torbrowser.settings.enabled" preference. - - - - - faa2f35c by Dan Ballard at 2025-02-12T10:14:27+01:00 TB 40701: Add security warning when downloading a file Shown in the downloads panel, about:downloads and places.xhtml. - - - - - 80818ea6 by Henry Wilkes at 2025-02-12T10:14:27+01:00 TB 41736: Customize toolbar for tor-browser. - - - - - cbc3538f by hackademix at 2025-02-12T10:14:27+01:00 TB 41728: Pin bridges.torproject.org domains to Let's Encrypt's root cert public key - - - - - a8d7dea8 by Richard Pospesel at 2025-02-12T10:14:28+01:00 TB 41822: Unconditionally disable default browser UX in about:preferences - - - - - dec23bf6 by Cecylia Bocovich at 2025-02-12T10:14:28+01: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. - - - - - 9b2fe959 by Pier Angelo Vendrame at 2025-02-12T10:14:28+01:00 [android] TBA strings - - - - - 96f946a5 by Dan Ballard at 2025-02-12T10:14:29+01:00 TB 42660: Disable ProxySelector.openConnectionWithProxy and NOPify CrashReporter.sendCrashReport - - - - - 75e80ffe by Dan Ballard at 2025-02-12T10:14:29+01:00 TB 43006: Disable RFP for Font Visibility on Android - - - - - 02893bce by Matthew Finkel at 2025-02-12T10:14:29+01:00 TB 40005: [android] Modify Default toolbar menu Originally android-components#40005. - - - - - 47ffa153 by Alex Catarineu at 2025-02-12T10:14:30+01: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. - - - - - c8cda68c by Alex Catarineu at 2025-02-12T10:14:30+01: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 - - - - - 4bcece3f by Alex Catarineu at 2025-02-12T10:14:30+01: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 - - - - - 84a3f258 by hackademix at 2025-02-12T10:14:31+01:00 TB 42191: [android] Temporary StrictMode relaxation to clear the thumbnail cache. - - - - - 5a290c76 by hackademix at 2025-02-12T10:14:31+01: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 - - - - - 9987e818 by Alex Catarineu at 2025-02-12T10:14:31+01: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. - - - - - ff4fc653 by Alex Catarineu at 2025-02-12T10:14:33+01:00 TB 40015: [android] Port padlock states for .onion services Originally, android-components#40015. - - - - - 8e2af431 by Matthew Finkel at 2025-02-12T10:14:34+01:00 [android] Modify Tracking Protection configuration android-components#40020: Disable third-party cookies android-components#40024: Disable tracking protection by default - - - - - cc42ed03 by Matthew Finkel at 2025-02-12T10:14:34+01:00 TB 40023: [android] Stop PrivateNotificationService Originally, android-components#40023. - - - - - 2dae34cc by Alex Catarineu at 2025-02-12T10:14:34+01:00 TB 34439 [android]: Isolate Icon loader on Android. Originally, android-components#34439. - - - - - aa4135fc by Matthew Finkel at 2025-02-12T10:14:35+01: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 - - - - - 3ccd0523 by Matthew Finkel at 2025-02-12T10:14:35+01:00 TB 40032 [android]: Set usesCleartextTraffic as false Originally, fenix#40032. - - - - - 82006ea0 by Matthew Finkel at 2025-02-12T10:14:36+01: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 - - - - - 56325ab5 by Georg Koppen at 2025-02-12T10:14:36+01: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. - - - - - 5539057e by Matthew Finkel at 2025-02-12T10:14:36+01:00 TB 40185: [android] Use NimbusDisabled Originally, fenix#40185. - - - - - aaa6e143 by Alex Catarineu at 2025-02-12T10:14:37+01:00 TB 40087 [android]: Implement a switch for spoof English. Originally, fenix#40087 and android-components#40019. - - - - - 0c8b1c85 by Matthew Finkel at 2025-02-12T10:14:37+01:00 TB 34403 [android]: Disable Normal mode by default. Originally, fenix#34403. - - - - - 29acfc06 by Matthew Finkel at 2025-02-12T10:14:37+01:00 TB 40016 [android]: Don't install WebCompat webext. Originally, fenix#40016. - - - - - dfb57dd3 by Matthew Finkel at 2025-02-12T10:14:38+01: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 - - - - - 5642ecad by Matthew Finkel at 2025-02-12T10:14:38+01:00 TB 40026 [android]: Implement Security Level settings on Android. Originally, fenix#40026. - - - - - 871705ae by Dan Ballard at 2025-02-12T10:14:38+01:00 TB 41972: [android] Disable Mozilla onboarding - - - - - df62f878 by Dan Ballard at 2025-02-12T10:14:39+01:00 TB 41878: [android] Add standalone Tor Bootstrap - - - - - ce01c08c by Henry Wilkes at 2025-02-12T10:14:39+01:00 fixup! TB 41878: [android] Add standalone Tor Bootstrap TB 41921: Drop redundant arguments to getTorIntegration().setSettings. All calls to this method passed true for the last two arguments. - - - - - ba9d11ac by clairehurst at 2025-02-12T10:14:39+01:00 fixup! TB 41878: [android] Add standalone Tor Bootstrap Bug 43222: Fix tor logs timestamps - - - - - f5d250c1 by clairehurst at 2025-02-12T10:14:40+01:00 fixup! TB 41878: [android] Add standalone Tor Bootstrap Bug 43360: Replace custom variable isBeingRecreated with built-in isFinishing function - - - - - d37cede7 by clairehurst at 2025-02-12T10:14:40+01:00 fixup! TB 41878: [android] Add standalone Tor Bootstrap Bug 43368: Add @Suppress for linting error "Overriding method should call super. onNewIntent" - - - - - 3dd7beb9 by Matthew Finkel at 2025-02-12T10:14:40+01:00 TB 40041 [android]: Implement Tor Network Settings Originally, fenix#40041. - - - - - 423ecb52 by clairehurst at 2025-02-12T10:14:41+01:00 fixup! TB 40041 [android]: Implement Tor Network Settings Bug 43222: Fix tor logs timestamps - - - - - 8801c542 by clairehurst at 2025-02-12T10:14:41+01:00 [android] Implement Android-native Connection Assist UI - - - - - 8ab2e94b by clairehurst at 2025-02-12T10:14:41+01:00 fixup! [android] Implement Android-native Connection Assist UI Bug 43359: Improper handling of TorBootstrapChangeListener with respect to system onDestroy() calls for HomeActivity - - - - - b6d3ff58 by clairehurst at 2025-02-12T10:14:42+01:00 TB 42655 [android]: Implement "New circuit for this site" on Android - - - - - 21747c72 by clairehurst at 2025-02-12T10:14:42+01:00 TB 42089: [android] Remove ability to submit site support requests - - - - - 40159f15 by clairehurst at 2025-02-12T10:14:42+01:00 [android] Delete unused media - - - - - 2b184720 by clairehurst at 2025-02-12T10:14:43+01:00 [android] Bug_43351: Add function to disable forcing ALL CAPS for the fenix snackbar action button text This is needed because the default snackbar will force all caps, which can cause problems in some languages. See tor-browser#43351 and bugzilla bug 1935387. TODO: Remove once the forced all caps is removed by mozilla. - - - - - 03f577e2 by Beatriz Rizental at 2025-02-12T10:14:43+01: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. - - - - - 12e17e02 by Beatriz Rizental at 2025-02-12T10:26:33+01:00 fixup! Add CI for Base Browser Extend CI to support listing changes from rapid-release branches - - - - - 1813 changed files: - .eslintignore - .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/Backport Android Security Fixes.md - + .gitlab/issue_templates/Bugzilla Triage.md - + .gitlab/issue_templates/Emergency Security Issue.md - + .gitlab/issue_templates/QA - Android.md - + .gitlab/issue_templates/QA - Desktop.md - + .gitlab/issue_templates/Rebase Browser - Alpha.md - + .gitlab/issue_templates/Rebase Browser - Legacy.md - + .gitlab/issue_templates/Rebase Browser - Rapid.md - + .gitlab/issue_templates/Rebase Browser - Stable.md - + .gitlab/issue_templates/bug.md - + .gitlab/merge_request_templates/Rebase.md - + .gitlab/merge_request_templates/default.md - .prettierignore - + README.md - − README.txt - + browser/actors/CryptoSafetyChild.sys.mjs - + browser/actors/CryptoSafetyParent.sys.mjs - − browser/actors/RFPHelperChild.sys.mjs - − browser/actors/RFPHelperParent.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-menubar.inc - browser/base/content/browser-places.js - browser/base/content/browser-safebrowsing.js - browser/base/content/browser-sets.inc - 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 - 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/BrowserContentHandler.sys.mjs - browser/components/BrowserGlue.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/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/content/panelUI.inc.xhtml - 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/AboutNewTabService.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/resistfingerprinting/test/browser/browser_dynamical_window_rounding.js - browser/components/resistfingerprinting/test/browser/browser_navigator.js - browser/components/resistfingerprinting/test/browser/browser_navigator_iframes.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/SearchSERPTelemetry.sys.mjs - + browser/components/search/extensions/ddg-onion/favicon.ico - + browser/components/search/extensions/ddg-onion/manifest.json - browser/components/search/extensions/ddg/manifest.json - + browser/components/search/extensions/startpage-onion/favicon.png - + browser/components/search/extensions/startpage-onion/manifest.json - + browser/components/search/extensions/startpage/favicon.png - + browser/components/search/extensions/startpage/manifest.json - + browser/components/securitylevel/content/securityLevel.js - + browser/components/securitylevel/content/securityLevelButton.css - + browser/components/securitylevel/content/securityLevelButton.inc.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/shopping/jar.mn - browser/components/shopping/moz.build - browser/components/tabbrowser/content/tabbrowser.js - browser/components/tests/browser/browser.toml - + browser/components/tests/browser/browser_browserGlue_userNamespacesNotification.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/UrlbarInput.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/confvars.sh - 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/Makefile.in - − browser/locales/en-US/chrome/overrides/appstrings.properties - browser/locales/jar.mn - browser/modules/BrowserWindowTracker.sys.mjs - browser/modules/HomePage.sys.mjs - browser/modules/LaterRun.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/addons/unified-extensions.css - 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/tabs.css - browser/themes/shared/toolbarbutton-icons.css - + browser/themes/shared/tor-branding.css - + browser/themes/shared/tor-urlbar-button.css - build/application.ini.in - build/moz.build - build/moz.configure/init.configure - build/moz.configure/rust.configure - build/moz.configure/update-programs.configure - build/variables.py - 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/Navigator.cpp - dom/base/nsContentUtils.cpp - dom/base/nsContentUtils.h - dom/base/nsCopySupport.cpp - dom/base/nsGlobalWindowOuter.cpp - dom/base/nsNodeInfoManager.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/locales/moz.build - 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 - dom/xslt/xslt/txMozillaXSLTProcessor.cpp - dom/xslt/xslt/txXSLTMsgsURL.h - 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/StandardFonts-win10-upstream.inc - gfx/thebes/gfxDWriteFontList.cpp - gfx/thebes/gfxDWriteFontList.h - gfx/thebes/gfxFcPlatformFontList.cpp - gfx/thebes/gfxGDIFontList.cpp - gfx/thebes/gfxMacPlatformFontList.mm - gfx/thebes/gfxPlatformFontList.cpp - intl/l10n/Localization.h - intl/locale/LocaleService.cpp - intl/strres/nsIStringBundle.idl - intl/strres/nsStringBundle.cpp - js/src/old-configure.in - js/xpconnect/src/xpc.msg - layout/base/nsLayoutUtils.cpp - 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/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/SiteSecurityIconView.kt - mobile/android/android-components/components/browser/toolbar/src/main/res/drawable/mozac_ic_site_security.xml - mobile/android/android-components/components/browser/toolbar/src/main/res/values/attrs_browser_toolbar.xml - mobile/android/android-components/components/browser/toolbar2/src/main/java/mozilla/components/browser/toolbar2/display/DisplayToolbar.kt - mobile/android/android-components/components/browser/toolbar2/src/main/java/mozilla/components/browser/toolbar2/display/SiteSecurityIconView.kt - mobile/android/android-components/components/browser/toolbar2/src/main/res/drawable/mozac_ic_site_security.xml - mobile/android/android-components/components/browser/toolbar2/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/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/addons/src/main/res/layout/mozac_feature_addons_fragment_dialog_addon_installed.xml - 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/privatemode/src/main/java/mozilla/components/feature/privatemode/notification/PrivateNotificationFeature.kt - 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/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/glean/src/main/java/mozilla/components/service/glean/private/MetricAliases.kt - mobile/android/android-components/components/service/nimbus/src/main/java/mozilla/components/service/nimbus/messaging/NimbusMessagingController.kt - mobile/android/android-components/components/service/nimbus/src/main/java/mozilla/components/service/nimbus/messaging/NimbusMessagingStorage.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/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/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/basebrowser.configure - mobile/android/branding/beta/locales/jar.mn - mobile/android/branding/nightly/locales/jar.mn - mobile/android/branding/official/locales/jar.mn - mobile/android/branding/unofficial/locales/jar.mn - mobile/android/confvars.sh - 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/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_foreground.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_foreground.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/components/Analytics.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.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/FenixSnackbar.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/NimbusComponents.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/menu/middleware/MenuNavigationMiddleware.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/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/downloads/DynamicDownloadDialog.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/pocket/PocketStoriesComposables.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/sessioncontrol/viewholders/PrivateBrowsingDescriptionViewHolder.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/topsites/PagerIndicator.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/topsites/TopSiteItemViewHolder.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/topsites/TopSites.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkItemMenu.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/MicrosurveyCompleted.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/FenixOnboarding.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/ReEngagementNotificationWorker.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/UpgradeOnboarding.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/AwesomeBarView.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/TorSecurityLevelFragment.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/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/SitePermissionsFragment.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/share/SaveToPDFMiddleware.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/shopping/ui/NoAnalysis.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityCheckContextualOnboarding.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/TabLayoutMediator.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/tor/ConnectAssistUiState.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/QuickStartPreference.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/SecurityLevel.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorBootstrapStatus.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/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-hdpi/shopping_no_analysis.webp - − mobile/android/fenix/app/src/main/res/drawable-hdpi/shopping_onboarding.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-mdpi/shopping_no_analysis.webp - − mobile/android/fenix/app/src/main/res/drawable-mdpi/shopping_onboarding.webp - − mobile/android/fenix/app/src/main/res/drawable-night-hdpi/shopping_no_analysis.webp - − mobile/android/fenix/app/src/main/res/drawable-night-hdpi/shopping_onboarding.webp - − mobile/android/fenix/app/src/main/res/drawable-night-mdpi/shopping_no_analysis.webp - − mobile/android/fenix/app/src/main/res/drawable-night-mdpi/shopping_onboarding.webp - − mobile/android/fenix/app/src/main/res/drawable-night-xhdpi/shopping_no_analysis.webp - − mobile/android/fenix/app/src/main/res/drawable-night-xhdpi/shopping_onboarding.webp - − mobile/android/fenix/app/src/main/res/drawable-night-xxhdpi/shopping_no_analysis.webp - − mobile/android/fenix/app/src/main/res/drawable-night-xxhdpi/shopping_onboarding.webp - − mobile/android/fenix/app/src/main/res/drawable-night-xxxhdpi/shopping_no_analysis.webp - − mobile/android/fenix/app/src/main/res/drawable-night-xxxhdpi/shopping_onboarding.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-xhdpi/shopping_no_analysis.webp - − mobile/android/fenix/app/src/main/res/drawable-xhdpi/shopping_onboarding.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-xxhdpi/shopping_no_analysis.webp - − mobile/android/fenix/app/src/main/res/drawable-xxhdpi/shopping_onboarding.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-xxxhdpi/shopping_no_analysis.webp - − mobile/android/fenix/app/src/main/res/drawable-xxxhdpi/shopping_onboarding.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_launcher_foreground.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_launcher_monochrome.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_pocket.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/pocket_vector.xml - mobile/android/fenix/app/src/main/res/drawable/progress_gradient.xml - mobile/android/fenix/app/src/main/res/drawable/pager_dot.xml → mobile/android/fenix/app/src/main/res/drawable/rounded_corners.xml - mobile/android/fenix/app/src/main/res/drawable-night/ic_logo_wordmark_normal.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/drawable/onboarding_popup_shape.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/component_tabstray2.xml - mobile/android/fenix/app/src/main/res/layout/fenix_snackbar.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_turn_on_sync.xml - mobile/android/fenix/app/src/main/res/layout/onboarding_inactive_tabs_cfr.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_private_round.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/main/res/xml/tor_security_level_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_foreground.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/components/metrics/MetricsUtilsTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/ext/ContextTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/home/HomeMenuViewTest.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/share/viewholders/AppViewHolderTest.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/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt - + 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/TorIntegrationAndroid.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/moz.configure - mobile/android/shared-settings.gradle - 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 - old-configure.in - python/mach/mach/site.py - python/mozbuild/mozbuild/artifacts.py - python/mozbuild/mozbuild/mach_commands.py - python/mozlint/mozlint/cli.py - 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 - + security/sandbox/common/SandboxUtils.sys.mjs - security/sandbox/common/moz.build - 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/mozbase/mozinstall/mozinstall/mozinstall.py - testing/mozbase/setup_development.py - testing/mozharness/scripts/does_it_crash.py - 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.js - toolkit/actors/AboutHttpsOnlyErrorParent.sys.mjs - + toolkit/actors/FilesFilterChild.sys.mjs - + toolkit/actors/FilesFilterParent.sys.mjs - toolkit/actors/NetErrorChild.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/resistfingerprinting/jar.mn - toolkit/components/resistfingerprinting/nsRFPService.cpp - toolkit/components/resistfingerprinting/nsRFPService.h - toolkit/components/search/AppProvidedSearchEngine.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/shopping/jar.mn - 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/windowwatcher/nsWindowWatcher.cpp - toolkit/content/.eslintrc.js - toolkit/content/aboutNetError.html - toolkit/content/aboutNetError.mjs - toolkit/content/jar.mn - toolkit/content/license.html - + 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/en-US/toolkit/updates/elevation.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/FinderParent.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/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/findbar.css - + 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/tor-dark-loading.png - + toolkit/themes/shared/icons/tor-dark-loading(a)2x.png - + toolkit/themes/shared/icons/tor-light-loading.png - + toolkit/themes/shared/icons/tor-light-loading(a)2x.png - + 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/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/jslint.sh - tools/lint/fluent-lint/exclusions.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/generate_tor_loading_png.py - + 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/update_emojis.py - tools/update-packaging/common.sh - tools/update-packaging/make_full_update.sh - tools/update-packaging/make_incremental_update.sh - uriloader/base/nsDocLoader.cpp - 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/4f973e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/4f973e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.7.0esr-14.5-1] fixup! Add CI for Tor Browser
by Pier Angelo Vendrame (＠pierov) 12 Feb '25

12 Feb '25

Pier Angelo Vendrame pushed to branch tor-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: ed5dc003 by Henry Wilkes at 2025-02-12T09:37:46+00:00 fixup! Add CI for Tor Browser TB 43481: Revert d9df89b1f48781d78847976d2cb48748bf864f7c to re-enable translation CI in tor-browser branch. - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -13,3 +13,4 @@ include: - local: '.gitlab/ci/jobs/lint/lint.yml' - local: '.gitlab/ci/jobs/startup-test/startup-test.yml' - local: '.gitlab/ci/jobs/update-containers.yml' + - local: '.gitlab/ci/jobs/update-translations.yml' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ed5dc00… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ed5dc00… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.7.0esr-14.5-1] fixup! Add CI for Base Browser
by Pier Angelo Vendrame (＠pierov) 12 Feb '25

12 Feb '25

Pier Angelo Vendrame pushed to branch tor-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 1d4c9a12 by Beatriz Rizental at 2025-02-12T10:17:24+01:00 fixup! Add CI for Base Browser Extend CI to support listing changes from rapid-release branches - - - - - 1 changed file: - .gitlab/ci/jobs/lint/helpers.py Changes: ===================================== .gitlab/ci/jobs/lint/helpers.py ===================================== @@ -42,18 +42,27 @@ def get_firefox_tag(reference): else: raise ValueError(f"Failed to extract version from reference '{reference}'.") - tag = f"FIREFOX_{firefox_version.replace('.', '_')}_" + major_version = firefox_version.split(".")[0] + minor_patch_version = "_".join(firefox_version.split(".")[1:]) + remote_tags = git("ls-remote --tags origin") # Each line looks like: # 9edd658bfd03a6b4743ecb75fd4a9ad968603715 refs/tags/FIREFOX_91_9_0esr_BUILD1 - pattern = rf"(.*){re.escape(tag)}(.*)$" + pattern = ( + rf"(.*)FIREFOX_{re.escape(major_version)}_{re.escape(minor_patch_version)}(.*)$" + ) match = re.search(pattern, remote_tags, flags=re.MULTILINE) + if not match: + # Attempt to match with a nightly tag, in case the ESR tag is not found + pattern = rf"(.*)FIREFOX_NIGHTLY_{re.escape(major_version)}(.*)$" + match = re.search(pattern, remote_tags, flags=re.MULTILINE) + if match: return match.group(0).split()[0] else: raise ValueError( - f"Failed to find reference specifier for Firefox tag '{tag}' from '{reference}'." + f"Failed to find reference specifier for Firefox tag of version '{firefox_version}' from '{reference}'." ) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1d4c9a1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1d4c9a1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.7.0esr-14.5-1] 4 commits: fixup! TB 40041 [android]: Implement Tor Network Settings
by Dan Ballard (＠dan) 11 Feb '25

11 Feb '25

Dan Ballard pushed to branch tor-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 4f30e0a4 by clairehurst at 2025-02-11T11:37:13-07:00 fixup! TB 40041 [android]: Implement Tor Network Settings tor-browser#43408 - - - - - 6877b274 by clairehurst at 2025-02-11T12:06:17-07:00 fixup! TB 42247: Android helpers for the TorProvider tor-browser#43408 - - - - - d95f26e0 by clairehurst at 2025-02-11T12:06:18-07:00 fixup! [android] Implement Android-native Connection Assist UI tor-browser#43408 - - - - - 881f522b by clairehurst at 2025-02-11T12:06:18-07:00 fixup! TB 41878: [android] Add standalone Tor Bootstrap tor-browser#43408 - - - - - 12 changed files: - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt - − mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/QuickStartPreference.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/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/res/xml/preferences.xml - mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorIntegrationAndroid.java - mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorSettings.java - mobile/android/geckoview/src/main/java/org/mozilla/geckoview/androidlegacysettings/TorLegacyAndroidSettings.java - toolkit/modules/TorAndroidIntegration.sys.mjs Changes: ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt ===================================== @@ -13,7 +13,6 @@ import android.os.Build import android.os.Bundle import android.os.Handler import android.os.Looper -import android.util.Log import android.view.LayoutInflater import android.view.WindowManager import android.widget.Toast @@ -65,16 +64,12 @@ import org.mozilla.fenix.ext.openSetDefaultBrowserOption import org.mozilla.fenix.ext.requireComponents import org.mozilla.fenix.ext.settings import org.mozilla.fenix.ext.showToolbar -import org.mozilla.fenix.gecko.GeckoProvider import org.mozilla.fenix.nimbus.FxNimbus import org.mozilla.fenix.perf.ProfilerViewModel import org.mozilla.fenix.settings.account.AccountUiView -import org.mozilla.fenix.tor.QuickStartPreference import org.mozilla.fenix.tor.SecurityLevel -import org.mozilla.fenix.tor.TorBridgeTransportConfig -import org.mozilla.fenix.tor.TorEvents +import org.mozilla.fenix.tor.QuickstartViewModel import org.mozilla.fenix.utils.Settings -import org.mozilla.geckoview.BuildConfig import kotlin.system.exitProcess import org.mozilla.fenix.GleanMetrics.Settings as SettingsMetrics @@ -86,6 +81,8 @@ class SettingsFragment : PreferenceFragmentCompat(), UserInteractionHandler { private lateinit var addonFilePicker: AddonFilePicker private val profilerViewModel: ProfilerViewModel by activityViewModels() + private val quickstartViewModel: QuickstartViewModel by activityViewModels() + @VisibleForTesting internal val accountObserver = object : AccountObserver { private fun updateAccountUi(profile: Profile? = null) { @@ -776,10 +773,12 @@ class SettingsFragment : PreferenceFragmentCompat(), UserInteractionHandler { } } - requirePreference<QuickStartPreference>(R.string.pref_key_quick_start).apply { + requirePreference<SwitchPreference>(R.string.pref_key_quick_start).apply { + isChecked = quickstartViewModel.quickstart().value == true setOnPreferenceClickListener { - context.components.torController.quickstart = !context.components.torController.quickstart - updateSwitch() + quickstartViewModel.quickstartSet( + isChecked, + ) true } } ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/QuickStartPreference.kt deleted ===================================== @@ -1,32 +0,0 @@ -package org.mozilla.fenix.tor - -import android.content.Context -import android.util.AttributeSet -import androidx.preference.PreferenceViewHolder -import androidx.preference.SwitchPreference -import com.google.android.material.switchmaterial.SwitchMaterial -import org.mozilla.fenix.R -import org.mozilla.fenix.ext.components - -class QuickStartPreference @JvmOverloads constructor( - context: Context, - attrs: AttributeSet? = null, -) : SwitchPreference(context, attrs) { - - private var switchView: SwitchMaterial? = null - - init { - widgetLayoutResource = R.layout.preference_quick_start - } - - override fun onBindViewHolder(holder: PreferenceViewHolder) { - super.onBindViewHolder(holder) - switchView = holder.findViewById(R.id.switch_widget) as SwitchMaterial - - updateSwitch() - } - - fun updateSwitch() { - switchView?.isChecked = context.components.torController.quickstart - } -} ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/QuickstartViewModel.kt ===================================== @@ -0,0 +1,41 @@ +package org.mozilla.fenix.tor + +import android.app.Application +import androidx.lifecycle.AndroidViewModel +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import mozilla.components.browser.engine.gecko.GeckoEngine +import org.mozilla.fenix.ext.components + +class QuickstartViewModel( + application: Application, +) : AndroidViewModel(application) { + + private val torIntegrationAndroid = + (getApplication<Application>().components.core.engine as GeckoEngine).getTorIntegrationController() + + /** + * NOTE: Whilst the initial value for _quickstart is fetched from + * TorIntegrationAndroid.quickstartGet (which is surfaced from TorConnect.quickstart), and we + * pass on any changes in value up to TorConnect.quickstart (via quickstartSet()), we do not + * listen for any changes to the TorConnect.quickstart value via "QuickstartChange" because we + * do not expect anything outside of TorConnectViewModel to change its value, so we expect its + * value to remain in sync with our local value. + */ + init { + torIntegrationAndroid.quickstartGet { + _quickstart.value = it + } + } + + private val _quickstart = MutableLiveData<Boolean>() + fun quickstart(): LiveData<Boolean> { + return _quickstart + } + + fun quickstartSet(value: Boolean) { + torIntegrationAndroid.quickstartSet(value) + _quickstart.value = value + } + +} ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistFragment.kt ===================================== @@ -20,6 +20,7 @@ import android.view.ViewGroup import androidx.appcompat.content.res.AppCompatResources import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels +import androidx.fragment.app.viewModels import androidx.lifecycle.Lifecycle import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle @@ -38,6 +39,8 @@ class TorConnectionAssistFragment : Fragment(), UserInteractionHandler { private var _binding: FragmentTorConnectionAssistBinding? = null private val binding get() = _binding!! + private val quickstartViewModel: QuickstartViewModel by activityViewModels() + override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, @@ -78,10 +81,10 @@ class TorConnectionAssistFragment : Fragment(), UserInteractionHandler { setProgressBarCompat(progress) } - viewModel.quickstartToggle().observe( + quickstartViewModel.quickstart().observe( viewLifecycleOwner, ) { - binding.quickstartSwitch.isChecked = it == true + binding.quickstartSwitch.isChecked = it } viewModel.shouldOpenHome().observe( @@ -185,9 +188,8 @@ class TorConnectionAssistFragment : Fragment(), UserInteractionHandler { private fun setQuickStart(screen: ConnectAssistUiState) { binding.quickstartSwitch.visibility = if (screen.quickstartSwitchVisible) View.VISIBLE else View.GONE - binding.quickstartSwitch.isChecked = viewModel.quickstartToggle().value == true binding.quickstartSwitch.setOnCheckedChangeListener { _, isChecked -> - viewModel.handleQuickstartChecked(isChecked) + quickstartViewModel.quickstartSet(isChecked) } } ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistViewModel.kt ===================================== @@ -27,13 +27,6 @@ class TorConnectionAssistViewModel( private val _torConnectScreen = MutableStateFlow(ConnectAssistUiState.Splash) internal val torConnectScreen: StateFlow<ConnectAssistUiState> = _torConnectScreen - private val _quickStartToggle = MutableLiveData<Boolean>() // don't initialize with quickstart off the bat - fun quickstartToggle(): LiveData<Boolean?> { - _quickStartToggle.value = _torController.quickstart // quickstart isn't ready until torSettings is ready - return _quickStartToggle - } - - private val _shouldOpenHome = MutableLiveData(false) fun shouldOpenHome(): LiveData<Boolean> { return _shouldOpenHome @@ -66,11 +59,6 @@ class TorConnectionAssistViewModel( } } - fun handleQuickstartChecked(checked: Boolean) { - _torController.quickstart = checked - _quickStartToggle.value = checked - } - fun handleButton1Pressed( screen: ConnectAssistUiState, lifecycleScope: LifecycleCoroutineScope?, ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorController.kt ===================================== @@ -40,7 +40,6 @@ interface TorController: TorEvents { var bridgesEnabled: Boolean var bridgeTransport: TorBridgeTransportConfig var userProvidedBridges: String? - var quickstart: Boolean fun start() fun stop() ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorControllerGV.kt ===================================== @@ -73,17 +73,6 @@ class TorControllerGV( override val isBootstrapped get() = isTorBootstrapped override val isConnected get() = (_lastKnownStatus.value.isStarted() && !isTorRestarting) - override var quickstart: Boolean - get() { - return getTorSettings()?.quickstart ?: false - } - set(value) { - getTorSettings()?.let { - it.quickstart = value - getTorIntegration().setSettings(it) - } - } - private fun getTorIntegration(): TorIntegrationAndroid { return (context.components.core.engine as GeckoEngine).getTorIntegrationController() } ===================================== mobile/android/fenix/app/src/main/res/xml/preferences.xml ===================================== @@ -176,7 +176,7 @@ android:title="@string/preferences_tor_network_settings_bridge_config" android:summary="@string/preferences_tor_network_settings_bridge_config_description" /> - <org.mozilla.fenix.tor.QuickStartPreference + <SwitchPreference android:key="@string/pref_key_quick_start" android:summary="@string/connection_assist_always_connect_automatically_toggle_description" android:title="@string/tor_bootstrap_quick_start_label" ===================================== mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorIntegrationAndroid.java ===================================== @@ -52,6 +52,8 @@ public class TorIntegrationAndroid implements BundleEventListener { private static final String EVENT_BOOTSTRAP_BEGIN_AUTO = "GeckoView:Tor:BootstrapBeginAuto"; private static final String EVENT_BOOTSTRAP_CANCEL = "GeckoView:Tor:BootstrapCancel"; private static final String EVENT_BOOTSTRAP_GET_STATE = "GeckoView:Tor:BootstrapGetState"; + private static final String EVENT_QUICKSTART_GET = "GeckoView:Tor:QuickstartGet"; + private static final String EVENT_QUICKSTART_SET = "GeckoView:Tor:QuickstartSet"; private static final String CONTROL_PORT_FILE = "/control-ipc"; private static final String SOCKS_FILE = "/socks-ipc"; @@ -682,6 +684,23 @@ public class TorIntegrationAndroid implements BundleEventListener { return EventDispatcher.getInstance().queryVoid(EVENT_SETTINGS_SET, bundle); } + public interface QuickstartGetter { + void onValue(boolean enabled); + } + + public void quickstartGet(QuickstartGetter quickstartGetter) { + EventDispatcher.getInstance().queryBoolean(EVENT_QUICKSTART_GET).then(enabled -> { + quickstartGetter.onValue(Boolean.TRUE.equals(enabled)); + return new GeckoResult<Void>(); + }); + } + + public @NonNull GeckoResult<Void> quickstartSet(boolean enabled) { + final GeckoBundle bundle = new GeckoBundle(1); + bundle.putBoolean("enabled", enabled); + return EventDispatcher.getInstance().queryVoid(EVENT_QUICKSTART_SET, bundle); + } + public @NonNull GeckoResult<Void> beginBootstrap() { return EventDispatcher.getInstance().queryVoid(EVENT_BOOTSTRAP_BEGIN); } ===================================== mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorSettings.java ===================================== @@ -101,8 +101,6 @@ public class TorSettings { public boolean enabled = true; - public boolean quickstart = false; - // bridges section public boolean bridgesEnabled = false; public BridgeSource bridgesSource = BridgeSource.Invalid; @@ -125,7 +123,6 @@ public class TorSettings { public TorSettings(GeckoBundle bundle) { try { - GeckoBundle qs = bundle.getBundle("quickstart"); GeckoBundle bridges = bundle.getBundle("bridges"); GeckoBundle proxy = bundle.getBundle("proxy"); GeckoBundle firewall = bundle.getBundle("firewall"); @@ -135,8 +132,6 @@ public class TorSettings { bridgesBuiltinType = BridgeBuiltinType.fromString(bridges.getString("builtin_type")); bridgeBridgeStrings = bridges.getStringArray("bridge_strings"); - quickstart = qs.getBoolean("enabled"); - firewallEnabled = firewall.getBoolean("enabled"); firewallAllowedPorts = firewall.getIntArray("allowed_ports"); @@ -156,7 +151,6 @@ public class TorSettings { public GeckoBundle asGeckoBundle() { GeckoBundle bundle = new GeckoBundle(); - GeckoBundle qs = new GeckoBundle(); GeckoBundle bridges = new GeckoBundle(); GeckoBundle proxy = new GeckoBundle(); GeckoBundle firewall = new GeckoBundle(); @@ -166,8 +160,6 @@ public class TorSettings { bridges.putString("builtin_type", bridgesBuiltinType.toString()); bridges.putStringArray("bridge_strings", bridgeBridgeStrings); - qs.putBoolean("enabled", quickstart); - firewall.putBoolean("enabled", firewallEnabled); firewall.putIntArray("allowed_ports", firewallAllowedPorts); @@ -178,7 +170,6 @@ public class TorSettings { proxy.putInt("port", proxyPort); proxy.putInt("type", proxyType.toInt()); - bundle.putBundle("quickstart", qs); bundle.putBundle("bridges", bridges); bundle.putBundle("proxy", proxy); bundle.putBundle("firewall", firewall); ===================================== mobile/android/geckoview/src/main/java/org/mozilla/geckoview/androidlegacysettings/TorLegacyAndroidSettings.java ===================================== @@ -24,9 +24,6 @@ public class TorLegacyAndroidSettings { // always true, tor is enabled in TB settings.enabled = true; - // firefox-android disconnected quick start a while ago so it's untracked - settings.quickstart = false; - settings.bridgesEnabled = Prefs.bridgesEnabled(); // tor-android-service CustomTorInstaller.java ===================================== toolkit/modules/TorAndroidIntegration.sys.mjs ===================================== @@ -41,12 +41,19 @@ const ListenedEvents = Object.freeze({ bootstrapBeginAuto: "GeckoView:Tor:BootstrapBeginAuto", bootstrapCancel: "GeckoView:Tor:BootstrapCancel", bootstrapGetState: "GeckoView:Tor:BootstrapGetState", + quickstartGet: "GeckoView:Tor:QuickstartGet", + quickstartSet: "GeckoView:Tor:QuickstartSet", }); class TorAndroidIntegrationImpl { #initialized = false; - async init() { + /** + * Register our listeners. + * We want this function to block GeckoView initialization, so it should not be + * async. Any async task should be moved to #deferredInit, instead. + */ + init() { if (this.#initialized) { logger.warn("Something tried to initilize us again."); return; @@ -74,6 +81,14 @@ class TorAndroidIntegrationImpl { // by TorProviderBuilder.init. lazy.TorProviderBuilder.firstWindowLoaded(); + this.#deferredInit(); + } + + /** + * Perform our init tasks that should not block the initialization of + * GeckoView. This function will not be awaited, so errors can only be logged. + */ + async #deferredInit() { try { await lazy.TorSettings.init(); await lazy.TorConnect.init(); @@ -82,24 +97,6 @@ class TorAndroidIntegrationImpl { } } - /** - * Combine the current TorSettings settings with the TorConnect settings. - * - * @returns {object} The TorSettings in an object, which also has a - * `quickstart.enabled` property. - */ - // This is added for backward compatibility with TorSettings.getSettings prior - // to tor-browser#41921, when it used to control the quickstart setting. - // TODO: Have android separate out the request for TorConnect.quickstart. In - // principle, this would allow android tor connect UI to be loaded before - // TorSettings has initialized (the SettingsReady signal), similar to desktop. - // See tor-browser#43408. - #getAllSettings() { - const settings = lazy.TorSettings.getSettings(); - settings.quickstart = { enabled: lazy.TorConnect.quickstart }; - return settings; - } - observe(subj, topic) { switch (topic) { // TODO: Replace with StageChange. @@ -142,7 +139,7 @@ class TorAndroidIntegrationImpl { case lazy.TorSettingsTopics.Ready: lazy.EventDispatcher.instance.sendRequest({ type: EmittedEvents.settingsReady, - settings: this.#getAllSettings(), + settings: lazy.TorSettings.getSettings(), }); break; case lazy.TorSettingsTopics.SettingsChanged: @@ -151,20 +148,7 @@ class TorAndroidIntegrationImpl { lazy.EventDispatcher.instance.sendRequest({ type: EmittedEvents.settingsChanged, changes: subj.wrappedJSObject.changes ?? [], - settings: this.#getAllSettings(), - }); - break; - case lazy.TorConnectTopics.QuickstartChange: - // We also include the TorSettings, and a `changes` Array similar to - // SettingsChanged signal. This is for backward compatibility with - // TorSettings.getSettings prior to tor-browser#41921, when it used to - // control the quickstart setting. - // TODO: Have android separate out the request for TorConnect.quickstart. - // See tor-browser#43408. - lazy.EventDispatcher.instance.sendRequest({ - type: EmittedEvents.settingsChanged, - changes: ["quickstart.enabled"], - settings: this.#getAllSettings(), + settings: lazy.TorSettings.getSettings(), }); break; } @@ -175,19 +159,9 @@ class TorAndroidIntegrationImpl { try { switch (event) { case ListenedEvents.settingsGet: - callback?.onSuccess(this.#getAllSettings()); + callback?.onSuccess(lazy.TorSettings.getSettings()); return; case ListenedEvents.settingsSet: - // TODO: Set quickstart via a separate event. See tor-browser#43408. - // NOTE: Currently this may trigger GeckoView:Tor:SettingsChanged - // twice: once for quickstart.enabled, and again for the other - // settings. - if ( - "quickstart" in data.settings && - "enabled" in data.settings.quickstart - ) { - lazy.TorConnect.quickstart = data.settings.quickstart.enabled; - } // TODO: Handle setting throw? This can throw if data.settings is // incorrectly formatted, but more like it can throw when the settings // fail to be passed onto the TorProvider. tor-browser#43405. @@ -211,6 +185,12 @@ class TorAndroidIntegrationImpl { return; // TODO: Expose TorConnect.startAgain() to allow users to begin // from the start again. + case ListenedEvents.quickstartGet: + callback?.onSuccess(lazy.TorConnect.quickstart); + return; + case ListenedEvents.quickstartSet: + lazy.TorConnect.quickstart = data.enabled; + break; } callback?.onSuccess(); } catch (e) { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/86b24f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/86b24f… You're receiving this email because of your account on gitlab.torproject.org.

1 0