[tor-commits] [tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! Bug 4234: Use the Firefox Update Process for Tor Browser.

[gk at torproject.org]

commit 87b3cdb0862a4912b0c3318ad63954dbf42bc774
Author: Kathy Brade <brade at pearlcrescent.com>
Date:   Thu Sep 19 10:46:05 2019 -0400

    fixup! Bug 4234: Use the Firefox Update Process for Tor Browser.
---
 browser/app/profile/000-tor-browser.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js
index b2cecfdb1a82..10c31084adcc 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -23,12 +23,13 @@ pref("app.update.badge", true);
 pref("app.update.notifyDuringDownload", true);
 pref("extensions.hotfix.id", ""); // Bug 16837: Disable hotfix updates as they may cause compat issues
 
-// Disable staged updates on all platforms.
+#ifndef XP_MACOSX
+// Disable staged updates on platforms other than macOS.
 // Staged updates do not work on Windows due to #18292.
 // Also, on Windows and Linux any changes that are made to the browser profile
 // or Tor data after an update is staged will be lost.
-// What about macOS? For consistency, we disable staged updates there too.
 pref("app.update.staging.enabled", false);
+#endif
 
 // No need to contact the Kinto-based blocklist system in addition to the old
 // one which is still used, see bug 22071.