Merge mozilla-central to autoland. a=merge

.hgtags

@@ -211,3 +211,5 @@ c27aac8c84b70e3611b04fc56927719419aefc64 FIREFOX_BETA_87_BASE
 a69c07c7da3a386e3baf4b7d604312d3fa974273 FIREFOX_NIGHTLY_89_END
 fafcc4a3b16a3b45f7abcc174e46bdc4a46888ca FIREFOX_BETA_90_BASE
 b724ec4440e0fec4dd6e02ac019f43b2e0b32f85 FIREFOX_NIGHTLY_90_END
+5dee15cf3f2810ccc3bb9ec24c652f6f9d72b62d FIREFOX_BETA_91_BASE
+41ae2b104b93c1779db0f34ba1c045e3e696898b FIREFOX_NIGHTLY_91_END

CLOBBER

@@ -22,4 +22,4 @@
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-Bug 1714933 - Update to ICU 69 requires clobber
+Merge day clobber

browser/config/version.txt

@@ -1 +1 @@
-91.0a1
+92.0a1

browser/config/version_display.txt

@@ -1 +1 @@
-91.0a1
+92.0a1

config/milestone.txt

@@ -10,4 +10,4 @@
 # hardcoded milestones in the tree from these two files.
 #--------------------------------------------------------
 
-91.0a1
+92.0a1

services/sync/modules/constants.js

@@ -7,7 +7,7 @@ var EXPORTED_SYMBOLS = [];
 for (let [key, val] of Object.entries({
   // Don't manually modify this line, as it is automatically replaced on merge day
   // by the gecko_migration.py script.
-  WEAVE_VERSION: "1.93.0",
+  WEAVE_VERSION: "1.94.0",
 
   // Sync Server API version that the client supports.
   SYNC_API_VERSION: "1.5",

xpcom/components/Module.h

@@ -21,7 +21,7 @@ namespace mozilla {
  * via a module loader.
  */
 struct Module {
-  static const unsigned int kVersion = 91;
+  static const unsigned int kVersion = 92;
 
   struct CIDEntry;