fixup! TB3: Tor Browser's official .mozconfigs.

Restore the changes taken away earlier.

moz.configure

@@ -1044,6 +1044,30 @@ def relative_data_dir(value, target):
 set_define("RELATIVE_DATA_DIR", relative_data_dir)
 
 
+# Tor Browser additions.
+
+# We always want Tor Browser to be defined. Since we do not need any
+# value for it, just always set it to True.
+set_define("TOR_BROWSER", True)
+
+
+option(
+    "--enable-tor-browser-update",
+    help="Enable Tor Browser update"
+)
+
+
+@depends("--enable-tor-browser-update")
+def tor_browser_update(value):
+    if value:
+        return True
+
+
+set_config("TOR_BROWSER_UPDATE", tor_browser_update)
+set_define("TOR_BROWSER_UPDATE", tor_browser_update)
+add_old_configure_assignment("TOR_BROWSER_UPDATE", tor_browser_update)
+
+
 # Please do not add configure checks from here on.
 
 # Fallthrough to autoconf-based configure

mozconfig-macos-x86_64

@@ -6,4 +6,3 @@ ac_add_options --enable-strip
 ac_add_options --disable-update-agent
 
 ac_add_options --with-relative-data-dir=../TorBrowser-Data/Browser
-ac_add_options --enable-tor-browser-data-outside-app-dir

toolkit/modules/AppConstants.jsm

@@ -460,6 +460,13 @@ this.AppConstants = Object.freeze({
     false,
 #endif
 
+  TOR_BROWSER_UPDATE:
+#ifdef TOR_BROWSER_UPDATE
+    true,
+#else
+    false,
+#endif
+
   // Returns true for CN region build when distibution id set as 'MozillaOnline'
   isChinaRepack() {
     return (