Merge mozilla-central to inbound

dom/ipc/ContentParent.cpp

@@ -2963,9 +2963,6 @@ ContentParent::Observe(nsISupports* aSubject,
 #ifdef ACCESSIBILITY
   else if (aData && !strcmp(aTopic, "a11y-init-or-shutdown")) {
     if (*aData == '1') {
-      // Shut down the preallocated process manager to avoid recycled
-      // content processes.
-      PreallocatedProcessManager::Disable();
       // Make sure accessibility is running in content process when
       // accessibility gets initiated in chrome process.
 #if defined(XP_WIN)

dom/ipc/PreallocatedProcessManager.cpp

@@ -43,7 +43,6 @@ public:
   void RemoveBlocker(ContentParent* aParent);
   already_AddRefed<ContentParent> Take();
   bool Provide(ContentParent* aParent);
-  void Disable();
 
 private:
   static mozilla::StaticRefPtr<PreallocatedProcessManagerImpl> sSingleton;
@@ -61,6 +60,7 @@ private:
 
   void RereadPrefs();
   void Enable();
+  void Disable();
   void CloseProcess();
 
   void ObserveProcessShutdown(nsISupports* aSubject);
@@ -335,10 +335,4 @@ PreallocatedProcessManager::Provide(ContentParent* aParent)
   return GetPPMImpl()->Provide(aParent);
 }
 
-/* static */ void
-PreallocatedProcessManager::Disable()
-{
-  GetPPMImpl()->Disable();
-}
-
 } // namespace mozilla

dom/ipc/PreallocatedProcessManager.h

@@ -55,20 +55,8 @@ public:
    */
   static already_AddRefed<ContentParent> Take();
 
-  /**
-   * ContentParent entry point for recycling existing content processes that are
-   * no longer in use. This class currently only caches one instance. It is safe
-   * to call this repeatedly with the same process.
-   *
-   * @returns boolean indicating if aParent is cached for reuse.
-   */
   static bool Provide(ContentParent* aParent);
 
-  /**
-   * Disables this service and discards any cached content processes.
-   */
-  static void Disable();
-
 private:
   PreallocatedProcessManager();
   DISALLOW_EVIL_CONSTRUCTORS(PreallocatedProcessManager);

security/manager/ssl/StaticHPKPins.h

@@ -1163,4 +1163,4 @@ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = {
 
 static const int32_t kUnknownId = -1;
 
-static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1531773471822000);
+static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1531860692565000);

taskcluster/taskgraph/util/scriptworker.py

@@ -40,11 +40,13 @@ This is a list of list-pairs, for ordering.
 SIGNING_SCOPE_ALIAS_TO_PROJECT = [[
     'all-nightly-branches', set([
         'mozilla-central',
+        'comm-central',
     ])
 ], [
     'all-release-branches', set([
         'mozilla-beta',
         'mozilla-release',
+        'comm-beta',
     ])
 ]]