mozilla · lissyx · Jan 12, 2026 · Jan 8, 2026 · Jan 8, 2026 · Jan 8, 2026
diff --git a/.cargo/config.toml.in b/.cargo/config.toml.in
@@ -75,11 +75,6 @@ git = "https://github.com/jfkthame/mapped_hyph.git"
 rev = "eff105f6ad7ec9b79816cfc1985a28e5340ad14b"
 replace-with = "vendored-sources"
 
-[source."git+https://github.com/martinthomson/ohttp.git?rev=bf6a983845cc0b540effb3a615e92d914dfcfd0b"]
-git = "https://github.com/martinthomson/ohttp.git"
-rev = "bf6a983845cc0b540effb3a615e92d914dfcfd0b"
-replace-with = "vendored-sources"
-
 [source."git+https://github.com/mozilla/application-services?rev=0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2"]
 git = "https://github.com/mozilla/application-services"
 rev = "0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2"

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -266,12 +266,6 @@ objc = { git = "https://github.com/glandium/rust-objc", rev = "4de89f5aa9851ceca
 # allocator-api2 + f95e3419ce41883904fcb2279b52aa35b5f04d76 + fdd92751afa7ce34408b677004b429d597e72c90
 allocator-api2 = { git = "https://github.com/glandium/allocator-api2", rev = "ad5f3d56a5a4519eff52af4ff85293431466ef5c" }
 
-# patch ohttp - app-services relies on a version yet to be released. However, even if a new version was released it
-# will have bumped the `toml` crate to a version which would cause dupes here. We should remove this and revert back
-# to a published version when we can upgrade both a-s and m-c to the same version.
-ohttp = { git = "https://github.com/martinthomson/ohttp.git", rev = "bf6a983845cc0b540effb3a615e92d914dfcfd0b" }
-bhttp = { git = "https://github.com/martinthomson/ohttp.git", rev = "bf6a983845cc0b540effb3a615e92d914dfcfd0b" }
-
 # application-services overrides to make updating them all simpler.
 context_id = { git = "https://github.com/mozilla/application-services", rev = "0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2" }
 error-support = { git = "https://github.com/mozilla/application-services", rev = "0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2" }

diff --git a/accessible/tests/browser/windows/a11y_setup.py b/accessible/tests/browser/windows/a11y_setup.py
@@ -2,8 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-"""Python environment for Windows a11y browser tests.
-"""
+"""Python environment for Windows a11y browser tests."""
 
 import ctypes
 import os

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
@@ -681,7 +681,7 @@ pref("browser.urlbar.merino.ohttpConfigURL", "");
 pref("browser.urlbar.merino.ohttpRelayURL", "");
 
 // OHTTP hpke for DAP
-pref("dap.ohttp.hpke", "https://dap-09-3.api.divviup.org/ohttp-configs");
+pref("dap.ohttp.hpke", "gAAgJSO22Y3HKzRSese15JtQVuuFfOIcTrZ56lQ5kDQwS0oABAABAAE");
 
 // OHTTP relay URL for DAP
 pref("dap.ohttp.relayURL", "https://mozilla-ohttp-dap.mozilla.fastly-edge.com/");
@@ -2271,6 +2271,7 @@ pref("browser.aiwindow.memoriesLogLevel", "Warn");
 pref("browser.aiwindow.firstrun.autoAdvanceMS", 3000);
 pref("browser.aiwindow.firstrun.modelChoice", "");
 pref("browser.aiwindow.model", "qwen3-235b-a22b-instruct-2507-maas");
+pref("browser.aiwindow.preferences.enabled", false);
 
 // Block insecure active content on https pages
 pref("security.mixed_content.block_active_content", true);

diff --git a/browser/base/content/browser-trustPanel.js b/browser/base/content/browser-trustPanel.js
@@ -321,17 +321,19 @@ class TrustPanel {
       icon.classList.add("inactive");
     }
 
+    icon.setAttribute("tooltiptext", this.#tooltipText());
     icon.classList.toggle("chickletShown", this.#isSecureInternalUI);
   }
 
   async #updatePopup() {
-    this.#host = BrowserUtils.formatURIForDisplay(this.#uri, {
-      onlyBaseDomain: true,
-    });
-    this.#popup.setAttribute(
-      "connection",
-      this.#isSecurePage() ? "secure" : "not-secure"
-    );
+    if (this.#uri) {
+      this.#host = BrowserUtils.formatURIForDisplay(this.#uri, {
+        onlyBaseDomain: true,
+      });
+    } else {
+      this.#host = "";
+    }
+    this.#popup.setAttribute("connection", this.#connectionState());
     this.#popup.setAttribute(
       "tracking-protection",
       this.#trackingProtectionStatus()
