henry pushed to branch tor-browser-140.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 7ed4b70d by Henry Wilkes at 2025-07-16T18:08:29+01:00 fixup! TB 41668: Tweaks to the Base Browser updater for Tor Browser TB 42738: Move override logic to the about:tor commit. - - - - - 84a5fe09 by Henry Wilkes at 2025-07-16T18:08:30+01:00 fixup! TB 7494: Create local home page for TBB. TB 42738: Temporarily revert the about:tor changes to BrowserContentHandler.sys.mjs. - - - - - 0a4f89ea by Henry Wilkes at 2025-07-16T18:08:31+01:00 fixup! TB 7494: Create local home page for TBB. TB 43929: Update about:tor override page logic for ESR 140. Unlike ESR 128, we do not try and move the startPage logic to earlier in the method since it would complicate the patch and upstream's logic. Instead, we delay out duplicate about:tor logic until the end of the method. - - - - - 1 changed file: - browser/components/BrowserContentHandler.sys.mjs Changes: ===================================== browser/components/BrowserContentHandler.sys.mjs ===================================== @@ -781,6 +781,7 @@ nsBrowserContentHandler.prototype = { var overridePage = ""; var additionalPage = ""; var willRestoreSession = false; + let openAboutTor = false; try { // Read the old value of homepage_override.mstone before // needHomepageOverride updates it, so that we can later add it to the @@ -980,16 +981,14 @@ nsBrowserContentHandler.prototype = { // Tor Browser: Instead of opening the post-update "override page" // directly, we ensure that about:tor will be opened, which should // notify the user that their browser was updated. - // NOTE: We ignore any overridePage value, which can come from the - // openURL attribute within the updates.xml file. + // NOTE: We ignore any existing overridePage value, which can come + // from the openURL attribute within the updates.xml file. Services.prefs.setBoolPref( "torbrowser.post_update.shouldNotify", true ); - // If the user's homepage is about:tor, we will inform them - // about the update on that page; otherwise, we arrange to - // open about:tor in a secondary tab. - overridePage = startPage === "about:tor" ? "" : "about:tor"; + openAboutTor = true; + overridePage = "about:tor"; } break; } @@ -1090,6 +1089,16 @@ nsBrowserContentHandler.prototype = { startPage = ""; } + // If the user's homepage is about:tor, we do not want to open it twice with + // the override. + if ( + openAboutTor && + startPage === "about:tor" && + overridePage?.split("|").includes("about:tor") + ) { + startPage = ""; + } + // Only show the startPage if we're not restoring an update session and are // not set to skip the start page on this profile if (overridePage && startPage && !willRestoreSession && !skipStartPage) { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/ac068db... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/ac068db... You're receiving this email because of your account on gitlab.torproject.org.