fixup! Bug 31740: Remove some unnecessary RemoteSettings instances

Bug 41628: Disable Nimbus and Normandy components at compile time

toolkit/components/moz.build

@@ -123,10 +123,9 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] != "android":
         "components.conf",
     ]
 
+# tor-browser#41628: Disable Normandy and Nimbus at compile time
 if CONFIG["MOZ_BUILD_APP"] == "browser":
-    DIRS += ["normandy", "messaging-system"]
-
-DIRS += ["nimbus"]
+    DIRS += ["messaging-system"]
 
 if CONFIG["MOZ_BACKGROUNDTASKS"]:
     DIRS += ["backgroundtasks"]