@@ -863,7 +865,7 @@ class TrustPanel {
     if (this.#isEV) {
       let iData = this.#getIdentityData();
       owner = iData.subjectOrg;
-      verifier = this._identityIconLabel.tooltipText;
+      verifier = this.#tooltipText();
 
       // Build an appropriate supplemental block out of whatever location data we have
       if (iData.city) {

diff --git a/browser/base/content/navigator-toolbox.inc.xhtml b/browser/base/content/navigator-toolbox.inc.xhtml
@@ -339,11 +339,12 @@
                       data-l10n-id="urlbar-search-mode-indicator-close"/>
           </html:div>
 
-          <hbox class="urlbar-revert-button-container" urlbar-slot="revert-button">
+          <hbox id="urlbar-revert-button-container" urlbar-slot="revert-button">
             <toolbartabstop/>
-            <image class="urlbar-icon urlbar-revert-button"
-                    role="button"
-                    data-l10n-id="urlbar-revert-button"/>
+            <image id="urlbar-revert-button"
+                   class="urlbar-icon urlbar-revert-button"
+                   role="button"
+                   data-l10n-id="urlbar-revert-button"/>
           </hbox>
 
           <hbox id="page-action-buttons" context="pageActionContextMenu" align="center" urlbar-slot="page-actions">

diff --git a/browser/base/content/test/about/browser.toml b/browser/base/content/test/about/browser.toml
@@ -137,3 +137,5 @@ skip-if = [
 ["browser_bug435325.js"]
 
 ["browser_bug633691.js"]
+
+["browser_bug2008464.js"]
diff --git a/browser/base/content/test/about/browser_bug2008464.js b/browser/base/content/test/about/browser_bug2008464.js
@@ -0,0 +1,58 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+"use strict";
+
+add_task(async function testHostnameDisplayedCorrectly() {
+  const { HttpServer } = ChromeUtils.importESModule(
+    "resource://testing-common/httpd.sys.mjs"
+  );
+
+  const server = new HttpServer();
+  registerCleanupFunction(() => new Promise(resolve => server.stop(resolve)));
+  server.registerPathHandler("/auth", (request, response) => {
+    response.setStatusLine(request.httpVersion, 401, "Unauthorized");
+    response.setHeader("WWW-Authenticate", 'Basic realm="test"', false);
+  });
+  server.start(-1);
+  const port = server.identity.primaryPort;
+  server.identity.add("http", "localhost", port);
+
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      ["dom.security.https_first", false],
+      ["network.http.basic_http_auth.enabled", false],
+      ["browser.http.blank_page_with_error_response.enabled", true],
+      ["security.certerrors.felt-privacy-v1", true],
+    ],
+  });
+  registerCleanupFunction(() => SpecialPowers.popPrefEnv());
+
+  const url = `http://localhost:${port}/auth`;
+  info(`Checking URL (${url}) against displayed hostname.`);
+  await BrowserTestUtils.withNewTab(
+    { gBrowser, url, waitForLoad: false },
+    async browser => {
+      await BrowserTestUtils.waitForErrorPage(browser);
+      await SpecialPowers.spawn(browser, [port], async p => {
+        const netErrorCard = await ContentTaskUtils.waitForCondition(
+          () =>
+            content.document.querySelector("net-error-card")?.wrappedJSObject
+        );
+        await netErrorCard.getUpdateComplete();
+
+        Assert.equal(
+          netErrorCard.errorInfo.errorCodeString,
+          "NS_ERROR_BASIC_HTTP_AUTH_DISABLED",
+          "Shows HTTP auth disabled error"
+        );
+        Assert.equal(
+          netErrorCard.hostname,
+          `localhost:${p}`,
+          "Hostname includes the port once"
+        );
+      });
+    }
+  );
+});
diff --git a/browser/base/content/test/static/browser_all_files_referenced.js b/browser/base/content/test/static/browser_all_files_referenced.js
@@ -328,14 +328,11 @@ var allowlist = [
   {
     file: "resource://app/modules/backup/CookiesBackupResource.sys.mjs",
   },
+
   // Bug 2000945 - Move query intent detection to AI-window r?mardak (backed out due to unused file)
   {
     file: "moz-src:///browser/components/aiwindow/models/IntentClassifier.sys.mjs",
   },
-  // Bug 2004888 - [FirstRun] Create Firstrun.html opening firstrun welcome screen
-  {
-    file: "chrome://browser/content/aiwindow/firstrun.html",
-  },
   // Bug 2005768 - Insights scheduler for generation from history
   // Bug 2007939 - Rename "insights" to "memories"
   {
@@ -350,6 +347,13 @@ var allowlist = [
   {
     file: "moz-src:///browser/components/aiwindow/models/ConversationSuggestions.sys.mjs",
   },
+  // Bug 1996315: QR code generation modules
+  {
+    file: "moz-src:///browser/components/qrcode/QRCodeGenerator.sys.mjs",
+  },
+  {
+    file: "moz-src:///browser/components/qrcode/QRCodeWorker.sys.mjs",
+  },
 ];
 
 if (AppConstants.NIGHTLY_BUILD) {

diff --git a/browser/components/aboutwelcome/content-src/components/EmbeddedMigrationWizard.jsx b/browser/components/aboutwelcome/content-src/components/EmbeddedMigrationWizard.jsx
@@ -4,9 +4,36 @@
 
 import React, { useEffect, useRef } from "react";
 
+/**
+ * Embeds a migration wizard component within About:Welcome,
+ * and passes configuration options from content to the migration-wizard element
+ *
+ * @param {function} handleAction - The action handler function that processes migration events
+ * @param {object} content - The content object that contains tiles configuration
+ * @param {object} content.tiles - The tiles configuration object
+ * @param {object} content.tiles.migration_wizard_options - Configuration options for the migration wizard
+ *   All options, including migration_wizard_options itself, are optional and have fallback values:
+ *   - {boolean} force_show_import_all - Whether to force show import all option
+ *   - {string} option_expander_title_string - Title string for the option expander
+ *   - {boolean} hide_option_expander_subtitle - Whether or not to hide the option expander subtitle
+ *   - {string} data_import_complete_success_string - Success message string after import completion
+ *   - {string} selection_header_string - Header string for the selection section
+ *   - {string} selection_subheader_string - Subheader string for the selection section
+ *   - {boolean} hide_select_all - Whether to hide the select all option
+ *   - {string} checkbox_margin_inline - Inline margin for checkboxes
+ *   - {string} checkbox_margin_block - Block margin for checkboxes
+ *   - {string} import_button_string - Text string for the import button
+ *   - {string} import_button_class - CSS class for the import button
+ *   - {string} header_font_size - Font size for the header
+ *   - {string} header_font_weight - Font weight for the header
+ *   - {string} header_margin_block - Block margin for the header
+ *   - {string} subheader_font_size - Font size for the subheader
+ *   - {string} subheader_font_weight - Font weight for the subheader
+ *   - {string} subheader_margin_block - Block margin for the subheader
+ */
 export const EmbeddedMigrationWizard = ({ handleAction, content }) => {
   const ref = useRef();
-  const options = content.migration_wizard_options;
+  const options = content.tiles?.migration_wizard_options;
   useEffect(() => {
     const handleBeginMigration = () => {
       handleAction({
@@ -44,7 +71,7 @@ export const EmbeddedMigrationWizard = ({ handleAction, content }) => {
       data-import-complete-success-string={
         options?.data_import_complete_success_string || ""
       }
-      selection-header-string={options?.selection_header_string}
+      selection-header-string={options?.selection_header_string || ""}
       selection-subheader-string={options?.selection_subheader_string || ""}
       hide-select-all={options?.hide_select_all || false}
       checkbox-margin-inline={options?.checkbox_margin_inline || ""}

diff --git a/browser/components/aboutwelcome/content/aboutwelcome.bundle.js b/browser/components/aboutwelcome/content/aboutwelcome.bundle.js
@@ -3344,12 +3344,40 @@ __webpack_require__.r(__webpack_exports__);
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 
+
+/**
+ * Embeds a migration wizard component within About:Welcome,
+ * and passes configuration options from content to the migration-wizard element
+ *
+ * @param {function} handleAction - The action handler function that processes migration events
+ * @param {object} content - The content object that contains tiles configuration
+ * @param {object} content.tiles - The tiles configuration object
+ * @param {object} content.tiles.migration_wizard_options - Configuration options for the migration wizard
+ *   All options, including migration_wizard_options itself, are optional and have fallback values:
+ *   - {boolean} force_show_import_all - Whether to force show import all option
+ *   - {string} option_expander_title_string - Title string for the option expander
+ *   - {boolean} hide_option_expander_subtitle - Whether or not to hide the option expander subtitle
+ *   - {string} data_import_complete_success_string - Success message string after import completion
+ *   - {string} selection_header_string - Header string for the selection section
+ *   - {string} selection_subheader_string - Subheader string for the selection section
+ *   - {boolean} hide_select_all - Whether to hide the select all option
+ *   - {string} checkbox_margin_inline - Inline margin for checkboxes
+ *   - {string} checkbox_margin_block - Block margin for checkboxes
+ *   - {string} import_button_string - Text string for the import button
+ *   - {string} import_button_class - CSS class for the import button
+ *   - {string} header_font_size - Font size for the header
+ *   - {string} header_font_weight - Font weight for the header
+ *   - {string} header_margin_block - Block margin for the header
+ *   - {string} subheader_font_size - Font size for the subheader
+ *   - {string} subheader_font_weight - Font weight for the subheader
+ *   - {string} subheader_margin_block - Block margin for the subheader
+ */
 const EmbeddedMigrationWizard = ({
   handleAction,
   content
 }) => {
   const ref = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)();
-  const options = content.migration_wizard_options;
+  const options = content.tiles?.migration_wizard_options;
   (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(() => {
     const handleBeginMigration = () => {
       handleAction({
@@ -3384,7 +3412,7 @@ const EmbeddedMigrationWizard = ({
     "option-expander-title-string": options?.option_expander_title_string || "",
     "hide-option-expander-subtitle": options?.hide_option_expander_subtitle || false,
     "data-import-complete-success-string": options?.data_import_complete_success_string || "",
-    "selection-header-string": options?.selection_header_string,
+    "selection-header-string": options?.selection_header_string || "",
     "selection-subheader-string": options?.selection_subheader_string || "",
     "hide-select-all": options?.hide_select_all || false,
     "checkbox-margin-inline": options?.checkbox_margin_inline || "",
Original file line number	Diff line number	Diff line change
Expand Up		@@ -137,3 +137,5 @@ skip-if = [
		["browser_bug435325.js"]

		["browser_bug633691.js"]

		["browser_bug2008464.js"]