- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser-build][main] Update rbm for rbm#40103
by boklm (＠boklm) 11 Feb '26

11 Feb '26

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 809f72b8 by Nicolas Vigier at 2026-02-11T18:30:50+01:00 Update rbm for rbm#40103 - - - - - 1 changed file: - rbm Changes: ===================================== rbm ===================================== @@ -1 +1 @@ -Subproject commit 4c881eb45291e323dcf4e4f1ae7eabed045ea8a3 +Subproject commit c88489ddb9c3749fe8bdfd0442a19a3bef346727 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/rbm][main] Bug 40103: Allow having multiple tmp_dir values
by boklm (＠boklm) 11 Feb '26

11 Feb '26

boklm pushed to branch main at The Tor Project / Applications / RBM Commits: c88489dd by Nicolas Vigier at 2026-02-11T12:44:50+01:00 Bug 40103: Allow having multiple tmp_dir values The `rbm_tmp_dir` function (and config option) is used to get a directory where temporary files can be stored. This directory is automatically removed when rbm exits, and its location is based on the `tmp_dir` config option. To return always the same directory and avoid creating a new one each time, a state variable is used, however that means that the value of the `tmp_dir` config option is ignored on following uses of `rbm_tmp_dir`. To fix that we change the state variable to be a hash variable, using `tmp_dir` as key. So that we create the temporary directory one time per value of `tmp_dir`. We are also adding a test to check the temporary directory from which we build is matching `tmp_dir` when we have two separate projects using a different value. The test was failing without the change and is now passing. - - - - - 5 changed files: - lib/RBM/DefaultConfig.pm - test.pl - + test/projects/tmpdir_t1/config - + test/projects/tmpdir_t2/config - + test/projects/tmpdir_t3/config Changes: ===================================== lib/RBM/DefaultConfig.pm ===================================== @@ -88,14 +88,14 @@ sub docker_version { sub rbm_tmp_dir { my ($project, $options) = @_; - CORE::state $rbm_tmp_dir; - return $rbm_tmp_dir->dirname if $rbm_tmp_dir; + CORE::state %rbm_tmp_dir; my $tmp_dir = RBM::project_config($project, 'tmp_dir', $options) || RBM::exit_error('No tmp_dir specified'); + return $rbm_tmp_dir{$tmp_dir}->dirname if $rbm_tmp_dir{$tmp_dir}; make_path($tmp_dir); - $rbm_tmp_dir = File::Temp->newdir(TEMPLATE => 'rbm-XXXXXX', + $rbm_tmp_dir{$tmp_dir} = File::Temp->newdir(TEMPLATE => 'rbm-XXXXXX', DIR => $tmp_dir); - return $rbm_tmp_dir->dirname; + return $rbm_tmp_dir{$tmp_dir}->dirname; } our %default_config = ( ===================================== test.pl ===================================== @@ -1,7 +1,7 @@ #!/usr/bin/perl -w use strict; use Path::Tiny; -use Test::More tests => 45; +use Test::More tests => 46; use lib 'lib/'; sub set_target { @@ -282,6 +282,15 @@ my @tests = ( target => [ 'wrong_sha512sum' ], fail_build => [ 'shasum', 'build' ], }, + { + name => 'setting different tmp_dir per project', + step => 'build', + target => [], + build => [ 'tmpdir_t1', 'build' ], + files => { + 'out/tmpdir_t1.txt' => "/var/tmp\n/tmp\n", + }, + }, ); foreach my $test (@tests) { ===================================== test/projects/tmpdir_t1/config ===================================== @@ -0,0 +1,11 @@ +filename: tmpdir_t1.txt +tmp_dir: /tmp +build: | + #!/bin/sh + set -e + cat tmpdir_t2.txt tmpdir_t3.txt > [% dest_dir %]/[% c('filename') %] +input_files: + - project: tmpdir_t2 + refresh_input: 1 + - project: tmpdir_t3 + refresh_input: 1 ===================================== test/projects/tmpdir_t2/config ===================================== @@ -0,0 +1,8 @@ +filename: tmpdir_t2.txt +tmp_dir: /var/tmp +build: | + #!/bin/sh + set -e + dir=$(dirname $(dirname $(pwd))) + test "$dir" = '[% c("tmp_dir") %]' + echo "$dir" > [% dest_dir %]/[% c('filename') %] ===================================== test/projects/tmpdir_t3/config ===================================== @@ -0,0 +1,8 @@ +filename: tmpdir_t3.txt +tmp_dir: /tmp +build: | + #!/bin/sh + set -e + dir=$(dirname $(dirname $(pwd))) + test "$dir" = '[% c("tmp_dir") %]' + echo "$dir" > [% dest_dir %]/[% c('filename') %] View it on GitLab: https://gitlab.torproject.org/tpo/applications/rbm/-/commit/c88489ddb9c3749… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/rbm/-/commit/c88489ddb9c3749… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41713: Triage: find components for bugs found from commits.
by Pier Angelo Vendrame (＠pierov) 11 Feb '26

11 Feb '26

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 3086604b by Pier Angelo Vendrame at 2026-02-11T15:50:54+00:00 Bug 41713: Triage: find components for bugs found from commits. In the Bugzilla triage script, run a second query for the bugs that were not found in the first query and instead have been found with git commits. - - - - - 2 changed files: - − tools/browser/generate-bugzilla-triage-csv - + tools/browser/generate-bugzilla-triage-csv.py Changes: ===================================== tools/browser/generate-bugzilla-triage-csv deleted ===================================== @@ -1,249 +0,0 @@ -#!/usr/bin/env bash - -# gitlab labels for review tickets -browser_label="Apps::Product::TorBrowser" -esr_label="esr-next" -priority_label="Priority::Medium" -impact_label="Apps::Impact::Unknown" -type_label="Apps::Type::Audit" - -# milestone for the next major Tor Browser release -milestone="Browser 16.0" - -# prints to stderr -function echoerr() { echo "$@" 1>&2; } - -script_dir=$(dirname "${BASH_ARGV0:-$0}") - -# help dialog -if [ "$#" -ne 2 ]; then - echoerr "Usage: $0 <ff-version> <gitlab-audit-issue>" - echoerr - echoerr "ff-version rapid-release Firefox version to audit" - echoerr "gitlab-audit-issue tor-browser GitLab issue number for this audit" - echoerr "" - echoerr "Example:" - echoerr "" - echoerr "$0 129 43303" - exit 1 -fi - -# exit on error -set -e - - -# Ensure various required tools are available -function check_exists() { - local cmd=$1 - if ! which ${cmd} > /dev/null ; then - echoerr "missing ${cmd} dependency" - exit 1 - fi -} - -check_exists git -check_exists jq -check_exists mktemp -check_exists perl -check_exists printf -check_exists sed -check_exists sort -check_exists touch -check_exists uniq -check_exists wget - -# Assign arguments to named variables -firefox_version=$1 -firefox_old_version=$((firefox_version - 1)) -audit_issue=$2 -git_begin="FIREFOX_NIGHTLY_${firefox_old_version}_END" -git_end="FIREFOX_NIGHTLY_${firefox_version}_END" - -# Check valid Firefox version -if ! [[ "${firefox_version}" =~ ^[1-9][0-9]{2}$ ]]; then - echoerr "invalid Firefox version (probably)" - exit 1 -fi - -# Check valid Gitlab issue number -if ! [[ "${audit_issue}" =~ ^[1-9][0-9]{4}$ ]]; then - echoerr "invalid gitlab audit issue number (probably)" - exit 1 -fi - -# -# Encoding/Decoding Functions -# - -# escape " and \ -function json_escape() { - local input="$1" - echo "${input}" | sed 's/["\]/\\"/g' -} - - -# un-escape \" -function jq_unescape() { - local input="$1" - echo "${input}" | sed 's/\\"/"/g' -} - -# change quotes to double-quotes -function csv_escape() { - local input="$1" - echo "${input}" | sed 's/"/""/g' -} - -# we need to urlencode the strings used in the new issue link -function url_encode() { - local input="$1" - echo "${input}" | perl -MURI::Escape -wlne 'print uri_escape $_' -} - - -# -# Create temp json files -# -git_json=$(mktemp -t git-audit-${firefox_version}-XXXXXXXXXXX.json) -bugzilla_json=$(mktemp -t bugzilla-audit-${firefox_version}-XXXXXXXXXXX.json) -union_json=$(mktemp -t union-audit-${firefox_version}-XXXXXXXXXXX.json) -touch "${git_json}" -touch "${bugzilla_json}" -touch "${union_json}" - -function json_cleanup { - rm -f "${git_json}" - rm -f "${bugzilla_json}" - rm -f "${union_json}" - popd > /dev/null -} -pushd "${script_dir}/torbrowser" > /dev/null -trap json_cleanup EXIT - -# -# Generate Git Commit Triage List -# - -# Try and extract bug id and summary from git log -# Mozilla's commits are not always 100% consistently named, so this -# regex is a bit flexible to handle various inputs such as: -# "Bug 1234 -", "Bug 1234:", "Bug Bug 1234 -", "[Bug 1234] -", " bug 1234 -". -sed_extract_id_summary="s/^[[ ]*[bug –-]+ ([1-9][0-9]*)[]:\., –-]*(.*)\$/\\1 \\2/pI" - -# Generate a json array of objects in the same format as bugzilla: {component: string, id: number, summary: string} -printf "[\n" >> "${git_json}" - -first_object=true -git log --format='%s' $git_begin..$git_end \ -| sed -En "${sed_extract_id_summary}" \ -| sort -h \ -| uniq \ -| while IFS= read -r line; do - read -r id summary <<< "${line}" - summary=$(json_escape "${summary}") - - # json does not allow trailing commas - if [[ "${first_object}" = true ]]; then - first_object=false - else - printf ",\n" >> "${git_json}" - fi - - product="Unknown" - # Bugs that include webcompat-reviewers and no other additional -reviewers - # from other teams are *likely* in the Web Compatibility component. But they - # won't show in the bugzilla query because the component doesn't tend to - # have any set milestones. - if [[ "${summary}" =~ r=.*webcompat-reviewers && ! "${summary}" =~ r=.*-reviewers.*-reviewers ]]; then - product="Web Compatibility" - fi - - printf " { \"product\": \"%s\", \"component\": \"Unknown\", \"id\": %s, \"summary\": \"%s\" }" "${product}" ${id} "${summary}" >> "${git_json}" -done -printf "\n]\n" >> "${git_json}" - -# -# Download Bugzilla Triage List -# - -# search for: -# + Product is NOT "Thunderbird,Calander,Chat Core,MailNews Core" (&f1=product&n1=1&o1=anyexact&v1=Thunderbird%2CCalendar%2CChat%20Core%2CMailNews%20Core). AND -# + Target Milestone contains "${firefox_version}" (e.g. 115 Branch or Firefox 115) (&f2=target_milestone&o2=substring&v2=${firefox_version}). -# "&limit=0" shows all matching bugs. - -query_tail="&f1=product&n1=1&o1=anyexact&v1=Thunderbird%2CCalendar%2CChat%20Core%2CMailNews%20Core&f2=target_milestone&o2=substring&v2=${firefox_version}&limit=0" - -bugzilla_query="https://bugzilla.mozilla.org/buglist.cgi?${query_tail}" -bugzilla_json_query="https://bugzilla.mozilla.org/rest/bug?include_fields=id,product,component,s…" - -wget "${bugzilla_json_query}" -O ${bugzilla_json} - -# -# Create Union of these two sets of issues -# - -# bugzilla array is actually on a root object: { bugs: [...] } -jq -s '[ (.[0].bugs)[], (.[1])[] ] | group_by(.id) | map(.[0])' "${bugzilla_json}" "${git_json}" > "${union_json}" - -# -# Generate Triage CSV -# - -echo "\"Review\",,\"Product :: Component\",\"Bugzilla Bug\"" - -jq '. | sort_by([.product, .component, .id])[] | "\(.id)|\(.product)|\(.component)|\(.summary)"' ${union_json} \ -| while IFS='|' read -r id product component summary; do - - # bugzilla info - id="${id:1}" - component="${component:0}" - summary="${summary:0:-1}" - summary=$(jq_unescape "${summary}") - # short summary for gitlab issue title - [[ ${#summary} -gt 80 ]] && summary_short="${summary:0:77}..." || summary_short="${summary}" - - # filter out some issue types that we never care about - skip_issue=false - - # skip `[wpt-sync] Sync PR` - if [[ "${summary}" =~ ^\[wpt-sync\]\ Sync\ PR.*$ ]]; then - skip_issue=true - # skip `Crash in [@` and variants - elif [[ "${summary}" =~ ^Crash[esin\ ]*\ \[\@.*$ ]]; then - skip_issue=true - # skip `Assertion failuire: ` - elif [[ "${summary}" =~ ^Assertion\ failure:\ .*$ ]]; then - skip_issue=true - # skip `Hit MOZ_CRASH` - elif [[ "${summary}" =~ ^Hit\ MOZ_CRASH.*$ ]]; then - skip_issue=true - fi - - if [[ "${skip_issue}" = true ]]; then - echoerr "Skipped Bugzilla ${id}: ${summary_short}" - else - csv_summary=$(csv_escape "${summary}") - csv_product_component=$(csv_escape "${product} :: ${component}") - - # parent issue - bugzilla_url="https://bugzilla.mozilla.org/show_bug.cgi?id=${id}" - # review issue title - new_issue_title=$(url_encode "Review Mozilla ${id}: ${summary_short}") - # review issue description + labeling (14.0 stable, FF128-esr, Next) - new_issue_description=$(url_encode "### Bugzilla: ${bugzilla_url}")%0A$(url_encode "/label ~\"${browser_label}\" ~\"${esr_label}\" ~\"${priority_label}\" ~\"${impact_label}\" ~\"${type_label}\"")%0A$(url_encode "/milestone %\"${milestone}\"")%0A$(url_encode "/relate tpo/applications/tor-browser#${audit_issue}")%0A%0A$(url_encode "")%0A - - # url which create's new issue with title and description pre-populated - new_issue_url="https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/new?iss…" - - # this link will start the creation of a new gitlab issue to review - create_issue=$(csv_escape "=HYPERLINK(\"${new_issue_url}\", \"New Issue\")") - bugzilla_link=$(csv_escape "=HYPERLINK(\"${bugzilla_url}\", \"Bugzilla ${id}: ${csv_summary}\")") - - echo "FALSE,\"${create_issue}\",\"${csv_product_component}\",\"${bugzilla_link}\"," - fi -done - -echo - -bugzilla_query="=HYPERLINK(\"${bugzilla_query}\", \"Bugzilla query\")" -echo \"$(csv_escape "${bugzilla_query}")\" ===================================== tools/browser/generate-bugzilla-triage-csv.py ===================================== @@ -0,0 +1,207 @@ +#!/usr/bin/env python3 +import argparse +import csv +import re +import sys +import urllib.parse +from pathlib import Path + +import requests +from git import Repo + + +GITLAB_LABELS = [ + "Apps::Product::TorBrowser", + "esr-next", + "Priority::Medium", + "Apps::Impact::Unknown", + "Apps::Type::Audit", +] +GITLAB_MILESTONE = "Browser 16.0" + + +def download_bugs(url): + url += "&" if "?" in url else "?" + url += "include_fields=id,product,component,summary" + r = requests.get(url) + r.raise_for_status() + # {"bugs": [ {...}, ... ]} + bugs = r.json().get("bugs", []) + results = {} + for bug in bugs: + product = bug.get("product", "") + component = bug.get("component", "") + results[bug.get("id")] = { + "id": bug.get("id"), + "component": f"{product} :: {component}", + "summary": bug.get("summary", ""), + } + return results + + +def extract_from_git(repo_path, ff_version, bugs): + subj_regex = re.compile( + r"^[\s*[bug –-]+\s*([1-9][0-9]*)[\]:\., –-]*(.*)", re.VERBOSE + ) + # Keep these lowercase + skip = ["no bug", "merge ", "revert "] + + repo = Repo(repo_path) + seen_ids = set() + results = {} + for commit in repo.iter_commits( + f"FIREFOX_NIGHTLY_{ff_version - 1}_END..FIREFOX_NIGHTLY_{ff_version}_END", + reverse=True, + ): + subject = commit.message.splitlines()[0] + subj_low = subject.lower() + m = subj_regex.search(subj_low) + if not m: + if not any(subj_low.startswith(p) for p in skip): + print(f"Could not match {subject}", file=sys.stderr) + continue + bug_id = int(m.group(1)) + if bug_id in bugs or bug_id in seen_ids: + continue + seen_ids.add(bug_id) + summary = m.group(2).strip() + results[bug_id] = { + "id": bug_id, + "component": "(git commit)", + "summary": summary, + } + + # Notice that seen_ids contains only the bugs we have seen in the + # commit range but we did not find earlier. + # So, we expect this number to be quite low and that it will be + # possible to fetch all these bugs in a single pass. + if seen_ids: + url = "https://bugzilla.mozilla.org/rest/bug?id=" + url += ",".join([str(i) for i in seen_ids]) + results.update(download_bugs(url)) + bugs.update(results) + + +def make_hyperlink(url, label): + label = label.replace('"', '""') + return f'=HYPERLINK("{url}", "{label}")' + + +def url_encode(s): + return urllib.parse.quote(s) + + +def generate_csv(bugs, audit_issue, query, output_path): + bugs = sorted(bugs.values(), key=lambda x: (x["component"], x["id"])) + + with output_path.open("w") as f: + writer = csv.writer(f, quoting=csv.QUOTE_ALL) + writer.writerow(["Review", "", "Bugzilla Component", "Bugzilla Bug"]) + + # Keep these lowercase! + skip = [ + "[wpt-sync] sync pr", + "assertion failure: ", + "crash in ", + "crash [@", + "hit moz_crash", + "update android nightly application-services", + "update web-platform-tests", + ] + for bug in bugs: + bug_id = bug["id"] + component = bug["component"] + summary = bug["summary"] + summary_lower = summary.lower() + short = (summary[:77] + "...") if len(summary) > 80 else summary + + if any(summary_lower.startswith(p) for p in skip): + print(f"Skipped Bugzilla {bug_id}: {summary}", file=sys.stderr) + continue + + bugzilla_url = ( + f"https://bugzilla.mozilla.org/show_bug.cgi?id={bug_id}" + ) + new_title = url_encode(f"Review Mozilla {bug_id}: {short}") + new_desc = ( + url_encode(f"### Bugzilla: {bugzilla_url}") + + "%0A" + + url_encode("/label ~" + (" ~".join(GITLAB_LABELS))) + + "%0A" + + url_encode(f'/milestone %"{GITLAB_MILESTONE}"') + + "%0A" + + url_encode( + f"/relate tpo/applications/tor-browser#{audit_issue}" + ) + + "%0A%0A" + + url_encode( + "" + ) + ) + new_issue_url = f"https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/new?iss…" + + create_link = make_hyperlink(new_issue_url, "New Issue") + bugzilla_link = make_hyperlink( + bugzilla_url, f"Bugzilla {bug_id}: {summary}" + ) + writer.writerow(["FALSE", create_link, component, bugzilla_link]) + + writer.writerow([]) + writer.writerow([make_hyperlink(query, "Bugzilla query")]) + + +def main(): + parser = argparse.ArgumentParser( + description="Create a triage CSV for a Firefox version." + ) + parser.add_argument( + "-r", + "--repo-path", + help="Path to a tor-browser.git clone", + type=Path, + default=Path(__file__).parent / "torbrowser", + ) + parser.add_argument( + "-o", + "--output-file", + help="Path to the output file", + type=Path, + ) + parser.add_argument( + "ff_version", + help="Firefox rapid-release version (e.g. 150)", + type=int, + ) + parser.add_argument( + "gitlab_audit_issue", + help="Tor-Browser-Spec GitLab issue number", + type=int, + ) + known_args, remaining = parser.parse_known_args() + parser.set_defaults( + output_file=Path(f"triage-{known_args.ff_version}.csv") + ) + args = parser.parse_args() + + if args.ff_version < 140: + print("Wrong Firefox version (probably)!", file=sys.stderr) + sys.exit(1) + if args.gitlab_audit_issue < 40000: + print("Wrong GitLab issue number (probably)!", file=sys.stderr) + sys.exit(1) + + excluded_products = "Thunderbird,Calendar,Chat%20Core,MailNews%20Core" + query = f"https://bugzilla.mozilla.org/rest/bug?f1=product&n1=1&o1=anyexact&v1={exclu…" + bugs = download_bugs(query) + extract_from_git(args.repo_path, args.ff_version, bugs) + + generate_csv( + bugs, + args.gitlab_audit_issue, + query, + args.output_file, + ) + + +if __name__ == "__main__": + main() View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/3… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/3… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-147.0a1-16.0-2] fixup! TB 40933: Add tor-launcher functionality
by Pier Angelo Vendrame (＠pierov) 11 Feb '26

11 Feb '26

Pier Angelo Vendrame pushed to branch tor-browser-147.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: 14497cc9 by Pier Angelo Vendrame at 2026-02-11T15:30:20+01:00 fixup! TB 40933: Add tor-launcher functionality TB 44619: Add more tor logs to the UI. Usually, we show in the UI only the logs we received from the tor daemon. However, for troubleshooting, it makes sense to display more errors, e.g., about failure to start a tor process, or to connect to the control port. We already had those in the browser console, however it is not trivial to get them, especially on Android. TB 43403&43560: Add "UTC" to the log timestamp. - - - - - 4 changed files: - toolkit/components/tor-launcher/TorLauncherUtil.sys.mjs - toolkit/components/tor-launcher/TorProcess.sys.mjs - toolkit/components/tor-launcher/TorProcessAndroid.sys.mjs - toolkit/components/tor-launcher/TorProvider.sys.mjs Changes: ===================================== toolkit/components/tor-launcher/TorLauncherUtil.sys.mjs ===================================== @@ -11,6 +11,7 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { FileUtils: "resource://gre/modules/FileUtils.sys.mjs", + TorProviderTopics: "resource://gre/modules/TorProviderBuilder.sys.mjs", }); const kPropBundleURI = "chrome://torbutton/locale/torlauncher.properties"; @@ -699,4 +700,27 @@ export const TorLauncherUtil = { console.warn("Could not remove the IPC directory", e); } }, + + /** + * Broadcast a tor log message. This message will be visible to the user. + * + * NOTE: Users are likely to copy and paste their tor log to forums, etc. + * Therefore, the messages should avoid containing any information that might + * identify information about the user. + * + * @param {string} type The log type (ERR, WARN, etc...) + * @param {string} msg The log message + */ + log(type, msg) { + const timestamp = + new Date().toISOString().replace("T", " ").replace("Z", "") + " UTC"; + Services.obs.notifyObservers( + { type, msg, timestamp }, + lazy.TorProviderTopics.TorLog + ); + if (type === "WARN" || type === "ERR") { + // Notify so that Copy Log can be enabled. + Services.obs.notifyObservers(null, lazy.TorProviderTopics.HasWarnOrErr); + } + }, }; ===================================== toolkit/components/tor-launcher/TorProcess.sys.mjs ===================================== @@ -141,9 +141,18 @@ export class TorProcess { this.#status = TorProcessStatus.Exited; this.#subprocess = null; logger.error("startTor error:", e); + lazy.TorLauncherUtil.log( + "PARENT-ERR", + "Failed to start a tor process (more information in the browser console)." + ); throw e; } + lazy.TorLauncherUtil.log( + "PARENT-INFO", + `New tor process started with pid ${this.#subprocess.pid}.` + ); + // Do not await the following functions, as they will return only when the // process exits. this.#dumpStdout(); @@ -189,8 +198,15 @@ export class TorProcess { const { exitCode } = await watched.wait(); processExitCode = exitCode; + lazy.TorLauncherUtil.log( + exitCode !== 0 ? "PARENT-WARN" : "PARENT-INFO", + `The tor process with pid ${this.#subprocess.pid} exited with code ${exitCode}.` + ); + if (watched !== this.#subprocess) { - logger.debug(`A Tor process exited with code ${exitCode}.`); + logger.debug( + `The tor process ${watched.pid} exited with code ${exitCode}.` + ); } else if (exitCode) { logger.warn(`The watched Tor process exited with code ${exitCode}.`); } else { ===================================== toolkit/components/tor-launcher/TorProcessAndroid.sys.mjs ===================================== @@ -6,6 +6,7 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { EventDispatcher: "resource://gre/modules/Messaging.sys.mjs", + TorLauncherUtil: "resource://gre/modules/TorLauncherUtil.sys.mjs", }); const logger = console.createInstance({ @@ -107,6 +108,27 @@ export class TorProcessAndroid { } onEvent(event, data, _callback) { + switch (event) { + case TorIncomingEvents.started: + lazy.TorLauncherUtil.log( + "PARENT-INFO", + `New tor process with handle ${data.handle} started.` + ); + break; + case TorIncomingEvents.startFailed: + lazy.TorLauncherUtil.log( + "PARENT-ERR", + `Failed to start a tor process: ${data.error}` + ); + break; + case TorIncomingEvents.exited: + lazy.TorLauncherUtil.log( + data.status !== 0 ? "PARENT-WARN" : "PARENT-INFO", + `The tor process with handle ${data.handle} exited with status ${data.status}.` + ); + break; + } + if (data?.handle !== this.#processHandle) { logger.debug(`Ignoring event ${event} with another handle`, data); return; ===================================== toolkit/components/tor-launcher/TorProvider.sys.mjs ===================================== @@ -207,8 +207,15 @@ export class TorProvider { await this.#firstConnection(); } catch (e) { logger.error("Cannot connect to the control port", e); + // Log this also to the UI, as getting console logs from Android + // makes troubleshooting more difficult and involved. + TorLauncherUtil.log( + "PARENT-ERR", + `Connection to the control port failed: ${e.message}.` + ); throw e; } + TorLauncherUtil.log("PARENT-INFO", "Connected to the control port.", false); if (this.ownsTorDaemon) { try { @@ -1021,21 +1028,7 @@ export class TorProvider { * @param {string} msg The message */ onLogMessage(type, msg) { - if (type === "WARN" || type === "ERR") { - // Notify so that Copy Log can be enabled. - Services.obs.notifyObservers(null, TorProviderTopics.HasWarnOrErr); - } - - const timestamp = new Date() - .toISOString() - .replace("T", " ") - .replace("Z", ""); - - Services.obs.notifyObservers( - { type, msg, timestamp }, - TorProviderTopics.TorLog - ); - + TorLauncherUtil.log(type, msg); switch (type) { case "ERR": logger.error(`[Tor error] ${msg}`); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/14497cc… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/14497cc… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-15.0] Add missing paragraph separator in MB Alpha relprep gitlab issue template.
by ma1 (＠ma1) 10 Feb '26

10 Feb '26

ma1 pushed to branch maint-15.0 at The Tor Project / Applications / tor-browser-build Commits: 523cb251 by hackademix at 2026-02-11T07:36:27+01:00 Add missing paragraph separator in MB Alpha relprep gitlab issue template. - - - - - 1 changed file: - .gitlab/issue_templates/Release Prep - Mullvad Browser Alpha.md Changes: ===================================== .gitlab/issue_templates/Release Prep - Mullvad Browser Alpha.md ===================================== @@ -183,6 +183,7 @@ This step will send the relevant branches, tags (including a tag named after the <details> <summary>Communications</summary> ### packagers + - [ ] **(Optional, Once Packages are pushed to GitHub)** - **NOTE**: This is an optional step and only necessary close a major release/transition from alpha to stable, or if there are major packing changes these developers need to be aware of - **Recipients** 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] Add missing paragraph separator in MB Alpha relprep gitlab issue template.
by ma1 (＠ma1) 10 Feb '26

10 Feb '26

ma1 pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: a7cfc529 by hackademix at 2026-02-11T07:35:19+01:00 Add missing paragraph separator in MB Alpha relprep gitlab issue template. - - - - - 1 changed file: - .gitlab/issue_templates/050 Release Prep - Mullvad Browser Alpha.md Changes: ===================================== .gitlab/issue_templates/050 Release Prep - Mullvad Browser Alpha.md ===================================== @@ -183,6 +183,7 @@ This step will send the relevant branches, tags (including a tag named after the <details> <summary>Communications</summary> ### packagers + - [ ] **(Optional, Once Packages are pushed to GitHub)** - **NOTE**: This is an optional step and only necessary close a major release/transition from alpha to stable, or if there are major packing changes these developers need to be aware of - **Recipients** 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-147.0a1-16.0-2] 2 commits: fixup! TB 43349 [android]: Add feedback for successful bootstrap
by henry (＠henry) 10 Feb '26

10 Feb '26

henry pushed to branch tor-browser-147.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: 85f7b779 by Henry Wilkes at 2026-02-10T18:50:31+00:00 fixup! TB 43349 [android]: Add feedback for successful bootstrap TB 43349: Revert the string changes from 371573fc6ff4340cf09a330b4ed1cd688cf4337e since this was the wrong fixup target. - - - - - db82b350 by Henry Wilkes at 2026-02-10T18:50:31+00:00 fixup! [android] TBA strings TB 43349: String for the toast notification. - - - - - 1 changed file: - mobile/android/fenix/app/src/main/res/values/torbrowser_strings.xml Changes: ===================================== mobile/android/fenix/app/src/main/res/values/torbrowser_strings.xml ===================================== @@ -124,7 +124,7 @@ <string name="connection_assist_connect_to_tor_before_opening_links_confirmation">CONNECT</string>  <string name="connection_assist_back_button_content_description_start_again">Start again</string> -  +  <string name="connection_assist_bootstrap_succeeded_toast_message">Connected to Tor</string>  View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/7d6331… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/7d6331… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41721: Reduce mingw-webrtc patch
by Pier Angelo Vendrame (＠pierov) 10 Feb '26

10 Feb '26

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 74a8d009 by june wilde at 2026-02-10T17:21:05+01:00 Bug 41721: Reduce mingw-webrtc patch - - - - - 1 changed file: - projects/mingw-w64-clang/mingw-webrtc.patch Changes: ===================================== projects/mingw-w64-clang/mingw-webrtc.patch ===================================== @@ -184,33 +184,12 @@ index 000000000..51e2845ea + HRESULT GetInterface([in] REFIID iid, [out, iid_is(iid)] void **object); + }; +} -diff --git a/mingw-w64-headers/include/wrl/client.h b/mingw-w64-headers/include/wrl/client.h -index 07cedbe4e..4adf5772c 100644 ---- a/mingw-w64-headers/include/wrl/client.h -+++ b/mingw-w64-headers/include/wrl/client.h -@@ -9,12 +9,15 @@ - - #include <cstddef> - #include <unknwn.h> --/* #include <weakreference.h> */ -+#include <weakreference.h> - #include <roapi.h> - - /* #include <wrl/def.h> */ - #include <wrl/internal.h> - -+#define WrlFinal final -+#define WrlSealed sealed -+ - namespace Microsoft { - namespace WRL { - namespace Details { diff --git a/mingw-w64-headers/include/wrl/event.h b/mingw-w64-headers/include/wrl/event.h new file mode 100644 -index 000000000..2e883e241 +index 000000000..f3ad2826c --- /dev/null +++ b/mingw-w64-headers/include/wrl/event.h -@@ -0,0 +1,368 @@ +@@ -0,0 +1,52 @@ +#ifndef _WRL_EVENT_H_ +#define _WRL_EVENT_H_ + @@ -226,183 +205,9 @@ index 000000000..2e883e241 + +namespace Microsoft { + namespace WRL { -+ enum DelegateCheckMode { -+ NoCheck = 1 -+ }; -+ -+ template<DelegateCheckMode delegateCheckMode> struct DelegateTraits; -+ -+ template<> struct DelegateTraits<NoCheck> { -+ static HRESULT CheckReturn(HRESULT hr) { -+ return 0; -+ } -+ }; -+ -+ extern __declspec(selectany) const DelegateCheckMode DefaultDelegateCheckMode = NoCheck; -+ -+ enum InvokeMode { -+ StopOnFirstError = 1, -+ FireAll = 2, -+ }; -+ -+ template<InvokeMode invokeModeValue> struct InvokeModeOptions { -+ static const InvokeMode invokeMode = invokeModeValue; -+ }; -+ -+ template<InvokeMode invokeMode> struct InvokeTraits; -+ -+ template<typename TDelegateInterface, typename EventSourceOptions> -+ class EventSource; -+ + namespace Details { + template<typename TDelegateInterface> -+ void* GetDelegateBucketAssist(TDelegateInterface *pDelegate) { -+ return nullptr; -+ } -+ -+ template<typename TMemberFunction> struct ArgTraits { -+ static const int args = -1; -+ }; -+ -+ template<typename TDelegateInterface> -+ struct ArgTraits<HRESULT(STDMETHODCALLTYPE TDelegateInterface::*)(void)> { -+ static const int args = 0; -+ }; -+ -+ template<typename TDelegateInterface, typename TArg1> -+ struct ArgTraits<HRESULT(STDMETHODCALLTYPE TDelegateInterface::*)(TArg1)> { -+ static const int args = 1; -+ typedef TArg1 Arg1Type; -+ }; -+ -+ template<typename TDelegateInterface, typename TArg1, typename TArg2> -+ struct ArgTraits<HRESULT(STDMETHODCALLTYPE TDelegateInterface::*)(TArg1, TArg2)> -+ { -+ static const int args = 2; -+ typedef TArg1 Arg1Type; -+ typedef TArg2 Arg2Type; -+ }; -+ -+ template<typename TDelegateInterface, typename TArg1, typename TArg2, typename TArg3> -+ struct ArgTraits<HRESULT(STDMETHODCALLTYPE TDelegateInterface::*)(TArg1, TArg2, TArg3)> -+ { -+ static const int args = 3; -+ typedef TArg1 Arg1Type; -+ typedef TArg2 Arg2Type; -+ typedef TArg3 Arg3Type; -+ }; -+ -+ template<typename TDelegateInterface, typename TArg1, typename TArg2, typename TArg3, typename TArg4> -+ struct ArgTraits<HRESULT(STDMETHODCALLTYPE TDelegateInterface::*)(TArg1, TArg2, TArg3, TArg4)> -+ { -+ static const int args = 4; -+ typedef TArg1 Arg1Type; -+ typedef TArg2 Arg2Type; -+ typedef TArg3 Arg3Type; -+ typedef TArg4 Arg4Type; -+ }; -+ -+ template<typename TDelegateInterface, typename TArg1, typename TArg2, typename TArg3, typename TArg4, typename TArg5> -+ struct ArgTraits<HRESULT(STDMETHODCALLTYPE TDelegateInterface::*)(TArg1, TArg2, TArg3, TArg4, TArg5)> -+ { -+ static const int args = 5; -+ typedef TArg1 Arg1Type; -+ typedef TArg2 Arg2Type; -+ typedef TArg3 Arg3Type; -+ typedef TArg4 Arg4Type; -+ typedef TArg5 Arg5Type; -+ }; -+ -+ template<typename TDelegateInterface, typename TArg1, typename TArg2, typename TArg3, typename TArg4, typename TArg5, typename TArg6> -+ struct ArgTraits<HRESULT(STDMETHODCALLTYPE TDelegateInterface::*)(TArg1, TArg2, TArg3, TArg4, TArg5, TArg6)> -+ { -+ static const int args = 6; -+ typedef TArg1 Arg1Type; -+ typedef TArg2 Arg2Type; -+ typedef TArg3 Arg3Type; -+ typedef TArg4 Arg4Type; -+ typedef TArg5 Arg5Type; -+ typedef TArg6 Arg6Type; -+ }; -+ -+ template<typename TDelegateInterface, typename TArg1, typename TArg2, typename TArg3, typename TArg4, typename TArg5, typename TArg6, typename TArg7> -+ struct ArgTraits<HRESULT(STDMETHODCALLTYPE TDelegateInterface::*)(TArg1, TArg2, TArg3, TArg4, TArg5, TArg6, TArg7)> -+ { -+ static const int args = 7; -+ typedef TArg1 Arg1Type; -+ typedef TArg2 Arg2Type; -+ typedef TArg3 Arg3Type; -+ typedef TArg4 Arg4Type; -+ typedef TArg5 Arg5Type; -+ typedef TArg6 Arg6Type; -+ typedef TArg7 Arg7Type; -+ }; -+ -+ template<typename TDelegateInterface, typename TArg1, typename TArg2, typename TArg3, typename TArg4, typename TArg5, typename TArg6, typename TArg7, typename TArg8> -+ struct ArgTraits<HRESULT(STDMETHODCALLTYPE TDelegateInterface::*)(TArg1, TArg2, TArg3, TArg4, TArg5, TArg6, TArg7, TArg8)> -+ { -+ static const int args = 8; -+ typedef TArg1 Arg1Type; -+ typedef TArg2 Arg2Type; -+ typedef TArg3 Arg3Type; -+ typedef TArg4 Arg4Type; -+ typedef TArg5 Arg5Type; -+ typedef TArg6 Arg6Type; -+ typedef TArg7 Arg7Type; -+ typedef TArg8 Arg8Type; -+ }; -+ -+ template<typename TDelegateInterface, typename TArg1, typename TArg2, typename TArg3, typename TArg4, typename TArg5, typename TArg6, typename TArg7, typename TArg8, typename TArg9> -+ struct ArgTraits<HRESULT(STDMETHODCALLTYPE TDelegateInterface::*)(TArg1, TArg2, TArg3, TArg4, TArg5, TArg6, TArg7, TArg8, TArg9)> -+ { -+ static const int args = 9; -+ typedef TArg1 Arg1Type; -+ typedef TArg2 Arg2Type; -+ typedef TArg3 Arg3Type; -+ typedef TArg4 Arg4Type; -+ typedef TArg5 Arg5Type; -+ typedef TArg6 Arg6Type; -+ typedef TArg7 Arg7Type; -+ typedef TArg8 Arg8Type; -+ typedef TArg9 Arg9Type; -+ }; -+ -+ template<typename TDelegateInterface, bool isImplements = __is_base_of(ImplementsBase, TDelegateInterface)> -+ struct ArgTraitsHelper; -+ -+ template<typename TDelegateInterface> -+ struct ArgTraitsHelper<TDelegateInterface, false> -+ { -+ typedef decltype(&TDelegateInterface::Invoke) methodType; -+ typedef ArgTraits<methodType> Traits; -+ static const int args = Traits::args; -+ typedef TDelegateInterface Interface; -+ }; -+ -+ template<typename TDelegateInterface> -+ struct ArgTraitsHelper<TDelegateInterface, true> {}; -+ -+ template<typename TDelegateInterface> class DelegateArgTraits {}; -+ -+ template<typename TDelegateInterface, typename ...TArgs> -+ class DelegateArgTraits<HRESULT (STDMETHODCALLTYPE TDelegateInterface::*)(TArgs...)> -+ { -+ template<typename TCallback, DelegateCheckMode checkMode> -+ struct DelegateInvokeHelper WrlSealed : public ::Microsoft::WRL::RuntimeClass<RuntimeClassFlags<Delegate>, TDelegateInterface>, RemoveReference<TCallback>::Type { -+ DelegateInvokeHelper(TCallback&& callback) noexcept {} -+ -+ HRESULT STDMETHODCALLTYPE Invoke(TArgs... args) noexcept override { -+ return 0; -+ } -+ }; -+ -+ public: -+ template<typename TImplements, DelegateCheckMode checkMode = DefaultDelegateCheckMode, typename TLambda> -+ static ComPtr<TImplements> Callback(TLambda&& callback) noexcept { -+ ComPtr<TImplements> empty; -+ return empty; -+ } -+ }; ++ class DelegateArgTraits {}; + + template<typename TDelegateInterface, bool isImplements = __is_base_of(ImplementsBase, TDelegateInterface)> + struct DelegateArgTraitsHelper; @@ -415,11 +220,6 @@ index 000000000..2e883e241 + + template<typename TDelegateInterface> + struct DelegateArgTraitsHelper<TDelegateInterface, true> {}; -+ -+ template<typename TDelegateInterface> -+ HRESULT CreateAgileHelper(TDelegateInterface* delegateInterface, TDelegateInterface** wrapper) { -+ return 0; -+ } + } + + template<typename TDelegateInterface, typename TLambda> @@ -436,143 +236,6 @@ index 000000000..2e883e241 + ComPtr<typename Details::DelegateArgTraitsHelper<TDelegateInterface>::Interface> Callback(TCallbackObject *object, HRESULT(TCallbackObject::* method)(TArgs...)) noexcept { + return 0; + } -+ -+ template<typename TDelegateInterface> -+ HRESULT WeakReferenceCallback(IWeakReferenceSource* innerCallback, TDelegateInterface** callback) { -+ return 0; -+ } -+ -+ template<typename TDelegateInterface> -+ HRESULT WeakReferenceCallback(TDelegateInterface* innerCallback, TDelegateInterface** callback) { -+ return 0; -+ } -+ -+ template<typename T, typename TDelegateInterface, typename ...TArgs> -+ HRESULT WeakReferenceCallback(T* targetObject, HRESULT (T::*targetMethod)(TArgs... args), TDelegateInterface** callback) { -+ return 0; -+ } -+ -+ template<typename T, typename TDelegateInterface, typename ...TArgs> -+ HRESULT WeakReferenceCallback(T* targetObject, HRESULT(T::*targetMethod)(TArgs... args), ::Microsoft::WRL::Details::ComPtrRef< ::Microsoft::WRL::ComPtr<TDelegateInterface>> callback) { -+ return 0; -+ } -+ -+ namespace Details { -+ -+ class EventTargetArray WrlSealed : public ::Microsoft::WRL::RuntimeClass< ::Microsoft::WRL::RuntimeClassFlags<ClassicCom>, IUnknown > { -+ public: -+ EventTargetArray() noexcept {} -+ -+ HRESULT RuntimeClassInitialize(size_t items) noexcept { -+ return 0; -+ } -+ -+ ~EventTargetArray() noexcept -+ { -+ delete[] begin_; -+ delete[] bucketAssists_; -+ } -+ -+ ComPtr<IUnknown>* Begin() noexcept { -+ return nullptr; -+ } -+ -+ ComPtr<IUnknown>* End() noexcept { -+ return nullptr; -+ } -+ -+ void AddTail(IUnknown* element) noexcept { -+ } -+ -+ void AddTail(IUnknown* element, void *bucketAssist) noexcept { -+ } -+ -+ size_t Length() noexcept { -+ return 0; -+ } -+ -+ void **Begin_BucketAssists() { -+ return nullptr; -+ } -+ -+ void **End_BucketAssists() { -+ return nullptr; -+ } -+ -+ private: -+ ComPtr<IUnknown>* begin_; -+ -+ ComPtr<IUnknown>* end_; -+ -+ void **bucketAssists_; -+ }; -+ } -+ -+ template<> -+ struct InvokeTraits<FireAll> -+ { -+ template<typename TInvokeMethod, typename TDelegateInterface> -+ static HRESULT InvokeDelegates(TInvokeMethod invokeOne, Details::EventTargetArray *targetArray, EventSource<TDelegateInterface, InvokeModeOptions<FireAll>>* pEvent) { -+ return 0; -+ } -+ }; -+ -+ template<> -+ struct InvokeTraits<StopOnFirstError> -+ { -+ template<typename TInvokeMethod, typename TDelegateInterface> -+ static HRESULT InvokeDelegates(TInvokeMethod invokeOne, Details::EventTargetArray *targetArray, EventSource<TDelegateInterface, InvokeModeOptions<StopOnFirstError>>* pEvent) { -+ return 0; -+ } -+ }; -+ -+ template<typename TDelegateInterface, typename TEventSourceOptions> -+ class EventSource { -+ public: -+ EventSource() noexcept {} -+ -+ HRESULT Add(TDelegateInterface* delegateInterface, EventRegistrationToken* token) noexcept { -+ return 0; -+ } -+ -+ HRESULT Remove(EventRegistrationToken token) noexcept { -+ return 0; -+ } -+ -+ protected: -+ -+ HRESULT Add(TDelegateInterface* delegateInterface, void *bucketAssist, EventRegistrationToken* token) noexcept { -+ return 0; -+ } -+ -+ private: -+ -+ HRESULT AddInternal(TDelegateInterface* delegateInterface, void *bucketAssist, EventRegistrationToken* token) noexcept { -+ return 0; -+ } -+ -+ template <typename TInvokeMethod> -+ HRESULT DoInvoke(TInvokeMethod invokeOne) noexcept { -+ return 0; -+ } -+ -+ public: -+ template<typename ...TArgs> -+ HRESULT InvokeAll(TArgs... args) noexcept { -+ return 0; -+ } -+ -+ size_t GetSize() const noexcept { -+ return 0; -+ } -+ -+ protected: -+ ComPtr<Details::EventTargetArray> targets_; -+ -+ mutable Wrappers::SRWLock targetsPointerLock_; -+ -+ Wrappers::SRWLock addRemoveLock_; -+ }; + } +} + @@ -581,10 +244,10 @@ index 000000000..2e883e241 +#endif diff --git a/mingw-w64-headers/include/wrl/implements.h b/mingw-w64-headers/include/wrl/implements.h new file mode 100644 -index 000000000..c8261e55a +index 000000000..b6ef5cdd1 --- /dev/null +++ b/mingw-w64-headers/include/wrl/implements.h -@@ -0,0 +1,627 @@ +@@ -0,0 +1,394 @@ +#ifndef _WRL_IMPLEMENTS_H_ +#define _WRL_IMPLEMENTS_H_ + @@ -625,10 +288,7 @@ index 000000000..c8261e55a + template <typename FactoryInterface> + class ComposableBase {}; + -+ typedef RuntimeClassFlags<WinRt | InhibitWeakReference> InhibitWeakReferencePolicy; -+ + namespace Details { -+ + class Nil {}; + + template <typename T, typename ...TArgs> @@ -648,10 +308,8 @@ index 000000000..c8261e55a + } + }; + -+ class RuntimeClassBase {}; -+ + template <unsigned int RuntimeClassTypeT> -+ class RuntimeClassBaseT : private RuntimeClassBase { ++ class RuntimeClassBaseT { + protected: + template<typename T> + static HRESULT AsIID(T* implements, REFIID riid, void **ppvObject) throw() { @@ -668,18 +326,6 @@ index 000000000..c8261e55a + return 0; + } + }; -+ -+ class FtmBaseMarker {}; -+ -+ template <typename I, typename Base> -+ struct VerifyInheritanceHelper { -+ static void Verify() throw() {} -+ }; -+ -+ template <typename I> -+ struct VerifyInheritanceHelper<I, Nil> { -+ static void Verify() throw() {} -+ }; + } + + template <typename I0, typename I1, typename I2 = Details::Nil, typename I3 = Details::Nil, @@ -882,21 +528,6 @@ index 000000000..c8261e55a + void FillArrayWithIid(unsigned long *index, IID* iids) throw() {} + }; + -+ template <typename I0, typename ...> -+ struct AreAllNil { -+ static const bool value = false; -+ }; -+ -+ template <typename ...TInterfaces> -+ struct AreAllNil<Microsoft::WRL::Details::Nil, TInterfaces...> { -+ static const bool value = AreAllNil<TInterfaces...>::value; -+ }; -+ -+ template <> -+ struct AreAllNil<Microsoft::WRL::Details::Nil> { -+ static const bool value = true; -+ }; -+ + template <typename RuntimeClassFlagsT, typename FactoryInterface, bool doStrictCheck, typename ...TInterfaces> + struct __declspec(novtable) ImplementsHelper<RuntimeClassFlagsT, doStrictCheck, ComposableBase<FactoryInterface>, TInterfaces...> : ImplementsHelper<RuntimeClassFlagsT, true, ComposableBase<FactoryInterface>> { + protected: @@ -918,206 +549,12 @@ index 000000000..c8261e55a + + void FillArrayWithIid(unsigned long *index, IID* iids) throw() {} + }; -+ -+ template <typename RuntimeClassFlagsT, typename FactoryInterface, bool doStrictCheck> -+ struct __declspec(novtable) ImplementsHelper<RuntimeClassFlagsT, doStrictCheck, ComposableBase<FactoryInterface>> { -+ protected: -+ template <unsigned int RuntimeClassTypeT> friend class Details::RuntimeClassBaseT; -+ -+ HRESULT CanCastTo(REFIID riid, void **ppv, bool *pRefDelegated) throw() { -+ return 0; -+ } -+ -+ IUnknown* CastToUnknown() throw() { -+ return nullptr; -+ } -+ -+ unsigned long GetIidCount() throw() { -+ return 0; -+ } -+ -+ void FillArrayWithIid(unsigned long *index, IID* iids) throw() {} -+ -+ ImplementsHelper() throw() {} -+ -+ ~ImplementsHelper() throw() {} -+ -+ public: -+ HRESULT SetComposableBasePointers(IInspectable* base, FactoryInterface* baseFactory) throw() { -+ return 0; -+ } -+ -+ ComPtr<IInspectable> GetComposableBase() throw() { -+ return composableBase_; -+ } -+ -+ ComPtr<FactoryInterface> GetComposableBaseFactory() throw() { -+ return composableBaseFactory_; -+ } -+ -+ private: -+ ComPtr<IInspectable> composableBase_; -+ -+ ComPtr<FactoryInterface> composableBaseFactory_; -+ -+ IID *iidsCached_; -+ -+ unsigned long iidCount_; -+ }; -+ + } + -+ template <typename I0, typename ...TInterfaces> -+ struct __declspec(novtable) Implements : Details::ImplementsHelper<RuntimeClassFlags<WinRt>, true, I0, TInterfaces...>, Details::ImplementsBase { -+ public: -+ typedef RuntimeClassFlags<WinRt> ClassFlags; -+ -+ typedef I0 FirstInterface; -+ -+ protected: -+ HRESULT CanCastTo(REFIID riid, void **ppv) throw() { -+ return 0; -+ } -+ -+ IUnknown* CastToUnknown() throw() { -+ return nullptr; -+ } -+ -+ unsigned long GetIidCount() throw() { -+ return 0; -+ } -+ -+ void FillArrayWithIid(unsigned long *index, IID* iids) throw() {} -+ }; -+ -+ template <int flags, typename I0, typename ...TInterfaces> -+ struct __declspec(novtable) Implements<RuntimeClassFlags<flags>, I0, TInterfaces...> : Details::ImplementsHelper<RuntimeClassFlags<flags>, true, I0, TInterfaces...>, Details::ImplementsBase { -+ public: -+ typedef RuntimeClassFlags<flags> ClassFlags; -+ -+ typedef I0 FirstInterface; -+ -+ protected: -+ HRESULT CanCastTo(REFIID riid, void **ppv) throw() { -+ return 0; -+ } -+ -+ IUnknown* CastToUnknown() throw() { -+ return nullptr; -+ } -+ -+ unsigned long GetIidCount() throw() { -+ return 0; -+ } -+ -+ void FillArrayWithIid(unsigned long *index, IID* iids) throw() {} -+ }; -+ -+ class FtmBase : public Implements< ::Microsoft::WRL::RuntimeClassFlags<WinRtClassicComMix>, ::Microsoft::WRL::CloakedIid< ::IMarshal> >, private ::Microsoft::WRL::Details::FtmBaseMarker { -+ protected: -+ template <typename RuntimeClassFlagsT, bool doStrictCheck, typename ...TInterfaces> friend struct Details::ImplementsHelper; -+ -+ HRESULT CanCastTo(REFIID riid, void **ppv) throw() { -+ return 0; -+ } -+ -+ public: -+ FtmBase() throw() {} -+ -+ STDMETHOD(GetUnmarshalClass)(REFIID riid, void *pv, DWORD dwDestContext, void *pvDestContext, DWORD mshlflags, CLSID *pCid) override { -+ return 0; -+ } -+ -+ STDMETHOD(GetMarshalSizeMax)(REFIID riid, void *pv, DWORD dwDestContext, void *pvDestContext, DWORD mshlflags, DWORD *pSize) override { -+ return 0; -+ } -+ -+ STDMETHOD(MarshalInterface)(IStream *pStm, REFIID riid, void *pv, DWORD dwDestContext, void *pvDestContext, DWORD mshlflags) override { -+ return 0; -+ } -+ -+ STDMETHOD(UnmarshalInterface)(IStream *pStm, REFIID riid, void **ppv) override { -+ return 0; -+ } -+ -+ STDMETHOD(ReleaseMarshalData)(IStream *pStm) override { -+ return 0; -+ } -+ -+ STDMETHOD(DisconnectObject)(DWORD dwReserved) override { -+ return 0; -+ } -+ -+ static HRESULT CreateGlobalInterfaceTable(IGlobalInterfaceTable **git) throw() { -+ return 0; -+ } -+ -+ ::Microsoft::WRL::ComPtr<IMarshal> marshaller_; -+ }; -+ + namespace Details { -+ #define DETAILS_RTCLASS_FLAGS_ARGUMENTS(RuntimeClassFlagsT) \ -+ RuntimeClassFlagsT, \ -+ (RuntimeClassFlagsT::value & InhibitWeakReference) == 0, \ -+ (RuntimeClassFlagsT::value & WinRt) == WinRt, \ -+ __WRL_IMPLEMENTS_FTM_BASE__(RuntimeClassFlagsT::value) \ -+ + template <class RuntimeClassFlagsT, bool implementsWeakReferenceSource, bool implementsInspectable, bool implementsFtmBase, typename ...TInterfaces> + class __declspec(novtable) RuntimeClassImpl; + -+ template <class RuntimeClassFlagsT, bool implementsWeakReferenceSource, bool implementsFtmBase, typename ...TInterfaces> -+ class __declspec(novtable) RuntimeClassImpl<RuntimeClassFlagsT, implementsWeakReferenceSource, false, implementsFtmBase, TInterfaces...> : public Details::ImplementsHelper<RuntimeClassFlagsT, false, TInterfaces...>, public RuntimeClassBaseT<RuntimeClassFlagsT::value>, protected RuntimeClassFlags<InhibitWeakReference>, public DontUseNewUseMake { -+ public: -+ typedef RuntimeClassFlagsT ClassFlags; -+ -+ STDMETHOD(QueryInterface)(REFIID riid, void **ppvObject) { -+ return 0; -+ } -+ -+ STDMETHOD_(ULONG, AddRef)() { -+ return 0; -+ } -+ -+ STDMETHOD_(ULONG, Release)() { -+ return 0; -+ } -+ -+ protected: -+ RuntimeClassImpl() throw() {} -+ -+ virtual ~RuntimeClassImpl() throw() {} -+ -+ unsigned long InternalAddRef() throw() { -+ return 0; -+ } -+ -+ unsigned long InternalRelease() throw() { -+ return 0; -+ } -+ -+ unsigned long GetRefCount() const throw() { -+ return 0; -+ } -+ -+ friend class WeakReferenceImpl; -+ -+ private: -+ volatile long refcount_; -+ }; -+ -+ template<typename I, bool isImplementsBased = __is_base_of(ImplementsBase, I)> -+ struct HasIInspectable; -+ -+ template<typename I> -+ struct HasIInspectable<I, false> { -+ static const bool isIInspectable; -+ }; -+ -+ template<typename I> -+ struct HasIInspectable<I, true> { -+ static const bool isIInspectable; -+ }; -+ + template<typename I0, bool isIInspectable = true> + struct IInspectableInjector; + @@ -1172,16 +609,10 @@ index 000000000..c8261e55a + private: + volatile long refcount_; + }; -+ -+ template <class RuntimeClassFlagsT, typename I0, typename ...TInterfaces> -+ class __declspec(novtable) RuntimeClassImpl<RuntimeClassFlagsT, false, true, true, I0, TInterfaces...> : public RuntimeClassImpl<RuntimeClassFlagsT, false, true, false, I0, TInterfaces...> {}; -+ -+ template <class RuntimeClassFlagsT, typename I0, typename ...TInterfaces> -+ class __declspec(novtable) RuntimeClassImpl<RuntimeClassFlagsT, true, true, true, I0, TInterfaces...> : public RuntimeClassImpl<RuntimeClassFlagsT, true, true, false, I0, FtmBase, TInterfaces...> {}; + } + + template <typename ...TInterfaces> -+ class RuntimeClass : public Details::RuntimeClassImpl<DETAILS_RTCLASS_FLAGS_ARGUMENTS(RuntimeClassFlags<WinRt>), TInterfaces...> { ++ class RuntimeClass : public Details::RuntimeClassImpl<RuntimeClassFlags<WinRt>, false, true, false, TInterfaces...> { + RuntimeClass(const RuntimeClass&); + + RuntimeClass& operator=(const RuntimeClass&); @@ -1193,7 +624,7 @@ index 000000000..c8261e55a + }; + + template <unsigned int classFlags, typename ...TInterfaces> -+ class RuntimeClass<RuntimeClassFlags<classFlags>, TInterfaces...> : public Details::RuntimeClassImpl<DETAILS_RTCLASS_FLAGS_ARGUMENTS(RuntimeClassFlags<classFlags>), TInterfaces...> { ++ class RuntimeClass<RuntimeClassFlags<classFlags>, TInterfaces...> : public Details::RuntimeClassImpl<RuntimeClassFlags<classFlags>, false, true, false, TInterfaces...> { + RuntimeClass(const RuntimeClass&); + + RuntimeClass& operator=(const RuntimeClass&); @@ -1205,184 +636,9 @@ index 000000000..c8261e55a + }; + + using Details::Make; -+ + } +} + +#include <poppack.h> + +#endif -diff --git a/mingw-w64-headers/include/wrl/internal.h b/mingw-w64-headers/include/wrl/internal.h -index 715ef74e3..dffa7153d 100644 ---- a/mingw-w64-headers/include/wrl/internal.h -+++ b/mingw-w64-headers/include/wrl/internal.h -@@ -7,6 +7,8 @@ - #ifndef _WRL_INTERNAL_H_ - #define _WRL_INTERNAL_H_ - -+#define __WRL_IMPLEMENTS_FTM_BASE__(flags) (false) -+ - #include <windows.h> - - namespace Microsoft { -@@ -29,6 +31,26 @@ namespace Microsoft { - struct EnableIf<true, T> { - typedef T type; - }; -+ -+ template<class T> -+ struct RemoveReference { -+ typedef T Type; -+ }; -+ -+ template<class T> -+ struct RemoveReference<T&> { -+ typedef T Type; -+ }; -+ -+ template<class T> -+ struct RemoveReference<T&&> { -+ typedef T Type; -+ }; -+ -+ template<class T> -+ inline typename RemoveReference<T>::Type&& Move(T&& arg) throw() { -+ return nullptr; -+ } - } - } - } -diff --git a/mingw-w64-headers/include/wrl/wrappers/corewrappers.h b/mingw-w64-headers/include/wrl/wrappers/corewrappers.h -index 182d4b063..6d42fb341 100644 ---- a/mingw-w64-headers/include/wrl/wrappers/corewrappers.h -+++ b/mingw-w64-headers/include/wrl/wrappers/corewrappers.h -@@ -24,6 +24,129 @@ namespace Microsoft { - } - - namespace Wrappers { -+ namespace HandleTraits { -+ struct SRWLockSharedTraits { -+ typedef SRWLOCK* Type; -+ -+ inline static Type GetInvalidValue() throw() { -+ return nullptr; -+ } -+ -+ inline static void Unlock(Type srwlock) throw() {} -+ }; -+ -+ struct SRWLockExclusiveTraits { -+ typedef SRWLOCK* Type; -+ -+ inline static Type GetInvalidValue() throw() { -+ return nullptr; -+ } -+ -+ inline static void Unlock(Type srwlock) throw() {} -+ }; -+ } -+ -+ class SRWLock; -+ -+ namespace Details { -+ class SyncLockExclusive { -+ public: -+ SyncLockExclusive(SyncLockExclusive&& other) throw() {} -+ -+ SyncLockExclusive(const SyncLockExclusive&); -+ SyncLockExclusive& operator=(const SyncLockExclusive&); -+ -+ ~SyncLockExclusive() throw() {} -+ -+ void Unlock() throw() {} -+ -+ bool IsLocked() const throw() { -+ return 0; -+ } -+ -+ friend class Wrappers::SRWLock; -+ -+ protected: -+ explicit SyncLockExclusive(SRWLOCK* sync) throw() {} -+ -+ SRWLOCK* sync_; -+ -+ private: -+ void InternalUnlock() throw() {} -+ }; -+ -+ class SyncLockShared { -+ public: -+ SyncLockShared(SyncLockShared&& other) throw() {} -+ -+ SyncLockShared(const SyncLockShared&); -+ SyncLockShared& operator=(const SyncLockShared&); -+ -+ ~SyncLockShared() throw() {} -+ -+ void Unlock() throw() {} -+ -+ bool IsLocked() const throw() { -+ return 0; -+ } -+ -+ friend class Wrappers::SRWLock; -+ -+ protected: -+ explicit SyncLockShared(SRWLOCK* sync) throw() {} -+ -+ SRWLOCK* sync_; -+ -+ private: -+ void InternalUnlock() throw() {} -+ }; -+ } -+ -+ class SRWLock { -+ public: -+ SRWLock() throw() {} -+ -+ SRWLock(const SRWLock&) = delete; -+ SRWLock& operator=(const SRWLock&) = delete; -+ -+ ~SRWLock() throw() {} -+ -+ Details::SyncLockExclusive LockExclusive() throw() { -+ return Details::SyncLockExclusive(nullptr); -+ } -+ -+ static Details::SyncLockExclusive LockExclusive(SRWLOCK* lock) throw() { -+ return Details::SyncLockExclusive(nullptr); -+ } -+ -+ Details::SyncLockExclusive TryLockExclusive() throw() { -+ return Details::SyncLockExclusive(nullptr); -+ } -+ -+ static Details::SyncLockExclusive TryLockExclusive(SRWLOCK* lock) throw() { -+ return Details::SyncLockExclusive(nullptr); -+ } -+ -+ Details::SyncLockShared LockShared() throw() { -+ return Details::SyncLockShared(nullptr); -+ } -+ -+ static Details::SyncLockShared LockShared(SRWLOCK* lock) throw() { -+ return Details::SyncLockShared(nullptr); -+ } -+ -+ Details::SyncLockShared TryLockShared() throw() { -+ return Details::SyncLockShared(nullptr); -+ } -+ -+ static Details::SyncLockShared TryLockShared(SRWLOCK* lock) throw() { -+ return Details::SyncLockShared(nullptr); -+ } -+ -+ protected: -+ SRWLOCK SRWLock_; -+ }; -+ - class HStringReference; - - class HString { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-147.0a1-16.0-2] 2 commits: fixup! Firefox preference overrides.
by henry (＠henry) 10 Feb '26

10 Feb '26

henry pushed to branch mullvad-browser-147.0a1-16.0-2 at The Tor Project / Applications / Mullvad Browser Commits: 1d13a4e1 by henry at 2026-02-10T12:41:58+00:00 fixup! Firefox preference overrides. TB 44520: Disable Normandy rollout. This preference is added in Firefox 149 from bugzilla bug 2003350. (cherry picked from commit 2cccadc118b01d07ba00109b5ac082698d141332) Co-authored-by: Henry Wilkes <henry(a)torproject.org> - - - - - 9f50bb71 by henry at 2026-02-10T12:41:59+00:00 BB 44520: Disable Experiment API (Firefox Labs). (cherry picked from commit 7d6331a534130b279c08d10d048f5c6c647a23d1) Co-authored-by: Henry Wilkes <henry(a)torproject.org> - - - - - 2 changed files: - browser/app/profile/001-base-profile.js - toolkit/components/nimbus/ExperimentAPI.sys.mjs Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -417,6 +417,9 @@ pref("browser.urlbar.dnsResolveSingleWordsAfterSearch", 0); pref("messaging-system.rsexperimentloader.enabled", false); // true means that you are *not* opting out. See its usage in various file. pref("app.shield.optoutstudies.enabled", false); +// Disable nimbus rollouts. +// See bugzilla bug 2003350. See tor-browser#44520. +pref("nimbus.rollouts.enabled", false); // Disable Normandy/Shield pref("app.normandy.enabled", false); pref("app.normandy.api_url", ""); ===================================== toolkit/components/nimbus/ExperimentAPI.sys.mjs ===================================== @@ -396,10 +396,19 @@ export const ExperimentAPI = new (class { } get enabled() { + if (AppConstants.BASE_BROWSER_VERSION) { + // Do not allow ExperimentsAPI (which covers either "labs", "studies" or + // "rollouts") in Base Browser. + return false; + } return this.studiesEnabled || this.labsEnabled; } get labsEnabled() { + if (AppConstants.BASE_BROWSER_VERSION) { + // Do not allow "Firefox Labs" in Base Browser. + return false; + } return Services.policies.isAllowed("FirefoxLabs"); } View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/f4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/f4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-147.0a1-16.0-2] BB 44520: Disable Experiment API (Firefox Labs).
by henry (＠henry) 10 Feb '26

10 Feb '26

henry pushed to branch base-browser-147.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: 5494b673 by henry at 2026-02-10T12:39:39+00:00 BB 44520: Disable Experiment API (Firefox Labs). (cherry picked from commit 7d6331a534130b279c08d10d048f5c6c647a23d1) Co-authored-by: Henry Wilkes <henry(a)torproject.org> - - - - - 1 changed file: - toolkit/components/nimbus/ExperimentAPI.sys.mjs Changes: ===================================== toolkit/components/nimbus/ExperimentAPI.sys.mjs ===================================== @@ -396,10 +396,19 @@ export const ExperimentAPI = new (class { } get enabled() { + if (AppConstants.BASE_BROWSER_VERSION) { + // Do not allow ExperimentsAPI (which covers either "labs", "studies" or + // "rollouts") in Base Browser. + return false; + } return this.studiesEnabled || this.labsEnabled; } get labsEnabled() { + if (AppConstants.BASE_BROWSER_VERSION) { + // Do not allow "Firefox Labs" in Base Browser. + return false; + } return Services.policies.isAllowed("FirefoxLabs"); } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5494b67… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5494b67… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-147.0a1-16.0-2] fixup! Firefox preference overrides.
by henry (＠henry) 10 Feb '26

10 Feb '26

henry pushed to branch base-browser-147.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: 08ba868e by henry at 2026-02-10T12:38:50+00:00 fixup! Firefox preference overrides. TB 44520: Disable Normandy rollout. This preference is added in Firefox 149 from bugzilla bug 2003350. (cherry picked from commit 2cccadc118b01d07ba00109b5ac082698d141332) Co-authored-by: Henry Wilkes <henry(a)torproject.org> - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -417,6 +417,9 @@ pref("browser.urlbar.dnsResolveSingleWordsAfterSearch", 0); pref("messaging-system.rsexperimentloader.enabled", false); // true means that you are *not* opting out. See its usage in various file. pref("app.shield.optoutstudies.enabled", false); +// Disable nimbus rollouts. +// See bugzilla bug 2003350. See tor-browser#44520. +pref("nimbus.rollouts.enabled", false); // Disable Normandy/Shield pref("app.normandy.enabled", false); pref("app.normandy.api_url", ""); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/08ba868… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/08ba868… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-147.0a1-16.0-2] 2 commits: fixup! Firefox preference overrides.
by henry (＠henry) 10 Feb '26

10 Feb '26

henry pushed to branch tor-browser-147.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: 2cccadc1 by Henry Wilkes at 2026-02-10T11:49:42+00:00 fixup! Firefox preference overrides. TB 44520: Disable Normandy rollout. This preference is added in Firefox 149 from bugzilla bug 2003350. - - - - - 7d6331a5 by Henry Wilkes at 2026-02-10T11:49:42+00:00 BB 44520: Disable Experiment API (Firefox Labs). - - - - - 2 changed files: - browser/app/profile/001-base-profile.js - toolkit/components/nimbus/ExperimentAPI.sys.mjs Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -417,6 +417,9 @@ pref("browser.urlbar.dnsResolveSingleWordsAfterSearch", 0); pref("messaging-system.rsexperimentloader.enabled", false); // true means that you are *not* opting out. See its usage in various file. pref("app.shield.optoutstudies.enabled", false); +// Disable nimbus rollouts. +// See bugzilla bug 2003350. See tor-browser#44520. +pref("nimbus.rollouts.enabled", false); // Disable Normandy/Shield pref("app.normandy.enabled", false); pref("app.normandy.api_url", ""); ===================================== toolkit/components/nimbus/ExperimentAPI.sys.mjs ===================================== @@ -396,10 +396,19 @@ export const ExperimentAPI = new (class { } get enabled() { + if (AppConstants.BASE_BROWSER_VERSION) { + // Do not allow ExperimentsAPI (which covers either "labs", "studies" or + // "rollouts") in Base Browser. + return false; + } return this.studiesEnabled || this.labsEnabled; } get labsEnabled() { + if (AppConstants.BASE_BROWSER_VERSION) { + // Do not allow "Firefox Labs" in Base Browser. + return false; + } return Services.policies.isAllowed("FirefoxLabs"); } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/7359f9… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/7359f9… 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 41660: Add sections to doc/MAKEFILE.txt
by boklm (＠boklm) 10 Feb '26

10 Feb '26

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 79c82022 by Nicolas Vigier at 2026-02-10T09:48:13+01:00 Bug 41660: Add sections to doc/MAKEFILE.txt - - - - - af4a83f0 by Nicolas Vigier at 2026-02-10T11:00:20+01:00 Bug 41660: Add makefile targets to build upstream firefox commit Based on patch started by @pierov in https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/issues/4…. - - - - - ebef30b2 by Nicolas Vigier at 2026-02-10T11:00:22+01:00 Bug 41719: Enable network in geckoview build scripts when var/generate_gradle_dependencies_list is enabled - - - - - 14 changed files: - Makefile - doc/MAKEFILE.txt - projects/common/browser-localization - projects/firefox/build - projects/firefox/config - + projects/firefox/firefoxbrowser-BB-29320.patch - + projects/firefox/mozconfig-upstream-firefox.in - projects/firefox/mozconfig.in - projects/geckoview/build - projects/geckoview/build_common - projects/geckoview/config - + projects/geckoview/mozconfig-upstream-firefox.in - projects/geckoview/mozconfig.in - rbm.conf Changes: ===================================== Makefile ===================================== @@ -543,6 +543,31 @@ mullvadbrowser-compare-mar-signed-unsigned-release: submodule-update mullvadbrowser-compare-mar-signed-unsigned-alpha: submodule-update $(rbm) build release --step compare_mar_signed_unsigned --target alpha --target signed --target mullvadbrowser +############################# +# Building upstream firefox # +############################# + +firefox-linux-x86_64: submodule-update + $(rbm) build firefox --target alpha --target firefoxbrowser-linux-x86_64 + +firefox-linux-aarch64: submodule-update + $(rbm) build firefox --target alpha --target firefoxbrowser-linux-arch64 + +firefox-windows-x86_64: submodule-update + $(rbm) build firefox --target alpha --target firefoxbrowser-windows-x86_64 + +firefox-windows-i686: submodule-update + $(rbm) build firefox --target alpha --target firefoxbrowser-windows-i686 + +firefox-macos-aarch64: submodule-update + $(rbm) build firefox --target alpha --target firefoxbrowser-macos-aarch64 + +firefox-macos-x86_64: submodule-update + $(rbm) build firefox --target alpha --target firefoxbrowser-macos-x86_64 + +geckoview-android-aarch64: submodule-update + $(rbm) build geckoview --target testbuild --target alpha --target firefoxbrowser-android-aarch64 + ############################ # Toolchain Update Targets # ===================================== doc/MAKEFILE.txt ===================================== @@ -1,6 +1,11 @@ Description of makefile rules ============================= + +************************************ +* Building Tor and Mullvad Browser * +************************************ + torbrowser ---------- Build Tor Browser for the default channel, defined in @@ -92,11 +97,27 @@ fetch Fetch new commits from all components. This is useful when you want to build the nightly channel. -list-unused-projects --------------------- -List which projects are not being used by projects/release/build with -torbrowser and mullvadbrowser targets. Projects that are used outside -of normal builds can be added to projects/release/list_used_projects. +torbrowser-incrementals-{release,alpha} +--------------------------------------- +Create incremental mar files for an unsigned build in the release or +alpha channel. The list of versions we create incrementals from is +defined as var/torbrowser_incremental_from in rbm.conf. + +torbrowser-incrementals-nightly +------------------------------- +Create incremental mar files for the current nightly build. The number +of previous versions we should generate incremental mars from is defined +as var/max_torbrowser_incremental_from in rbm.conf. + +If you want to create incremental mars for a version that is not the +current one, you can define the environment variable +TORBROWSER_NIGHTLY_VERSION to the version you want to generate +incremental mars for. + + +************ +* Cleaning * +************ clean ----- @@ -115,28 +136,22 @@ clean-dry-run ------------- Print the files that would be removed when running 'make clean'. +list-unused-projects +-------------------- +List which projects are not being used by projects/release/build with +torbrowser and mullvadbrowser targets. Projects that are used outside +of normal builds can be added to projects/release/list_used_projects. + + +*********************************** +* Publishing and signing releases * +*********************************** + torbrowser-signtag-{release,alpha} ---------------------------------- Create a git signed tag for the selected channel, using the version and build number defined as var/torbrowser_version and var/torbrowser_build. -torbrowser-incrementals-{release,alpha} ---------------------------------------- -Create incremental mar files for an unsigned build in the release or -alpha channel. The list of versions we create incrementals from is -defined as var/torbrowser_incremental_from in rbm.conf. - -torbrowser-incrementals-nightly -------------------------------- -Create incremental mar files for the current nightly build. The number -of previous versions we should generate incremental mars from is defined -as var/max_torbrowser_incremental_from in rbm.conf. - -If you want to create incremental mars for a version that is not the -current one, you can define the environment variable -TORBROWSER_NIGHTLY_VERSION to the version you want to generate -incremental mars for. - torbrowser-dmg2mar-{release,alpha) ---------------------------------- Generate updated mar files for the OSX bundles, from the dmg files, then @@ -149,6 +164,11 @@ Create update responses xml files for a signed build in the release or alpha channel. The files can be found in a tar in the directory torbrowser/{release,alpha}/update-responses. + +**************************************** +* Comparing signed and unsigned builds * +**************************************** + torbrowser-compare-windows-signed-unsigned-{release,alpha} ---------------------------------------------------------- Unsign exe files from directory torbrowser/{release,alpha}/signed/$version @@ -159,3 +179,25 @@ torbrowser-compare-mar-signed-unsigned-{release,alpha} Unsign mar files from directory torbrowser/{release,alpha}/signed/$version and compare them with the checksum from sha256sums-unsigned-build.txt. + +********************* +* Toolchain updates * +********************* + +list_toolchain_updates-{application-services,firefox-linux,firefox-macos, + firefox-windows,geckoview} +------------------------------------------------------------------------- +List toolchain updates required for building selected component/platform. + + +firefox-{linux-x86_64,linux-aarch64,windows-x86_64,windows-i686, + macos-aarch64,macos-x86_64} +---------------------------------------------------------------- +Building upstream firefox commit for selected platform. This is useful +for testing toolchain updates for a new firefox version. + +geckoview-android-aarch64 +------------------------- +Building upstream firefox commit for android (aarch64 only). We currently +don't support the `build_apk` builds with all architectures, but the +single arch build should be enough for testing toolchain updates. ===================================== projects/common/browser-localization ===================================== @@ -1,4 +1,6 @@ -branding_dir=[% IF c('var/android') %]mobile/android[% ELSE %]browser[% END %]/branding/[% c("var/project_initials") %]-[% c("var/channel") %] +[% IF !c("var/firefox-browser") -%] + branding_dir=[% IF c('var/android') %]mobile/android[% ELSE %]browser[% END %]/branding/[% c("var/project_initials") %]-[% c("var/channel") %] +[% END -%] [% IF c("var/has_l10n") -%] [% IF !c("var/android") -%] ===================================== projects/firefox/build ===================================== @@ -106,16 +106,23 @@ mkdir "$HOME/.mozbuild" export LC_ALL=C.UTF-8 export LANG=C.UTF-8 +[% IF c("var/firefox-browser") && c("var/windows") -%] + patch -p1 < $rootdir/firefoxbrowser-BB-29320.patch +[% END -%] + echo "Starting ./mach configure $(date)" ./mach configure \ --with-distribution-id=org.torproject \ - --with-base-browser-version=[% c("var/torbrowser_version") %] \ + [% IF !c("var/firefox-browser") %]--with-base-browser-version=[% c("var/torbrowser_version") %][% END %] \ [% IF c("var/updater_enabled") -%]--enable-update-channel=[% c("var/channel") %][% END %] \ - [% IF !c("var/base-browser") -%]--with-branding="$branding_dir"[% END %] \ + [% IF !c("var/base-browser") && !c("var/firefox-browser") -%]--with-branding="$branding_dir"[% END %] \ [% IF !c("var/rlbox") -%]--without-wasm-sandboxed-libraries[% END %] echo "Starting ./mach build $(date)" ./mach build --verbose + +[% IF c("var/firefox-browser") && c("var/windows"); RETURN; END; -%] + [% IF c("var/has_l10n") -%] echo "Starting to merge locales $(date)" export MOZ_CHROME_MULTILOCALE="$supported_locales" @@ -160,6 +167,9 @@ echo "Starting ./mach build $(date)" [% IF c("var/base-browser") -%] mv "$distdir/Firefox.app" "$distdir/[% c('var/display_name') %].app" [% END -%] + [% IF c("var/firefox-browser") -%] + mv "$distdir/Nightly.app" "$distdir/[% c('var/display_name') %].app" + [% END -%] app_bundle="[% c('var/display_name') %].app" # Remove firefox-bin (we don't use it, see ticket #10126) rm -f "$distdir/$app_bundle/Contents/MacOS/[% c('var/exe_name') %]-bin" ===================================== projects/firefox/config ===================================== @@ -23,6 +23,7 @@ var: browser_rebase: 2 browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]' browser_build: 2 + upstream_firefox_commit: FIREFOX_NIGHTLY_147_END copyright_year: '[% exec("git show -s --format=%ci " _ c("git_hash") _ "^{commit}", { exec_noco => 1 }).remove("-.*") %]' nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-[% c("var/osname") %]' gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser @@ -90,13 +91,20 @@ steps: version: '[% c("abbrev") %]' list_toolchain_updates: - git_hash: FIREFOX_NIGHTLY_147_END + git_hash: '[% c("var/upstream_firefox_commit") %]' tag_gpg_id: 0 input_files: [] container: use_container: 0 targets: + firefoxbrowser: + git_hash: '[% c("var/upstream_firefox_commit") %]' + tag_gpg_id: 0 + var: + updater_url: '' + has_l10n: 0 + basebrowser: var: nightly_updates_publish_dir_prefix: basebrowser- @@ -240,3 +248,7 @@ input_files: - project: libdmg-hfsplus name: libdmg enable: '[% c("var/macos") && c("var/dev_artifacts") %]' + # When building upstream firefox we need this patch to be able to + # build for Windows + - filename: firefoxbrowser-BB-29320.patch + enable: '[% c("var/firefox-browser") && c("var/windows") %]' ===================================== projects/firefox/firefoxbrowser-BB-29320.patch ===================================== @@ -0,0 +1,45 @@ +commit df53f566fa75408c95f3f619e1eee30417449642 +Author: Pier Angelo Vendrame <pierov(a)torproject.org> +Date: Thu Jun 13 09:22:53 2024 +0200 + + BB 29320: Replace the gnu target with gnullvm for Rust. + +diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure +index d71d2fbe33b77..62ceec58677a2 100644 +--- a/build/moz.configure/init.configure ++++ b/build/moz.configure/init.configure +@@ -490,12 +490,16 @@ def split_triplet(triplet, allow_wasi=False): + canonical_kernel = "kFreeBSD" + elif os.startswith("gnu"): + canonical_os = canonical_kernel = "GNU" +- elif os.startswith("mingw") or os in ("windows-msvc", "windows-gnu"): ++ elif os.startswith("mingw") or os in ( ++ "windows-msvc", ++ "windows-gnu", ++ "windows-gnullvm", ++ ): + canonical_os = canonical_kernel = "WINNT" + if not os.startswith("mingw"): + if os == "windows-msvc": + abi = "msvc" +- elif os == "windows-gnu": ++ elif os == "windows-gnu" or os == "windows-gnullvm": + abi = "mingw" + # Many things down the line are looking for the string "mingw32" + # until they are all fixed, we pretend that's the raw os we had +diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure +index 6c1c891817133..ee836b6060756 100644 +--- a/build/moz.configure/rust.configure ++++ b/build/moz.configure/rust.configure +@@ -310,9 +310,9 @@ def detect_rustc_target( + if host_or_target.abi == "msvc": + suffix = "windows-msvc" + elif host_or_target.abi == "mingw": +- suffix = "windows-gnu" ++ suffix = "windows-gnullvm" + elif compiler_info.type in ("gcc", "clang"): +- suffix = "windows-gnu" ++ suffix = "windows-gnullvm" + else: + suffix = "windows-msvc" + narrowed = [ ===================================== projects/firefox/mozconfig-upstream-firefox.in ===================================== @@ -0,0 +1,17 @@ +# The file mozconfig-upstream-firefox.in is used to set some options +# needed to build upstream firefox. In Tor/Mullvad Browser, those +# options are set in the specific mozconfig files in tor-browser.git. + +[% IF c("var/windows-x86_64") -%] + ac_add_options --target=x86_64-w64-mingw32 + ac_add_options --with-toolchain-prefix=x86_64-w64-mingw32- +[% END -%] +[% IF c("var/windows-i686") -%] + ac_add_options --target=i686-w64-mingw32 + ac_add_options --with-toolchain-prefix=i686-w64-mingw32- +[% END -%] +[% IF c("var/windows") -%] + ac_add_options --disable-notification-server + + ac_add_options --disable-webrtc +[% END -%] ===================================== projects/firefox/mozconfig.in ===================================== @@ -1,4 +1,8 @@ -. $topsrcdir/mozconfig-[% IF c("var/macos"); GET 'macos'; ELSE; GET c("var/osname"); END; %][% IF c("var/asan") %]-asan[% END %] +[% IF !c("var/firefox-browser") -%] + . $topsrcdir/mozconfig-[% IF c("var/macos"); GET 'macos'; ELSE; GET c("var/osname"); END; %][% IF c("var/asan") %]-asan[% END %] +[% ELSE; + INCLUDE 'mozconfig-upstream-firefox.in'; + END -%] [% IF c("var/linux") -%] # We want to build with clang now and point to the GCC toolchain until #29041 is @@ -81,7 +85,9 @@ [% END -%] ac_add_options --[% IF c("var/updater_enabled") %]enable[% ELSE %]disable[% END %]-updater -ac_add_options --[% IF c("var/updater_enabled") %]enable[% ELSE %]disable[% END %]-base-browser-update +[% IF !c("var/firefox-browser") -%] + ac_add_options --[% IF c("var/updater_enabled") %]enable[% ELSE %]disable[% END %]-base-browser-update +[% END -%] [% IF c("var/override_updater_url") -%] ac_add_options --with-updater-url=[% c("var/override_updater_url") %] [% ELSIF c("var/updater_url") -%] ===================================== projects/geckoview/build ===================================== @@ -18,8 +18,8 @@ cp $rootdir/mozconfig ./ echo "Starting ./mach configure $(date)" ./mach configure \ - --with-base-browser-version=[% c("var/torbrowser_version") %] \ - --with-branding=$branding_dir \ + [% IF !c("var/firefox-browser") %]--with-base-browser-version=[% c("var/torbrowser_version") %][% END %] \ + [% IF !c("var/firefox-browser") %]--with-branding=$branding_dir[% END %] \ [% IF !c("var/rlbox") -%]--without-wasm-sandboxed-libraries[% END %] echo "Starting ./mach build $(date)" ===================================== projects/geckoview/build_common ===================================== @@ -15,19 +15,28 @@ export PATH="/var/tmp/dist/node/bin:$PATH" export LC_ALL=C.UTF-8 export LANG=C.UTF-8 -# Normalize this path, as it will end up in buildconfig.html. -export TOR_EXPERT_BUNDLE_AAR=/var/tmp/dist/tor-expert-bundle.aar -mv $rootdir/[% c('input_files_by_name/tor-expert-bundle-aar') %]/tor-expert-bundle.aar $TOR_EXPERT_BUNDLE_AAR +[% IF c("var/tor-browser") -%] + # Normalize this path, as it will end up in buildconfig.html. + export TOR_EXPERT_BUNDLE_AAR=/var/tmp/dist/tor-expert-bundle.aar + mv $rootdir/[% c('input_files_by_name/tor-expert-bundle-aar') %]/tor-expert-bundle.aar $TOR_EXPERT_BUNDLE_AAR +[% END -%] -tar -C /var/tmp/dist -xf [% c('input_files_by_name/application-services') %] -export APPLICATION_SERVICES=/var/tmp/dist/application-services/maven -export NIMBUS_FML=/var/tmp/dist/application-services/nimbus-fml +[% IF !c("var/firefox-browser") -%] + tar -C /var/tmp/dist -xf [% c('input_files_by_name/application-services') %] + export APPLICATION_SERVICES=/var/tmp/dist/application-services/maven + export NIMBUS_FML=/var/tmp/dist/application-services/nimbus-fml +[% END -%] [% INCLUDE 'fake-git' %] tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %] -tar -C /var/tmp/build/[% project %]-*/tools/terser -xf [% c("input_files_by_name/terser") %] +# We disable terser for unpatched firefox since the directory +# tools/terser does not exist in 147. It will probably be needed for +# 148. +[% IF !c("var/firefox-browser") -%] + tar -C /var/tmp/build/[% project %]-*/tools/terser -xf [% c("input_files_by_name/terser") %] +[% END -%] [% c("var/set_MOZ_BUILD_DATE") %] ===================================== projects/geckoview/config ===================================== @@ -16,7 +16,8 @@ gpg_keyring: container: use_container: 1 disable_network: - build_apk: 1 + build: '[% !c("var/generate_gradle_dependencies_list") %]' + build_apk: '[% !c("var/generate_gradle_dependencies_list") %]' var: firefox_platform_version: '147.0a1' @@ -58,6 +59,12 @@ targets: tag_gpg_id: 0 var: variant: nightly + firefoxbrowser: + git_hash: '[% pc("firefox", "var/upstream_firefox_commit") %]' + tag_gpg_id: 0 + var: + generate_gradle_dependencies_list: 1 + has_l10n: 0 steps: build_apk: @@ -146,7 +153,7 @@ steps: enable: '[% c("var/generate_gradle_dependencies_list") %]' list_toolchain_updates: - git_hash: FIREFOX_NIGHTLY_147_END + git_hash: '[% pc("firefox", "var/upstream_firefox_commit") %]' tag_gpg_id: 0 input_files: [] container: @@ -178,6 +185,7 @@ input_files: enable: '[% c("var/rlbox") %]' - project: application-services name: application-services + enable: '[% !c("var/firefox-browser") %]' - filename: gradle-dependencies-list.txt name: gradle-dependencies-list - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]' @@ -189,13 +197,16 @@ input_files: sha256sum: '[% pc("glean-parser", "var/glean_wheels_sha256sum") %]' - project: glean name: glean + enable: '[% !c("var/generate_gradle_dependencies_list") %]' - project: oss-licenses-plugin name: oss-licenses-plugin enable: '[% !c("var/generate_gradle_dependencies_list") %]' - project: terser name: terser + enable: '[% !c("var/firefox-browser") %]' - name: tor-expert-bundle-aar project: tor-expert-bundle-aar + enable: '[% c("var/tor-browser") %]' - project: firefox-l10n name: firefox-l10n enable: '[% c("var/android_single_arch") && c("var/has_l10n") %]' ===================================== projects/geckoview/mozconfig-upstream-firefox.in ===================================== @@ -0,0 +1,17 @@ +# The file mozconfig-upstream-firefox.in is used to set some options +# needed to build upstream firefox. In Tor Browser, those options are +# set in the specific mozconfig files in tor-browser.git. + +ac_add_options --enable-application=mobile/android + +# Make sure to disable bootstrap also when running online builds for dependency +# updates. +ac_add_options --disable-bootstrap + +CC="clang" +CXX="clang++" +ac_add_options --enable-linker=lld + +ac_add_options --with-android-sdk=$ANDROID_HOME +ac_add_options --with-android-ndk=$ANDROID_NDK_HOME +ac_add_options --with-gradle=$GRADLE_HOME/bin/gradle ===================================== projects/geckoview/mozconfig.in ===================================== @@ -1,4 +1,8 @@ +[% IF !c("var/firefox-browser") -%] . $topsrcdir/[% c("var/mozconfig_file") %] +[% ELSE; + INCLUDE 'mozconfig-upstream-firefox.in'; + END -%] ac_add_options --with-java-bin-path=/usr/lib/jvm/java-1.17.0-openjdk-amd64/bin ===================================== rbm.conf ===================================== @@ -372,6 +372,18 @@ targets: ProjectName: BaseBrowser updater_enabled: '[% c("var/nightly") %]' + # Target to build upstream firefox commit (in projects/firefox and + # projects/geckoview) instead of our patched branch + firefoxbrowser: + var: + firefox-browser: 1 + project-name: firefox-browser + projectname: firefoxbrowser + Project_Name: 'Firefox Browser' + ProjectName: FirefoxBrowser + updater_enabled: 0 + android_single_arch: 1 + mullvadbrowser: var: mullvad-browser: 1 @@ -434,6 +446,10 @@ targets: - android-armv7 - android - basebrowser + firefoxbrowser-android-armv7: + - android-armv7 + - android + - firefoxbrowser android-armv7: arch: armv7 var: @@ -450,6 +466,10 @@ targets: - android-x86_64 - android - basebrowser + firefoxbrowser-android-x86_64: + - android-x86_64 + - android + - firefoxbrowser android-x86_64: arch: x86_64 var: @@ -466,6 +486,10 @@ targets: - android-aarch64 - android - basebrowser + firefoxbrowser-android-aarch64: + - android-aarch64 + - android + - firefoxbrowser android-aarch64: arch: aarch64 var: @@ -512,6 +536,10 @@ targets: - linux-x86_64 - linux - mullvadbrowser + firefoxbrowser-linux-x86_64: + - linux-x86_64 + - linux + - firefoxbrowser torbrowser-linux-x86_64-asan: - linux-asan - linux-x86_64 @@ -542,6 +570,10 @@ targets: - linux-aarch64 - linux - mullvadbrowser + firefoxbrowser-linux-aarch64: + - linux-aarch64 + - linux + - firefoxbrowser linux-x86_64: arch: x86_64 var: @@ -603,6 +635,10 @@ targets: - windows-i686 - windows - basebrowser + firefoxbrowser-windows-i686: + - windows-i686 + - windows + - firefoxbrowser torbrowser-windows-x86_64: - windows-x86_64 - windows @@ -615,6 +651,10 @@ targets: - windows-x86_64 - windows - mullvadbrowser + firefoxbrowser-windows-x86_64: + - windows-x86_64 + - windows + - firefoxbrowser windows-x86_64: arch: x86_64 var: @@ -690,6 +730,14 @@ targets: - macos-aarch64 - macos - mullvadbrowser + firefoxbrowser-macos-x86_64: + - macos-x86_64 + - macos + - firefoxbrowser + firefoxbrowser-macos-aarch64: + - macos-aarch64 + - macos + - firefoxbrowser macos-universal: var: macos_universal: 1 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/mullvad-browser][mullvad-browser-147.0a1-16.0-2] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 10 Feb '26

10 Feb '26

Pier Angelo Vendrame pushed to branch mullvad-browser-147.0a1-16.0-2 at The Tor Project / Applications / Mullvad Browser Commits: f410b034 by june wilde at 2026-02-10T09:12:09+01:00 fixup! Firefox preference overrides. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -560,6 +560,11 @@ pref("browser.display.use_system_colors", false); pref("widget.non-native-theme.use-theme-accent", false); // tor-browser#43236: Disable vsync on Wayland to prevent refresh rate leaks. pref("widget.wayland.vsync.enabled", false); +// tor-browser#44571: Disable HTML rating attribute for filtering web content. +// This could potentially be used as a fingerprinting vector based on if content +// marked with a specific rating is loaded or not. +pref("security.restrict_to_adults.always", false); +pref("security.restrict_to_adults.respect_platform", false); // tor-browser#41943: defense-in-depth, but do not lock anymore (enabled in Firefox 119, http://bugzil.la/1851162) pref("javascript.options.spectre.disable_for_isolated_content", false); @@ -738,6 +743,8 @@ pref("browser.menu.share_url.allow", false, locked); // Disable special URL bar behaviors pref("browser.urlbar.suggest.topsites", false); pref("browser.urlbar.quicksuggest.enabled", false); +pref("browser.urlbar.quicksuggest.online.available", false); +pref("browser.urlbar.quicksuggest.online.enabled", false); pref("browser.urlbar.richSuggestions.featureGate", false); pref("browser.urlbar.yelp.featureGate", false); pref("browser.urlbar.mdn.featureGate", false); View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/f41… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/f41… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-147.0a1-16.0-2] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 10 Feb '26

10 Feb '26

Pier Angelo Vendrame pushed to branch base-browser-147.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: 083b1843 by june wilde at 2026-02-10T09:11:42+01:00 fixup! Firefox preference overrides. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -560,6 +560,11 @@ pref("browser.display.use_system_colors", false); pref("widget.non-native-theme.use-theme-accent", false); // tor-browser#43236: Disable vsync on Wayland to prevent refresh rate leaks. pref("widget.wayland.vsync.enabled", false); +// tor-browser#44571: Disable HTML rating attribute for filtering web content. +// This could potentially be used as a fingerprinting vector based on if content +// marked with a specific rating is loaded or not. +pref("security.restrict_to_adults.always", false); +pref("security.restrict_to_adults.respect_platform", false); // tor-browser#41943: defense-in-depth, but do not lock anymore (enabled in Firefox 119, http://bugzil.la/1851162) pref("javascript.options.spectre.disable_for_isolated_content", false); @@ -742,6 +747,8 @@ pref("browser.menu.share_url.allow", false, locked); // Disable special URL bar behaviors pref("browser.urlbar.suggest.topsites", false); pref("browser.urlbar.quicksuggest.enabled", false); +pref("browser.urlbar.quicksuggest.online.available", false); +pref("browser.urlbar.quicksuggest.online.enabled", false); pref("browser.urlbar.richSuggestions.featureGate", false); pref("browser.urlbar.yelp.featureGate", false); pref("browser.urlbar.mdn.featureGate", false); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/083b184… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/083b184… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-147.0a1-16.0-2] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 10 Feb '26

10 Feb '26

Pier Angelo Vendrame pushed to branch tor-browser-147.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: 7359f9f5 by june wilde at 2026-02-10T09:04:10+01:00 fixup! Firefox preference overrides. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -560,6 +560,11 @@ pref("browser.display.use_system_colors", false); pref("widget.non-native-theme.use-theme-accent", false); // tor-browser#43236: Disable vsync on Wayland to prevent refresh rate leaks. pref("widget.wayland.vsync.enabled", false); +// tor-browser#44571: Disable HTML rating attribute for filtering web content. +// This could potentially be used as a fingerprinting vector based on if content +// marked with a specific rating is loaded or not. +pref("security.restrict_to_adults.always", false); +pref("security.restrict_to_adults.respect_platform", false); // tor-browser#41943: defense-in-depth, but do not lock anymore (enabled in Firefox 119, http://bugzil.la/1851162) pref("javascript.options.spectre.disable_for_isolated_content", false); @@ -742,6 +747,8 @@ pref("browser.menu.share_url.allow", false, locked); // Disable special URL bar behaviors pref("browser.urlbar.suggest.topsites", false); pref("browser.urlbar.quicksuggest.enabled", false); +pref("browser.urlbar.quicksuggest.online.available", false); +pref("browser.urlbar.quicksuggest.online.enabled", false); pref("browser.urlbar.richSuggestions.featureGate", false); pref("browser.urlbar.yelp.featureGate", false); pref("browser.urlbar.mdn.featureGate", false); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/7359f9f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/7359f9f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-147.0a1-16.0-2] TB 43349 [android]: Add feedback for successful bootstrap
by Dan Ballard (＠dan) 09 Feb '26

09 Feb '26

Dan Ballard pushed to branch tor-browser-147.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: 371573fc by clairehurst at 2026-02-09T18:08:52-08:00 TB 43349 [android]: Add feedback for successful bootstrap - - - - - 2 changed files: - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorControllerGV.kt - mobile/android/fenix/app/src/main/res/values/torbrowser_strings.xml Changes: ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorControllerGV.kt ===================================== @@ -3,6 +3,7 @@ package org.mozilla.fenix.tor import android.content.Context import android.util.Log +import android.widget.Toast import androidx.lifecycle.LifecycleCoroutineScope import mozilla.components.browser.engine.gecko.GeckoEngine import org.mozilla.fenix.ext.components @@ -191,6 +192,11 @@ class TorControllerGV( runOnceBootstrappedHandlers.remove(it) } } + Toast.makeText( + context, + context.getString(org.mozilla.fenix.R.string.connection_assist_bootstrap_succeeded_toast_message), + Toast.LENGTH_LONG, + ).show() } } ===================================== mobile/android/fenix/app/src/main/res/values/torbrowser_strings.xml ===================================== @@ -124,6 +124,8 @@ <string name="connection_assist_connect_to_tor_before_opening_links_confirmation">CONNECT</string>  <string name="connection_assist_back_button_content_description_start_again">Start again</string> +  + <string name="connection_assist_bootstrap_succeeded_toast_message">Connected to Tor</string>  <string name="notification_close_tor_browser_tabs">Close %s’s tabs?</string> View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/371573f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/371573f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-147.0a1-16.0-2] fixup! TB 42247: Android helpers for the TorProvider
by clairehurst (＠clairehurst) 09 Feb '26

09 Feb '26

clairehurst pushed to branch tor-browser-147.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: 5f102b4d by Pier Angelo Vendrame at 2026-02-09T15:32:21+01:00 fixup! TB 42247: Android helpers for the TorProvider TB 44620: Move the Android IPC directory. Move the the files we use to communicate with the tor process from the cache directory to the data directory, as some OEMs might be doing some strange things in the cache directory, which might result in proxy errors for users. - - - - - 1 changed file: - mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorAndroidIntegration.java Changes: ===================================== mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorAndroidIntegration.java ===================================== @@ -19,6 +19,8 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.InterruptedIOException; +import java.nio.file.Files; +import java.nio.file.attribute.PosixFilePermissions; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -100,7 +102,7 @@ public class TorAndroidIntegration implements BundleEventListener { /* package */ TorAndroidIntegration(Context context) { mLibraryDir = context.getApplicationInfo().nativeLibraryDir; mCacheDir = context.getCacheDir().getAbsolutePath(); - mIpcDirectory = mCacheDir + "/tor-private"; + mIpcDirectory = new File(context.getFilesDir(), "tor-ipc").getAbsolutePath(); mDataDir = new File(context.getFilesDir(), "tor"); registerListener(); } @@ -357,15 +359,8 @@ public class TorAndroidIntegration implements BundleEventListener { return; } try { - // First remove the permissions for everybody... - directory.setReadable(false, false); - directory.setWritable(false, false); - directory.setExecutable(false, false); - // ... then add them back, but only for the owner. - directory.setReadable(true, true); - directory.setWritable(true, true); - directory.setExecutable(true, true); - } catch (SecurityException e) { + Files.setPosixFilePermissions(directory.toPath(), PosixFilePermissions.fromString("rwx------")); + } catch (IOException | SecurityException e) { Log.e(TAG, "Could not set the permissions to the IPC directory.", e); } return; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5f102b4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5f102b4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41718 - Fix github URL for Pyidaungsu font
by Pier Angelo Vendrame (＠pierov) 09 Feb '26

09 Feb '26

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: e3b6c773 by june wilde at 2026-02-09T22:10:13+01:00 Bug 41718 - Fix github URL for Pyidaungsu font - - - - - 1 changed file: - projects/fonts/config Changes: ===================================== projects/fonts/config ===================================== @@ -196,6 +196,6 @@ input_files: sha256sum: 3a5f3f26f40d5698b3c62dd085d48d6663696a3f80825aab8b553d5097518e8c name: stix enable: '[% c("var/have_stix") %]' - - URL: 'https://github.com/mcfnlp/Pyidaungsu/raw/refs/heads/ff1cd8dfe8c451244329d7a…' + - URL: 'https://github.com/mcfnlp/Pyidaungsu/raw/ff1cd8dfe8c451244329d7a6181c83e769…' sha256sum: df7106c15da76f6a24c10821b43da51f54961f6bc6791fb1fcf21c6c60bb2e10 name: Pyidaungsu View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-15.0] Bug 41720: Switch back from cp -l to mv.
by Pier Angelo Vendrame (＠pierov) 09 Feb '26

09 Feb '26

Pier Angelo Vendrame pushed to branch maint-15.0 at The Tor Project / Applications / tor-browser-build Commits: 032c4cfd by Pier Angelo Vendrame at 2026-02-09T19:35:14+01:00 Bug 41720: Switch back from cp -l to mv. We switched to cp -l to avoid errors when trying to move an inode to itself (case we might enocunter when re-running projects/release/build, since we hard-link release files when possible). However, `cp -l` does not fall back to a copy when hard link is not possible, instead it fails. So, go back to `mv`, but run `rm -f` before running mv, to avoid the error when trying to move the file to itself. - - - - - 1 changed file: - projects/release/build Changes: ===================================== projects/release/build ===================================== @@ -5,53 +5,64 @@ destdir="[% dest_dir _ '/' _ c("var/publish_dir") %]" mkdir -p "$destdir" +function merge_directory { + pushd $1 + find -type d -exec mkdir -p $destdir/{} \; + # tor-browser-build#40338: Try to remove any existing destination, as it might + # be the same inode when re-running this script, which makes mv fail. + find -type f -exec rm -f $destdir/{} \; + find -type f -exec mv {} $destdir/{} \; + popd +} + [% IF c("var/browser_platforms/android-armv7") -%] - cp -alf "[% c('input_files_by_name/android-armv7') %]"/* "$destdir"/ + merge_directory "[% c('input_files_by_name/android-armv7') %]" [% END -%] [% IF c("var/browser_platforms/android-x86") -%] mv_files "[% c('input_files_by_name/android-x86') %]" [% END -%] [% IF c("var/browser_platforms/android-x86_64") -%] - cp -alf "[% c('input_files_by_name/android-x86_64') %]"/* "$destdir"/ + merge_directory "[% c('input_files_by_name/android-x86_64') %]" [% END -%] [% IF c("var/browser_platforms/android-aarch64") -%] - cp -alf "[% c('input_files_by_name/android-aarch64') %]"/* "$destdir"/ + merge_directory "[% c('input_files_by_name/android-aarch64') %]" [% END -%] [% IF c("var/browser_platforms/windows-i686") -%] - cp -alf "[% c('input_files_by_name/windows-i686') %]"/* "$destdir"/ + merge_directory "[% c('input_files_by_name/windows-i686') %]" [% END -%] [% IF c("var/browser_platforms/windows-x86_64") -%] - cp -alf "[% c('input_files_by_name/windows-x86_64') %]"/* "$destdir"/ + merge_directory "[% c('input_files_by_name/windows-x86_64') %]" [% END -%] [% IF c("var/browser_platforms/macos") -%] - cp -alf "[% c('input_files_by_name/macos') %]"/* "$destdir"/ + merge_directory "[% c('input_files_by_name/macos') %]" [% END -%] [% IF c("var/browser_platforms/macos-x86_64") -%] - cp -alf "[% c('input_files_by_name/macos-x86_64') %]"/* "$destdir"/ + merge_directory "[% c('input_files_by_name/macos-x86_64') %]" [% END -%] [% IF c("var/browser_platforms/macos-aarch64") -%] - cp -alf "[% c('input_files_by_name/macos-aarch64') %]"/* "$destdir"/ + merge_directory "[% c('input_files_by_name/macos-aarch64') %]" [% END -%] [% IF c("var/browser_platforms/linux-i686") -%] mv_files "[% c('input_files_by_name/linux-i686') %]" [% END -%] [% IF c("var/browser_platforms/linux-x86_64") -%] - cp -alf "[% c('input_files_by_name/linux-x86_64') %]"/* "$destdir"/ + merge_directory "[% c('input_files_by_name/linux-x86_64') %]" [% END -%] [% IF c("var/browser_platforms/linux-aarch64") -%] - cp -alf "[% c('input_files_by_name/linux-aarch64') %]"/* "$destdir"/ + merge_directory "[% c('input_files_by_name/linux-aarch64') %]" [% END -%] [% IF c("var/linux-packages") || c("var/linux-packages-aarch64") -%] [% IF c("var/linux-packages") -%] - cp -alf "[% c('input_files_by_name/deb-packages') %]"/* "$destdir"/ + merge_directory "[% c('input_files_by_name/deb-packages') %]" [% END -%] [% IF c("var/linux-packages-aarch64") -%] - cp -alf "[% c('input_files_by_name/deb-packages-aarch64') %]"/* "$destdir"/ + merge_directory "[% c('input_files_by_name/deb-packages-aarch64') %]" [% END -%] - cp -alf "[% c('input_files_by_name/rpm-packages') %]"/* "$destdir"/ + merge_directory "[% c('input_files_by_name/rpm-packages') %]" [% END -%] [% IF c("var/browser-src") -%] - cp -alf "[% c('input_files_by_name/src-firefox') %]" "$destdir"/ + rm -f "$destdir/[% c('input_files_by_name/src-firefox') %]" + mv [% c('input_files_by_name/src-firefox') %] "$destdir"/ [% END -%] cd "$destdir" cat > .htaccess <<'EOF' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41720: Switch back from cp -l to mv.
by boklm (＠boklm) 09 Feb '26

09 Feb '26

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 6bb082cb by Pier Angelo Vendrame at 2026-02-09T19:24:54+01:00 Bug 41720: Switch back from cp -l to mv. We switched to cp -l to avoid errors when trying to move an inode to itself (case we might enocunter when re-running projects/release/build, since we hard-link release files when possible). However, `cp -l` does not fall back to a copy when hard link is not possible, instead it fails. So, go back to `mv`, but run `rm -f` before running mv, to avoid the error when trying to move the file to itself. - - - - - 1 changed file: - projects/release/build Changes: ===================================== projects/release/build ===================================== @@ -5,47 +5,58 @@ destdir="[% dest_dir _ '/' _ c("var/publish_dir") %]" mkdir -p "$destdir" +function merge_directory { + pushd $1 + find -type d -exec mkdir -p $destdir/{} \; + # tor-browser-build#40338: Try to remove any existing destination, as it might + # be the same inode when re-running this script, which makes mv fail. + find -type f -exec rm -f $destdir/{} \; + find -type f -exec mv {} $destdir/{} \; + popd +} + [% IF c("var/browser_platforms/android-armv7") -%] - cp -alf "[% c('input_files_by_name/android-armv7') %]"/* "$destdir"/ + merge_directory "[% c('input_files_by_name/android-armv7') %]" [% END -%] [% IF c("var/browser_platforms/android-x86_64") -%] - cp -alf "[% c('input_files_by_name/android-x86_64') %]"/* "$destdir"/ + merge_directory "[% c('input_files_by_name/android-x86_64') %]" [% END -%] [% IF c("var/browser_platforms/android-aarch64") -%] - cp -alf "[% c('input_files_by_name/android-aarch64') %]"/* "$destdir"/ + merge_directory "[% c('input_files_by_name/android-aarch64') %]" [% END -%] [% IF c("var/browser_platforms/windows-i686") -%] - cp -alf "[% c('input_files_by_name/windows-i686') %]"/* "$destdir"/ + merge_directory "[% c('input_files_by_name/windows-i686') %]" [% END -%] [% IF c("var/browser_platforms/windows-x86_64") -%] - cp -alf "[% c('input_files_by_name/windows-x86_64') %]"/* "$destdir"/ + merge_directory "[% c('input_files_by_name/windows-x86_64') %]" [% END -%] [% IF c("var/browser_platforms/macos") -%] - cp -alf "[% c('input_files_by_name/macos') %]"/* "$destdir"/ + merge_directory "[% c('input_files_by_name/macos') %]" [% END -%] [% IF c("var/browser_platforms/macos-x86_64") -%] - cp -alf "[% c('input_files_by_name/macos-x86_64') %]"/* "$destdir"/ + merge_directory "[% c('input_files_by_name/macos-x86_64') %]" [% END -%] [% IF c("var/browser_platforms/macos-aarch64") -%] - cp -alf "[% c('input_files_by_name/macos-aarch64') %]"/* "$destdir"/ + merge_directory "[% c('input_files_by_name/macos-aarch64') %]" [% END -%] [% IF c("var/browser_platforms/linux-x86_64") -%] - cp -alf "[% c('input_files_by_name/linux-x86_64') %]"/* "$destdir"/ + merge_directory "[% c('input_files_by_name/linux-x86_64') %]" [% END -%] [% IF c("var/browser_platforms/linux-aarch64") -%] - cp -alf "[% c('input_files_by_name/linux-aarch64') %]"/* "$destdir"/ + merge_directory "[% c('input_files_by_name/linux-aarch64') %]" [% END -%] [% IF c("var/linux-packages") || c("var/linux-packages-aarch64") -%] [% IF c("var/linux-packages") -%] - cp -alf "[% c('input_files_by_name/deb-packages') %]"/* "$destdir"/ + merge_directory "[% c('input_files_by_name/deb-packages') %]" [% END -%] [% IF c("var/linux-packages-aarch64") -%] - cp -alf "[% c('input_files_by_name/deb-packages-aarch64') %]"/* "$destdir"/ + merge_directory "[% c('input_files_by_name/deb-packages-aarch64') %]" [% END -%] - cp -alf "[% c('input_files_by_name/rpm-packages') %]"/* "$destdir"/ + merge_directory "[% c('input_files_by_name/rpm-packages') %]" [% END -%] [% IF c("var/browser-src") -%] - cp -alf "[% c('input_files_by_name/src-firefox') %]" "$destdir"/ + rm -f "$destdir/[% c('input_files_by_name/src-firefox') %]" + mv [% c('input_files_by_name/src-firefox') %] "$destdir"/ [% END -%] cd "$destdir" cat > .htaccess <<'EOF' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 28595: Remove the need to update var/gradle_dependencies_version
by boklm (＠boklm) 09 Feb '26

09 Feb '26

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 7c8ce499 by Nicolas Vigier at 2026-02-09T19:00:44+01:00 Bug 28595: Remove the need to update var/gradle_dependencies_version - - - - - 12 changed files: - doc/how-to-update-gradle-dependencies-list.md - projects/application-services/config - projects/application-services/gradle-dependencies-list.txt - projects/geckoview/config - projects/geckoview/gradle-dependencies-list.txt - projects/glean/config - projects/glean/gradle-dependencies-list.txt - projects/oss-licenses-plugin/config - projects/oss-licenses-plugin/gradle-dependencies-list.txt - rbm - rbm.conf - tools/fix_gradle_deps.py Changes: ===================================== doc/how-to-update-gradle-dependencies-list.md ===================================== @@ -13,8 +13,6 @@ 5. Extract it. 6. Move the `gradle-dependencies-list.txt` you just extracted to `projects/<project name>/`. -7. Bump `var/gradle_dependencies_version`. - The preferred format is `<project version>-<list version>`. Theoretically, it should be also possible to set `generate_gradle_dependencies_list: 1` in `rbm.local.conf`, run a full build and @@ -68,13 +66,8 @@ from the output artifact. New Android projects should be setup to do this. -> **Important**: dependencies are keyed and cached. So, after updating the list, -> you must also bump `var/gradle_dependencies_version`. - -This used to be an integer, but to avoid clashes between the main and -maintenance branches, we decided to switch to a -`<project version>-<list version>` format. -Usually, the list version will be `1`. +Dependencies are keyed and cached. The key is a checksum of the +gradle-dependencies-list.txt file. ## Consuming the list @@ -86,6 +79,8 @@ hashes of all the other artifacts. You can wire it in your project with code that looks like this: ```yaml +- filename: gradle-dependencies-list.txt + name: gradle-dependencies-list - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]' name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]' ===================================== projects/application-services/config ===================================== @@ -20,8 +20,6 @@ container: var: build_number: 1 - # This should be updated when the list of gradle dependencies is changed. - gradle_dependencies_version: 147.0-1 gradle_version: 8.14.3 nss_version: '3.118.1' nspr_version: '4.37' @@ -73,6 +71,8 @@ steps: - URL: 'https://ftp.mozilla.org/pub/security/nss/releases/NSS_[% c("var/nss_version") | replace("\\.", "_") %]_RTM/src/nss-[% c("var/nss_version") %]-with-nspr-[% c("var/nspr_version") %].tar.gz' name: nss sha256sum: 9e1f7da9f4e5e3bdfd73f7dc2c618d6125a12354aadaeedbb35af3699bc03e15 + - filename: gradle-dependencies-list.txt + name: gradle-dependencies-list - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]' name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]' ===================================== projects/application-services/gradle-dependencies-list.txt ===================================== @@ -1,4 +1,3 @@ -# Don't forget to update var/gradle_dependencies_version when modifying this file sha256sum | url 6bd4c7c7476f8260cd3bdbb81183583e93fc9f790c27dea7dc314181cbf87aa0 | https://dl.google.com/dl/android/maven2/androidx/annotation/annotation-expe… 2ac2f7106e12f263425b4a4dfc80989447fb895675fe902d86759aa74fd12b7d | https://dl.google.com/dl/android/maven2/androidx/annotation/annotation-expe… ===================================== projects/geckoview/config ===================================== @@ -36,9 +36,6 @@ var: - python3-zstandard - pkg-config - openjdk-17-jdk-headless - # this should be updated when the list of gradle dependencies is changed - # see doc/how-to-create-gradle-dependencies-list.txt - gradle_dependencies_version: 147-1 gradle_version: 8.14.3 glean_parser: 14.0.1 # python/mozboot/mozboot/android.py @@ -181,6 +178,8 @@ input_files: enable: '[% c("var/rlbox") %]' - project: application-services name: application-services + - filename: gradle-dependencies-list.txt + name: gradle-dependencies-list - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]' name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]' ===================================== projects/geckoview/gradle-dependencies-list.txt ===================================== @@ -1,4 +1,3 @@ -# Don't forget to update var/gradle_dependencies_version when modifying this file sha256sum | url 1ed13a50edbb885962751e1bcb5b8a4207a20cb780ea248ffa653aab3fb10fe9 | https://maven.google.com/androidx/activity/activity-compose/1.10.1/activity… e64db6b7126fb512394bc3cf4332a38828009daa8dd56ecbe6c0c7300b2127f5 | https://maven.google.com/androidx/activity/activity-compose/1.10.1/activity… ===================================== projects/glean/config ===================================== @@ -10,8 +10,6 @@ container: build: '[% !c("var/generate_gradle_dependencies_list") %]' var: - # This should be updated when the list of gradle dependencies is changed. - gradle_dependencies_version: 66.1.1-1 gradle_version: 8.14.3 # Uncomment this to run an online build to grab an updated # gradle-dependencies-list.txt. @@ -49,6 +47,8 @@ steps: pkg_type: cargo_vendor norec: sha256sum: 417e8e09a7fbe3205827dfa518bfc4a7a08f1869e6d4fd9edf5d8f3f1f48061a + - filename: gradle-dependencies-list.txt + name: gradle-dependencies-list - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]' name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]' ===================================== projects/glean/gradle-dependencies-list.txt ===================================== @@ -1,4 +1,3 @@ -# Don't forget to update var/gradle_dependencies_version when modifying this file sha256sum | url 6bd4c7c7476f8260cd3bdbb81183583e93fc9f790c27dea7dc314181cbf87aa0 | https://dl.google.com/dl/android/maven2/androidx/annotation/annotation-expe… 2ac2f7106e12f263425b4a4dfc80989447fb895675fe902d86759aa74fd12b7d | https://dl.google.com/dl/android/maven2/androidx/annotation/annotation-expe… ===================================== projects/oss-licenses-plugin/config ===================================== @@ -4,8 +4,6 @@ git_hash: 185216f8268f8b1f8bfe2377ed3e57aa73b1121c # oss-licenses-plugin-v0.10.7 git_url: https://github.com/google/play-services-plugins.git var: - # This should be updated when the list of gradle dependencies is changed. - gradle_dependencies_version: 2 gradle_version: 8.14.3 container: @@ -15,6 +13,8 @@ input_files: - project: container-image - project: gradle name: gradle + - filename: gradle-dependencies-list.txt + name: gradle-dependencies-list - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]' name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]' ===================================== projects/oss-licenses-plugin/gradle-dependencies-list.txt ===================================== @@ -1,5 +1,4 @@ # On how to update dependencies see doc/how-to-create-gradle-dependencies-list.txt -# Don't forget to update var/gradle_dependencies_version when modifying this file sha256sum | url 33c839e4236eabde3896c154d120d651e72064f393e456297c92041d00cc058e | https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/7.1.… 67a8f20626121a8e4f48fc63a392c0459173a9992eb35cc9c9c3ec82b882862c | https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/7.1.… ===================================== rbm ===================================== @@ -1 +1 @@ -Subproject commit 36608a50ccf8feedcd03eb846c606718f5ef2d6b +Subproject commit 4c881eb45291e323dcf4e4f1ae7eabed045ea8a3 ===================================== rbm.conf ===================================== @@ -155,7 +155,7 @@ var: input_files: [% c("input_files_id") %] build: [% SET step = c("step") -%] - [% c(step, { filename => 'f', output_dir => '/out', norec => {} }) %] + [% c(step, { filename => 'f', getting_id => 1, norec => {} }) %] display_name: '[% c("var/Project_Name") %] [% c("var/channel") FILTER ucfirst %]' exe_name: firefox @@ -300,6 +300,8 @@ var: # be enabled in rbm.local.conf. dev_artifacts: 0 + gradle_dependencies_version: '[% c("input_files_ids_by_name/gradle-dependencies-list").split(":").1.substr(0, 15) %]' + targets: notarget: linux-x86_64 noint: ===================================== tools/fix_gradle_deps.py ===================================== @@ -14,13 +14,12 @@ import requests # See https://gitlab.torproject.org/tpo/tpa/team/-/issues/41654. requests.packages.urllib3.util.connection.HAS_IPV6 = False -if len(sys.argv) < 3: +if len(sys.argv) < 2: print( - f"Usage: {sys.argv[0]} project-name gradle-dep-num" + f"Usage: {sys.argv[0]} project-name" ) sys.exit(1) target = sys.argv[1] -target_ver = sys.argv[2] # We assume the script is in tor-browser-build/tools tbbuild = Path(__file__).parent.parent @@ -38,14 +37,18 @@ for p in java_projects: parser = re.compile(r"^([0-9a-fA-F]+)\s+\|\s+(\S+)\s*$") pairs = [] +h = hashlib.sha256() with open(tbbuild / "projects" / target / "gradle-dependencies-list.txt") as f: for line in f.readlines(): + h.update(line.encode("utf-8")) line = line.strip() if line[0] == '#' or line == 'sha256sum | url': continue m = parser.match(line) pairs.append((m.group(2), m.group(1))) +target_ver = h.hexdigest()[:15] + dest_dir = tbbuild / "out" / target / f"gradle-dependencies-{target_ver}" dest_dir.mkdir(parents=True, exist_ok=True) os.chdir(str(dest_dir)) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/rbm][main] Bug 40093: Add option to get the checksum of an input file
by boklm (＠boklm) 09 Feb '26

09 Feb '26

boklm pushed to branch main at The Tor Project / Applications / RBM Commits: 4c881eb4 by Nicolas Vigier at 2026-01-28T09:51:39+01:00 Bug 40093: Add option to get the checksum of an input file input_files_ids_by_name/$name can be used to get the id (sha256sum or sha512sum) of an input file. At the same time we remove the notmpl option for simplification, which we have not used. We can add it back later in case it is useful. - - - - - 5 changed files: - doc/rbm_config.asc - doc/rbm_input_files.asc - doc/rbm_templates.asc - lib/RBM.pm - lib/RBM/DefaultConfig.pm Changes: ===================================== doc/rbm_config.asc ===================================== @@ -246,8 +246,17 @@ input_files_by_name:: with their +name+ as index. The input files without a +name+ are not in this hash. +input_files_ids_by_name:: + This option contains the ids (hashes) of all the +input_files+, + with their +name+ as index. The id of an input file will be the + value of the option +input_file_id+ if it is defined, or + +filename:hash+, where +filename+ is the filename of the file, + and +hash+ is the sha512sum if the +sha512sum+ option is defined, + the sha256sum otherwise. This option does not work for input + files of type +project+, +exec+ or +content+. + input_files_id:: - The value of this option is an identifier of the input_files. + The value of this option is a single identifier of all the input_files. When any of the input files is changed, the identifier changes. This identifier is something that can be used in a project's filename to trigger a rebuild when any of its input files is @@ -280,11 +289,6 @@ timestamp:: commit time of the commit used. If set to 0 it will use the current time. -notmpl:: - An array containing a list of options that should not be - processed as template (see the +template+ section below for - details). - step:: The value of this option is the name of the build script we are going to be running (by default 'build', but you could have an ===================================== doc/rbm_input_files.asc ===================================== @@ -53,7 +53,7 @@ filename:: name:: Optionaly the input_file can have a name. This name is used as - key in the +input_files_by_name+ option. + key in the +input_files_by_name+ and +input_files_ids_by_name+ options. content:: The content of the file. ===================================== doc/rbm_templates.asc ===================================== @@ -15,10 +15,7 @@ however, for the options that are needed to process templates, so they can't be templated themself. The following options are not templated : - projects_dir - -If you want to make other options not templated, add them to the -+notmpl+ config option, which is an array. All the other options are -automatically processed as template. + - modules_dir The template are made using perl Template Toolkit. You can read more about the syntax on the http://www.template-toolkit.org/[Template ===================================== lib/RBM.pm ===================================== @@ -237,11 +237,8 @@ sub config { } sub notmpl { - my ($name, $project) = @_; - return 1 if $name eq 'notmpl'; - my @n = (@{$config->{default}{notmpl}}, - @{project_config($project, 'notmpl')}); - return grep { $name eq $_ } @n; + my ($name) = @_; + return grep { $name eq $_ } @{$config->{default}{notmpl}}; } sub confkey_str { @@ -282,9 +279,13 @@ sub project_config { ['run'], $project_path, ['local'], [], @modules, ['system'], ['default']); if (!$options->{no_tmpl} && defined($res) && !ref $res - && !notmpl(confkey_str($name), $project)) { - $res = process_template($project, $res, - confkey_str($name) eq 'output_dir' ? '.' : undef); + && !notmpl(confkey_str($name))) { + my $output_dir = undef; + if (confkey_str($name) eq 'output_dir' || + confkey_str($name) eq 'getting_id_value/output_dir') { + $output_dir = '.'; + } + $res = process_template($project, $res, $output_dir); } $config_cache{$project}{$step}{$name_str}{$cache_id} = $res; $config->{opt} = $opt_save; @@ -733,7 +734,7 @@ sub process_template { } return $res; } - $dest_dir //= rbm_path(project_config($project, 'output_dir')); + $dest_dir //= rbm_path(project_config($project, 'getting_id_value/output_dir')); my $project_dir = modules_project_dir($project); my $common_dirs = join(':', modules_common_dirs($project)); my $template = Template->new( @@ -823,7 +824,7 @@ sub input_file_need_dl { $fname = undef; } } - if ($action eq 'input_files_id') { + if ($action eq 'input_files_id' || $action eq 'getfids') { return undef if $input_file->{input_file_id}; for my $checksum (qw/sha512sum sha256sum/) { if ( ($input_file->{$checksum} || $input_file->{norec}{$checksum}) @@ -861,7 +862,7 @@ sub input_file_id { return $filename . ':' . $t->($checksum); } } - my $opts = { norec => { output_dir => '/out', getting_id => 1, }}; + my $opts = { norec => { getting_id => 1, }}; return $filename . ':' . sha256_hex($t->('exec', $opts)) if $input_file->{exec}; shafile('sha256sum', $fname, { remove_cache => 1 }) if $t->('refresh_input'); @@ -923,6 +924,7 @@ sub input_files { my @res_copy; my %res_getfnames; my @res_getfpaths; + my %res_getfids; my $getfnames_noname = 0; my $input_files_id = ''; $options = {$options ? %$options : ()}; @@ -1016,6 +1018,11 @@ sub input_files { }; next; } + if ($action eq 'getfids') { + next if $input_file->{project}; + next if $input_file->{exec}; + next if $input_file->{content}; + } my $proj_out_dir; if ($input_file->{project}) { $proj_out_dir = rbm_path(project_step_config($t->('project'), 'output_dir', @@ -1038,38 +1045,51 @@ sub input_files { my ($fname) = file_in_dir($name, $src_dir, $proj_out_dir, @modules_common_dirs); my $file_gpg_id = gpg_id($t->('file_gpg_id')); + my $dl_file = sub {}; if (input_file_need_dl($input_file, $t, $fname, $action)) { - if ($t->('content')) { - my $dname = dirname("$proj_out_dir/$name"); - make_path($dname) unless -d $dname; - path("$proj_out_dir/$name")->spew_utf8($t->('content')); - } elsif ($t->('URL')) { - urlget($project, {%$options, %$input_file, filename => $name}, 1); - } elsif ($t->('exec')) { - my $exec_script = project_config($project, 'exec', - { $options ? %$options : (), %$input_file }); - if (run_script($project, $exec_script, - sub { system(@_) }) != 0) { - exit_error "Error creating $name"; + $dl_file = sub { + if ($t->('content')) { + my $dname = dirname("$proj_out_dir/$name"); + make_path($dname) unless -d $dname; + path("$proj_out_dir/$name")->spew_utf8($t->('content')); + } elsif ($t->('URL')) { + urlget($project, {%$options, %$input_file, filename => $name}, 1); + } elsif ($t->('exec')) { + my $exec_script = project_config($project, 'exec', + { $options ? %$options : (), %$input_file }); + if (run_script($project, $exec_script, + sub { system(@_) }) != 0) { + exit_error "Error creating $name"; + } + } elsif ($input_file->{project} && $t->('project')) { + my $p = $t->('project'); + print "Building project $p - $name\n"; + my $run_save = $config->{run}; + $config->{run} = { target => $input_file->{target} }; + $config->{run}{target} //= $run_save->{target}; + build_pkg($p, {%$options, origin_project => $project, + %$input_file}); + $config->{run} = $run_save; + print "Finished build of project $p - $name\n"; + } else { + dd $input_file; + exit_error "Missing file $name"; } - } elsif ($input_file->{project} && $t->('project')) { - my $p = $t->('project'); - print "Building project $p - $name\n"; - my $run_save = $config->{run}; - $config->{run} = { target => $input_file->{target} }; - $config->{run}{target} //= $run_save->{target}; - build_pkg($p, {%$options, origin_project => $project, - %$input_file}); - $config->{run} = $run_save; - print "Finished build of project $p - $name\n"; - } else { - dd $input_file; - exit_error "Missing file $name"; + ($fname) = file_in_dir($name, $src_dir, $proj_out_dir, + @modules_common_dirs); + exit_error "Error getting file $name" unless $fname; } - ($fname) = file_in_dir($name, $src_dir, $proj_out_dir, - @modules_common_dirs); - exit_error "Error getting file $name" unless $fname; } + if ($action eq 'getfids') { + my $if_name = $t->('name') if $input_file->{name}; + next unless $if_name; + $res_getfids{$if_name} = sub { + $dl_file->(); + return input_file_id($input_file, $t, $fname, $name); + }; + next; + } + $dl_file->(); if ($action eq 'input_files_id') { $input_files_id .= input_file_id($input_file, $t, $fname, $name); $input_files_id .= "\n"; @@ -1145,6 +1165,7 @@ sub input_files { return @res_copy if ($action eq 'copy' || $action eq 'link'); return \%res_getfnames if $action eq 'getfnames'; return \@res_getfpaths if $action eq 'getfpaths'; + return \%res_getfids if $action eq 'getfids'; } sub system_log { ===================================== lib/RBM/DefaultConfig.pm ===================================== @@ -114,6 +114,12 @@ our %default_config = ( projects_dir => 'projects', modules_dir => 'modules', output_dir => 'out', + # `getting_id_value/output_dir` is used as `output_dir` when processing + # template. To avoid having ids being affected by changing `output_dir`, + # a fixed value is returned when `getting_id` is set. + getting_id_value => { + output_dir => '[% IF c("getting_id"); GET "/out"; ELSE; GET c("output_dir"); END %]', + }, git_clone_dir => 'git_clones', hg_clone_dir => 'hg_clones', hg_clone_subdir => '.', @@ -122,7 +128,7 @@ our %default_config = ( build => '[% INCLUDE build -%]', build_log => '-', build_log_append => '1', - notmpl => [ qw(projects_dir modules_dir) ], + notmpl => [ qw(projects_dir modules_dir getting_id) ], abbrev_length => '12', abbrev => '[% IF c("git_url"); @@ -626,6 +632,7 @@ ZIP_END touch => "[% USE date %]touch -m -t [% date.format(c('timestamp'), format = '%Y%m%d%H%M') %]", arch => \&get_arch, input_files_by_name => sub { RBM::input_files('getfnames', @_); }, + input_files_ids_by_name => sub { RBM::input_files('getfids', @_); }, input_files_id => sub { RBM::input_files('input_files_id', @_); }, input_files_paths => sub { RBM::input_files('getfpaths', @_); }, link_input_files => '[% IF c("remote_exec") %]1[% END %]', View it on GitLab: https://gitlab.torproject.org/tpo/applications/rbm/-/commit/4c881eb45291e32… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/rbm/-/commit/4c881eb45291e32… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41718: Updated Noto Emoji to v2.051.
by Pier Angelo Vendrame (＠pierov) 09 Feb '26

09 Feb '26

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 04871e60 by Pier Angelo Vendrame at 2026-02-05T14:53:57+01:00 Bug 41718: Updated Noto Emoji to v2.051. Also, cleaned up a few URLs of other fonts. Since we check the hash of the downloaded files, we can include the tag in GitHub URLs. - - - - - 1 changed file: - projects/fonts/config Changes: ===================================== projects/fonts/config ===================================== @@ -1,12 +1,14 @@ # vim: filetype=yaml sw=2 +# Version needs to be updated whenever we change the list of Noto fonts without +# changing var/noto_git_hash. version: '4' filename: "[% project %]-[% c('version') %]-[% c('var/platform') %]-[% c('var/build_id') %].tar.[% c('compress_tar') %]" container: # We just copy files around, no need to use a container. use_container: 0 var: - # noto-monthly-release-24.9.1 - noto_git_hash: eeb71fdda20300eb0891badeed5e64850e2cbc64 + # noto-monthly-release-2026.02.01 + noto_git_hash: 0dd6225462349adf863bf50d1a69ead98342e14d # Use this way so that the script that downloads the fonts can access the # lists of all the targets. noto_fonts_common: @@ -175,26 +177,25 @@ input_files: - URL: https://github.com/notofonts/noto-fonts/raw/71d0a9e78ae4257499cabd4a8ad3e5e… sha256sum: cf264a22292950ca1679b2ade07e9e6ecb26c649ab70975d0e113f979efa827a enable: '[% c("var/linux") %]' - # Noto Sans CJK Version 2.004 - - URL: https://github.com/googlefonts/noto-cjk/raw/523d033d6cb47f4a80c58a35753646f… + - URL: https://github.com/googlefonts/noto-cjk/raw/Sans2.004/Sans/SubsetOTF/JP/Not… sha256sum: dff723ba59d57d136764a04b9b2d03205544f7cd785a711442d6d2d085ac5073 enable: '[% c("var/linux") %]' - - URL: https://github.com/googlefonts/noto-cjk/raw/523d033d6cb47f4a80c58a35753646f… + - URL: https://github.com/googlefonts/noto-cjk/raw/Sans2.004/Sans/SubsetOTF/KR/Not… sha256sum: 69975a0ac8472717870aefeab0a4d52739308d90856b9955313b2ad5e0148d68 enable: '[% c("var/linux") %]' - - URL: https://github.com/googlefonts/noto-cjk/raw/523d033d6cb47f4a80c58a35753646f… + - URL: https://github.com/googlefonts/noto-cjk/raw/Sans2.004/Sans/SubsetOTF/SC/Not… sha256sum: faa6c9df652116dde789d351359f3d7e5d2285a2b2a1f04a2d7244df706d5ea9 enable: '[% c("var/linux") %]' - - URL: https://github.com/googlefonts/noto-cjk/raw/523d033d6cb47f4a80c58a35753646f… + - URL: https://github.com/googlefonts/noto-cjk/raw/Sans2.004/Sans/SubsetOTF/TC/Not… sha256sum: 5bab0cb3c1cf89dde07c4a95a4054b195afbcfe784d69d75c340780712237537 enable: '[% c("var/linux") %]' - - URL: https://github.com/googlefonts/noto-emoji/raw/b3e3051a088047d19fd4d49b1c3ac… - sha256sum: 3ed77810c203e1a67735dc19d395f32c23f2d7c0c3696690f4f78e15e57ab816 + - URL: https://github.com/googlefonts/noto-emoji/raw/v2.051/fonts/NotoColorEmoji.t… + sha256sum: 72a635cb3d2f3524c51620cdde406b217204e8a6a06c6a096ff8ed4b5fd6e27b enable: '[% c("var/linux") %]' - URL: https://github.com/stipub/stixfonts/raw/v2.13b171/fonts/static_otf/STIXTwoM… sha256sum: 3a5f3f26f40d5698b3c62dd085d48d6663696a3f80825aab8b553d5097518e8c name: stix enable: '[% c("var/have_stix") %]' - - URL: 'https://github.com/mcfnlp/Pyidaungsu/raw/refs/heads/master/Pyidaungsu2.5.3/…' + - URL: 'https://github.com/mcfnlp/Pyidaungsu/raw/refs/heads/ff1cd8dfe8c451244329d7a…' sha256sum: df7106c15da76f6a24c10821b43da51f54961f6bc6791fb1fcf21c6c60bb2e10 name: Pyidaungsu View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-147.0a1-16.0-2] fixup! BB 43564: Modify ./mach bootstrap for Base Browser
by brizental (＠brizental) 06 Feb '26

06 Feb '26

brizental pushed to branch base-browser-147.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: f5d1594c by Beatriz Rizental at 2026-02-06T17:10:35-03:00 fixup! BB 43564: Modify ./mach bootstrap for Base Browser - - - - - 1 changed file: - build/moz.configure/bootstrap.configure Changes: ===================================== build/moz.configure/bootstrap.configure ===================================== @@ -198,7 +198,7 @@ def bootstrap_path(path, **kwargs): path_prefix = path_parts.pop(0) # Small hack because extensions are inside the browser folder. - if path_parts[0] in ("noscript", ): + if path_parts[0] in ("noscript",): path_prefix = "browser" def try_tbb_bootstrap(exists): View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f5d1594… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f5d1594… You're receiving this email because of your account on gitlab.torproject.org.

1 0