[iceweasel] 111.0 Upstream updates and DDG fixes

1. Update patches according to changes from upstreams.
2. Rework DuckDuckGo patching to make it default search engine again and
   change method from GET to POST (see patch comment from
9004-FSDG-misc.patch)

1 files changed, 89 insertions, 75 deletions

diff --git a/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch b/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch
index 5e64a7f02..f1049cf7d 100644
--- a/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch
+++ b/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch
@@ -1,4 +1,4 @@
-From 7d313f93cebc14b7eb6fc1654b60a143b5cd7f52 Mon Sep 17 00:00:00 2001
+From 5ebd63727f5981043f872ca90f4b274e4b201e27 Mon Sep 17 00:00:00 2001
 From: grizzlyuser <grizzlyuser@protonmail.com>
 Date: Wed, 30 Dec 2020 17:20:39 +0200
 Subject: [PATCH 01/13] Point to local omni.ja files, not remote server
@@ -26,19 +26,20 @@ If necessary, missing files can be added later.
  .../newtab/data/content/activity-stream.bundle.js         | 2 +-
  services/settings/Utils.jsm                               | 2 +-
  .../periodic-updates/scripts/periodic_file_updates.sh     | 2 +-
+ .../components/antitracking/docs/query-stripping/index.md | 2 +-
  .../backgroundtasks/BackgroundTask_message.sys.mjs        | 4 ++--
  toolkit/components/search/SearchUtils.sys.mjs             | 8 ++++----
  toolkit/components/search/docs/DefaultSearchEngines.rst   | 2 +-
  .../components/search/docs/SearchEngineConfiguration.rst  | 2 +-
  toolkit/modules/AppConstants.sys.mjs                      | 4 ++--
  toolkit/mozapps/defaultagent/RemoteSettings.cpp           | 2 +-
- 10 files changed, 15 insertions(+), 15 deletions(-)
+ 11 files changed, 16 insertions(+), 16 deletions(-)
 
 diff --git a/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx b/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx
-index 17155bb4ba..859560e25b 100644
+index c4aa6a03e9..345abc1e71 100644
 --- a/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx
 +++ b/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx
-@@ -1237,7 +1237,7 @@ export class ASRouterAdminInner extends React.PureComponent {
+@@ -1240,7 +1240,7 @@ export class ASRouterAdminInner extends React.PureComponent {
                    <a
                      className="providerUrl"
                      target="_blank"
@@ -48,10 +49,10 @@ index 17155bb4ba..859560e25b 100644
                    >
                      nimbus-desktop-experiments
 diff --git a/browser/components/newtab/data/content/activity-stream.bundle.js b/browser/components/newtab/data/content/activity-stream.bundle.js
-index 159e948352..5cbe5ac2c2 100644
+index 3e3b7d7db3..17d27d0e47 100644
 --- a/browser/components/newtab/data/content/activity-stream.bundle.js
 +++ b/browser/components/newtab/data/content/activity-stream.bundle.js
-@@ -1593,7 +1593,7 @@ class ASRouterAdminInner extends (external_React_default()).PureComponent {
+@@ -1748,7 +1748,7 @@ class ASRouterAdminInner extends (external_React_default()).PureComponent {
          label = /*#__PURE__*/external_React_default().createElement("span", null, "remote settings (", /*#__PURE__*/external_React_default().createElement("a", {
            className: "providerUrl",
            target: "_blank",
@@ -61,10 +62,10 @@ index 159e948352..5cbe5ac2c2 100644
          }, "nimbus-desktop-experiments"), ")");
        }
 diff --git a/services/settings/Utils.jsm b/services/settings/Utils.jsm
-index 50114dfbbc..9d957283da 100644
+index 94f4713380..3a8165f878 100644
 --- a/services/settings/Utils.jsm
 +++ b/services/settings/Utils.jsm
-@@ -101,7 +101,7 @@ var Utils = {
+@@ -108,7 +108,7 @@ var Utils = {
        : AppConstants.REMOTE_SETTINGS_SERVER_URL;
    },
  
@@ -86,6 +87,19 @@ index b88ee476da..440615e4e1 100755
  
    # 1. List remote settings collections from server.
    echo "INFO: fetch remote settings list from server"
+diff --git a/toolkit/components/antitracking/docs/query-stripping/index.md b/toolkit/components/antitracking/docs/query-stripping/index.md
+index e49d8513ba..c1c6ae5deb 100644
+--- a/toolkit/components/antitracking/docs/query-stripping/index.md
++++ b/toolkit/components/antitracking/docs/query-stripping/index.md
+@@ -63,7 +63,7 @@ of query params:
+ It is enabled in Nightly by default in all modes with an extended
+ strip-list. You can find the current list of parameters that are
+ stripped
+-[here](https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/query-stripping/records).
++[here](resource://app/defaults/settings/main/collections/query-stripping/records).
+ Note that some records have a *filter\_expression* that limits where
+ they apply.
+ 
 diff --git a/toolkit/components/backgroundtasks/BackgroundTask_message.sys.mjs b/toolkit/components/backgroundtasks/BackgroundTask_message.sys.mjs
 index dbbfa53d39..11b93b07f2 100644
 --- a/toolkit/components/backgroundtasks/BackgroundTask_message.sys.mjs
@@ -102,7 +116,7 @@ index dbbfa53d39..11b93b07f2 100644
  // --preview: enable Remote Settings and Experiment previews.
  //
 diff --git a/toolkit/components/search/SearchUtils.sys.mjs b/toolkit/components/search/SearchUtils.sys.mjs
-index 65581754e8..4e7ccf48e4 100644
+index d519793560..94657f6828 100644
 --- a/toolkit/components/search/SearchUtils.sys.mjs
 +++ b/toolkit/components/search/SearchUtils.sys.mjs
 @@ -150,13 +150,13 @@ export var SearchUtils = {
@@ -145,10 +159,10 @@ index c782f9f7c3..4d773d27c5 100644
 +.. _viewed live: resource://app/defaults/settings/main/search-config.json
  .. _Normandy: /toolkit/components/normandy/normandy/services.html
 diff --git a/toolkit/modules/AppConstants.sys.mjs b/toolkit/modules/AppConstants.sys.mjs
-index 59ba540c6d..2b9ff5796b 100644
+index b430666f68..0f640980ae 100644
 --- a/toolkit/modules/AppConstants.sys.mjs
 +++ b/toolkit/modules/AppConstants.sys.mjs
-@@ -416,9 +416,9 @@ export var AppConstants = Object.freeze({
+@@ -409,9 +409,9 @@ export var AppConstants = Object.freeze({
  
    REMOTE_SETTINGS_SERVER_URL:
  #ifdef MOZ_THUNDERBIRD
@@ -174,10 +188,10 @@ index 667d9fc628..b2bf628f29 100644
  #define PROD_CID "windows-default-browser-agent"
  #define PROD_ID "state"
 -- 
-2.39.0
+2.39.2
 
 
-From 233227d0f2da317fe71a643b1c54d623f56f5d84 Mon Sep 17 00:00:00 2001
+From 32fdc1f6e70188788165d1b11bbf8d4793c17fc9 Mon Sep 17 00:00:00 2001
 From: grizzlyuser <grizzlyuser@protonmail.com>
 Date: Wed, 30 Dec 2020 17:34:08 +0200
 Subject: [PATCH 02/13] Remove polling triggered by push broadcasts
@@ -218,10 +232,10 @@ index cca80fee6c..c83b0f77d7 100644
     * Call the listeners of the specified broadcasts.
     *
 diff --git a/services/settings/remote-settings.js b/services/settings/remote-settings.js
-index c479de2a17..f797df533a 100644
+index 1ecadd51d3..da820a2de8 100644
 --- a/services/settings/remote-settings.js
 +++ b/services/settings/remote-settings.js
-@@ -582,11 +582,7 @@ function remoteSettingsFunction() {
+@@ -586,11 +586,7 @@ function remoteSettingsFunction() {
        moduleURI: __URI__,
        symbolName: "remoteSettingsBroadcastHandler",
      };
@@ -234,7 +248,7 @@ index c479de2a17..f797df533a 100644
    };
  
    return remoteSettings;
-@@ -606,9 +602,6 @@ var remoteSettingsBroadcastHandler = {
+@@ -610,9 +606,6 @@ var remoteSettingsBroadcastHandler = {
        `Push notification received (version=${version} phase=${phase})`
      );
  
@@ -246,10 +260,10 @@ index c479de2a17..f797df533a 100644
    },
  };
 -- 
-2.39.0
+2.39.2
 
 
-From c4bd08fa8614bcf212975f4c0b3555437e8a8d59 Mon Sep 17 00:00:00 2001
+From b02cc5ac855b3111ed99c9838af2a0664b79e186 Mon Sep 17 00:00:00 2001
 From: grizzlyuser <grizzlyuser@protonmail.com>
 Date: Wed, 30 Dec 2020 17:41:54 +0200
 Subject: [PATCH 03/13] Remove timer that triggers polling for changes
@@ -290,10 +304,10 @@ index 3bfed26ea4..807eb220ec 100644
 -# see syntax https://searchfox.org/mozilla-central/rev/cc280c4be94ff8cf64a27cc9b3d6831ffa49fa45/toolkit/components/timermanager/UpdateTimerManager.jsm#155
 -category update-timer RemoteSettingsComponents @mozilla.org/services/settings;1,getService,services-settings-poll-changes,services.settings.poll_interval,86400,259200
 -- 
-2.39.0
+2.39.2
 
 
-From b106c8b4e919e1d6c42f66bb07461c63848ebb2b Mon Sep 17 00:00:00 2001
+From 2e784bb89094a5bdbecf559eb16e4843dca7a72c Mon Sep 17 00:00:00 2001
 From: grizzlyuser <grizzlyuser@protonmail.com>
 Date: Wed, 30 Dec 2020 17:47:41 +0200
 Subject: [PATCH 04/13] Utils: fetch timestamps of each collection locally
@@ -324,10 +338,10 @@ index 9229a0bd0e..565a7b7508 100644
  
  ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)
 diff --git a/services/settings/Utils.jsm b/services/settings/Utils.jsm
-index 9d957283da..abdd0a53fa 100644
+index 3a8165f878..90922cc6ff 100644
 --- a/services/settings/Utils.jsm
 +++ b/services/settings/Utils.jsm
-@@ -370,7 +370,7 @@ var Utils = {
+@@ -377,7 +377,7 @@ var Utils = {
    async fetchLatestChanges(serverUrl, options = {}) {
      const { expectedTimestamp, lastEtag = "", filters = {} } = options;
  
@@ -336,7 +350,7 @@ index 9d957283da..abdd0a53fa 100644
      const params = {
        ...filters,
        _expected: expectedTimestamp ?? 0,
-@@ -385,7 +385,21 @@ var Utils = {
+@@ -392,7 +392,21 @@ var Utils = {
            .map(([k, v]) => `${k}=${encodeURIComponent(v)}`)
            .join("&");
      }
@@ -359,7 +373,7 @@ index 9d957283da..abdd0a53fa 100644
  
      if (response.status >= 500) {
        throw new Error(`Server error ${response.status} ${response.statusText}`);
-@@ -420,7 +434,15 @@ var Utils = {
+@@ -427,7 +441,15 @@ var Utils = {
        }
      }
  
@@ -378,7 +392,7 @@ index 9d957283da..abdd0a53fa 100644
      // Since the response is served via a CDN, the Date header value could have been cached.
 diff --git a/services/settings/dumps/monitor/moz.build b/services/settings/dumps/monitor/moz.build
 new file mode 100644
-index 0000000000..d3d017fda5
+index 0000000000..25c53a2eeb
 --- /dev/null
 +++ b/services/settings/dumps/monitor/moz.build
 @@ -0,0 +1,8 @@
@@ -403,10 +417,10 @@ index f407580bfa..53e9d8b45e 100644
  ]
  
 -- 
-2.39.0
+2.39.2
 
 
-From bd6216d755e4d1c1c8ebba4123732b0b2358101c Mon Sep 17 00:00:00 2001
+From b9f19c6068861e2fb4fac86bc6551354826594c7 Mon Sep 17 00:00:00 2001
 From: grizzlyuser <grizzlyuser@protonmail.com>
 Date: Wed, 30 Dec 2020 17:52:10 +0200
 Subject: [PATCH 05/13] Utils: disable offline checking
@@ -418,10 +432,10 @@ current and any future code that relies on it.
  1 file changed, 10 deletions(-)
 
 diff --git a/services/settings/Utils.jsm b/services/settings/Utils.jsm
-index abdd0a53fa..2cc3ba917b 100644
+index 90922cc6ff..a4a578a73a 100644
 --- a/services/settings/Utils.jsm
 +++ b/services/settings/Utils.jsm
-@@ -184,16 +184,6 @@ var Utils = {
+@@ -191,16 +191,6 @@ var Utils = {
     * @return {bool} Whether network is down or not.
     */
    get isOffline() {
@@ -439,10 +453,10 @@ index abdd0a53fa..2cc3ba917b 100644
    },
  
 -- 
-2.39.0
+2.39.2
 
 
-From 237ecd7acdd299b2f89787e4f5f50bb5cc4d970c Mon Sep 17 00:00:00 2001
+From 04c53d514c8a2016091d12043735be7be8ca13db Mon Sep 17 00:00:00 2001
 From: grizzlyuser <grizzlyuser@protonmail.com>
 Date: Wed, 30 Dec 2020 17:56:02 +0200
 Subject: [PATCH 06/13] Refactor hashing logic to a separate function
@@ -455,10 +469,10 @@ integrity checking of the locally cached data.
  2 files changed, 11 insertions(+), 2 deletions(-)
 
 diff --git a/services/settings/RemoteSettingsWorker.jsm b/services/settings/RemoteSettingsWorker.jsm
-index 57754f0a2b..0ae0c8762a 100644
+index b47ceff9d0..44560fd461 100644
 --- a/services/settings/RemoteSettingsWorker.jsm
 +++ b/services/settings/RemoteSettingsWorker.jsm
-@@ -191,6 +191,10 @@ class Worker {
+@@ -189,6 +189,10 @@ class Worker {
      // task on the current thread instead of the worker thread.
      return lazy.SharedUtils.checkContentHash(buffer, size, hash);
    }
@@ -493,10 +507,10 @@ index 9804e80c91..de67b0fb6f 100644
  
    /**
 -- 
-2.39.0
+2.39.2
 
 
-From afc7c3a747931dbd1ed02b5bc2af2fd29b607875 Mon Sep 17 00:00:00 2001
+From c36cecafd243aa049c0cff10b33af62aae29225e Mon Sep 17 00:00:00 2001
 From: grizzlyuser <grizzlyuser@protonmail.com>
 Date: Wed, 30 Dec 2020 18:05:02 +0200
 Subject: [PATCH 07/13] Client: Fetch and hash records from local dump
@@ -531,10 +545,10 @@ the upgrade to local-only setup.
  1 file changed, 28 insertions(+), 38 deletions(-)
 
 diff --git a/services/settings/RemoteSettingsClient.jsm b/services/settings/RemoteSettingsClient.jsm
-index 1d42fc98ff..c8a0898367 100644
+index 82b16c8a24..7ab9debe73 100644
 --- a/services/settings/RemoteSettingsClient.jsm
 +++ b/services/settings/RemoteSettingsClient.jsm
-@@ -692,11 +692,9 @@ class RemoteSettingsClient extends EventEmitter {
+@@ -711,11 +711,9 @@ class RemoteSettingsClient extends EventEmitter {
  
            // If the data is up-to-date but don't have metadata (records loaded from dump),
            // we fetch them and validate the signature immediately.
@@ -548,7 +562,7 @@ index 1d42fc98ff..c8a0898367 100644
              await this.db.importChanges(metadata);
              // We don't bother validating the signature if the dump was just loaded. We do
              // if the dump was loaded at some other point (eg. from .get()).
-@@ -959,38 +957,28 @@ class RemoteSettingsClient extends EventEmitter {
+@@ -992,38 +990,28 @@ class RemoteSettingsClient extends EventEmitter {
     * @returns {Promise}
     */
    async _validateCollectionSignature(records, timestamp, metadata) {
@@ -595,7 +609,7 @@ index 1d42fc98ff..c8a0898367 100644
      }
    }
  
-@@ -1160,24 +1148,26 @@ class RemoteSettingsClient extends EventEmitter {
+@@ -1193,24 +1181,26 @@ class RemoteSettingsClient extends EventEmitter {
     * @param since timestamp of last sync (optional)
     */
    async _fetchChangeset(expectedTimestamp, since) {
@@ -639,10 +653,10 @@ index 1d42fc98ff..c8a0898367 100644
        remoteRecords,
      };
 -- 
-2.39.0
+2.39.2
 
 
-From 3f0d975225fb9d786eb8b4ae303f49f96f8d91e1 Mon Sep 17 00:00:00 2001
+From c516024e544579c33f6df9008a4f7bd29bc6f6b6 Mon Sep 17 00:00:00 2001
 From: grizzlyuser <grizzlyuser@protonmail.com>
 Date: Wed, 30 Dec 2020 18:42:56 +0200
 Subject: [PATCH 08/13] Client: start deferred sync on get() or on()
@@ -664,7 +678,7 @@ occurs during the session.
  1 file changed, 26 insertions(+), 1 deletion(-)
 
 diff --git a/services/settings/RemoteSettingsClient.jsm b/services/settings/RemoteSettingsClient.jsm
-index c8a0898367..4b35ad0eef 100644
+index 7ab9debe73..39108bca89 100644
 --- a/services/settings/RemoteSettingsClient.jsm
 +++ b/services/settings/RemoteSettingsClient.jsm
 @@ -22,6 +22,7 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
@@ -683,7 +697,7 @@ index c8a0898367..4b35ad0eef 100644
  
  XPCOMUtils.defineLazyGetter(lazy, "console", () => lazy.Utils.log);
  
-@@ -324,6 +326,11 @@ class RemoteSettingsClient extends EventEmitter {
+@@ -343,6 +345,11 @@ class RemoteSettingsClient extends EventEmitter {
      this._lastCheckTimePref = lastCheckTimePref;
      this._verifier = null;
      this._syncRunning = false;
@@ -695,7 +709,7 @@ index c8a0898367..4b35ad0eef 100644
  
      // This attribute allows signature verification to be disabled, when running tests
      // or when pulling data from a dev server.
-@@ -353,6 +360,11 @@ class RemoteSettingsClient extends EventEmitter {
+@@ -372,6 +379,11 @@ class RemoteSettingsClient extends EventEmitter {
      this.db.identifier = this.identifier;
    }
  
@@ -707,7 +721,7 @@ index c8a0898367..4b35ad0eef 100644
    get identifier() {
      return `${this.bucketName}/${this.collectionName}`;
    }
-@@ -426,6 +438,10 @@ class RemoteSettingsClient extends EventEmitter {
+@@ -445,6 +457,10 @@ class RemoteSettingsClient extends EventEmitter {
        let lastModified = forceSync ? null : await this.db.getLastModified();
        let hasLocalData = lastModified !== null;
  
@@ -718,7 +732,7 @@ index c8a0898367..4b35ad0eef 100644
        if (forceSync) {
          if (!this._importingPromise) {
            this._importingPromise = (async () => {
-@@ -541,7 +557,10 @@ class RemoteSettingsClient extends EventEmitter {
+@@ -560,7 +576,10 @@ class RemoteSettingsClient extends EventEmitter {
        // No need to verify signature on JSON dumps.
        // If local DB cannot be read, then we don't even try to do anything,
        // we return results early.
@@ -730,7 +744,7 @@ index c8a0898367..4b35ad0eef 100644
      }
  
      lazy.console.debug(
-@@ -581,6 +600,12 @@ class RemoteSettingsClient extends EventEmitter {
+@@ -600,6 +619,12 @@ class RemoteSettingsClient extends EventEmitter {
      return final;
    }
  
@@ -744,10 +758,10 @@ index c8a0898367..4b35ad0eef 100644
     * Synchronize the local database with the remote server.
     *
 -- 
-2.39.0
+2.39.2
 
 
-From 137f0c81f37356fb97e7037ee64c2fa65ed242ea Mon Sep 17 00:00:00 2001
+From a7b8fa4c2ef5500996ba8f7f923a16735759a86c Mon Sep 17 00:00:00 2001
 From: grizzlyuser <grizzlyuser@protonmail.com>
 Date: Wed, 30 Dec 2020 18:53:51 +0200
 Subject: [PATCH 09/13] Client: deep compare records if timestamps match
@@ -769,7 +783,7 @@ noticeable performance issues.
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/services/settings/RemoteSettingsClient.jsm b/services/settings/RemoteSettingsClient.jsm
-index 4b35ad0eef..a8ce913d8e 100644
+index 39108bca89..6edb78f58e 100644
 --- a/services/settings/RemoteSettingsClient.jsm
 +++ b/services/settings/RemoteSettingsClient.jsm
 @@ -19,6 +19,7 @@ const { Downloader } = ChromeUtils.import(
@@ -780,7 +794,7 @@ index 4b35ad0eef..a8ce913d8e 100644
    ClientEnvironmentBase:
      "resource://gre/modules/components-utils/ClientEnvironment.jsm",
    Database: "resource://services-settings/Database.jsm",
-@@ -1148,7 +1149,10 @@ class RemoteSettingsClient extends EventEmitter {
+@@ -1181,7 +1182,10 @@ class RemoteSettingsClient extends EventEmitter {
          const old = oldById.get(r.id);
          if (old) {
            oldById.delete(r.id);
@@ -793,10 +807,10 @@ index 4b35ad0eef..a8ce913d8e 100644
            }
          } else {
 -- 
-2.39.0
+2.39.2
 
 
-From 3e1e4c19780fd84fd0fdeaaa222239b4572fb251 Mon Sep 17 00:00:00 2001
+From be54cdb2360f09fe6695ba96b878b7a863828b45 Mon Sep 17 00:00:00 2001
 From: grizzlyuser <grizzlyuser@protonmail.com>
 Date: Wed, 30 Dec 2020 19:01:39 +0200
 Subject: [PATCH 10/13] Client: delete more data on cleanup
@@ -814,10 +828,10 @@ logic gets the data about the attachments from those records.
  1 file changed, 9 insertions(+), 3 deletions(-)
 
 diff --git a/services/settings/RemoteSettingsClient.jsm b/services/settings/RemoteSettingsClient.jsm
-index a8ce913d8e..19883607f2 100644
+index 6edb78f58e..110ab320cb 100644
 --- a/services/settings/RemoteSettingsClient.jsm
 +++ b/services/settings/RemoteSettingsClient.jsm
-@@ -261,7 +261,7 @@ class AttachmentDownloader extends Downloader {
+@@ -264,7 +264,7 @@ class AttachmentDownloader extends Downloader {
        allRecords
          .filter(r => !!r.attachment)
          .map(r =>
@@ -826,7 +840,7 @@ index a8ce913d8e..19883607f2 100644
          )
      );
    }
-@@ -1108,7 +1108,7 @@ class RemoteSettingsClient extends EventEmitter {
+@@ -1141,7 +1141,7 @@ class RemoteSettingsClient extends EventEmitter {
            // Signature failed, clear local DB because it contains
            // bad data (local + remote changes).
            lazy.console.debug(`${this.identifier} clear local data`);
@@ -835,7 +849,7 @@ index a8ce913d8e..19883607f2 100644
            // Local data was tampered, throw and it will retry from empty DB.
            lazy.console.error(`${this.identifier} local data was corrupted`);
            throw new CorruptedDataError(this.identifier);
-@@ -1130,7 +1130,7 @@ class RemoteSettingsClient extends EventEmitter {
+@@ -1163,7 +1163,7 @@ class RemoteSettingsClient extends EventEmitter {
              // _importJSONDump() only clears DB if dump is available,
              // therefore do it here!
              if (imported < 0) {
@@ -844,7 +858,7 @@ index a8ce913d8e..19883607f2 100644
              }
            }
          }
-@@ -1170,6 +1170,12 @@ class RemoteSettingsClient extends EventEmitter {
+@@ -1203,6 +1203,12 @@ class RemoteSettingsClient extends EventEmitter {
      return syncResult;
    }
  
@@ -858,10 +872,10 @@ index a8ce913d8e..19883607f2 100644
     * Fetch information from changeset endpoint.
     *
 -- 
-2.39.0
+2.39.2
 
 
-From 8da7335ac9baa4f524293ec810af7b360009ec19 Mon Sep 17 00:00:00 2001
+From 1d03a18d5165a4a69f99e08560a2f6a329b553ba Mon Sep 17 00:00:00 2001
 From: grizzlyuser <grizzlyuser@protonmail.com>
 Date: Wed, 30 Dec 2020 19:07:56 +0200
 Subject: [PATCH 11/13] Client: remove comparison of collection timestamps
@@ -876,10 +890,10 @@ necessary cleanup. So remove the checks.
  1 file changed, 5 deletions(-)
 
 diff --git a/services/settings/RemoteSettingsClient.jsm b/services/settings/RemoteSettingsClient.jsm
-index 19883607f2..8b4420943f 100644
+index 110ab320cb..60bf3dcde3 100644
 --- a/services/settings/RemoteSettingsClient.jsm
 +++ b/services/settings/RemoteSettingsClient.jsm
-@@ -1050,14 +1050,9 @@ class RemoteSettingsClient extends EventEmitter {
+@@ -1083,14 +1083,9 @@ class RemoteSettingsClient extends EventEmitter {
        updated: [],
        deleted: [],
      };
@@ -895,10 +909,10 @@ index 19883607f2..8b4420943f 100644
      await this.db.importChanges(metadata, remoteTimestamp, remoteRecords, {
        clear: retry,
 -- 
-2.39.0
+2.39.2
 
 
-From 5b40750eb05b0eb230ec44f0f5640ecc8d5e3b47 Mon Sep 17 00:00:00 2001
+From 2fb08d4166e324c9caeb26ff47039da45f2061f6 Mon Sep 17 00:00:00 2001
 From: grizzlyuser <grizzlyuser@protonmail.com>
 Date: Wed, 30 Dec 2020 19:15:44 +0200
 Subject: [PATCH 12/13] Attachments: load only from dump and drop cached
@@ -908,10 +922,10 @@ Subject: [PATCH 12/13] Attachments: load only from dump and drop cached
  1 file changed, 8 insertions(+), 29 deletions(-)
 
 diff --git a/services/settings/Attachments.jsm b/services/settings/Attachments.jsm
-index 67a1f32261..6ff0a3b7c6 100644
+index d8fc0a211d..bf9d72012f 100644
 --- a/services/settings/Attachments.jsm
 +++ b/services/settings/Attachments.jsm
-@@ -151,9 +151,10 @@ class Downloader {
+@@ -150,9 +150,10 @@ class Downloader {
        retries,
        checkHash,
        attachmentId = record?.id,
@@ -923,7 +937,7 @@ index 67a1f32261..6ff0a3b7c6 100644
      if (!attachmentId) {
        // Check for pre-condition. This should not happen, but it is explicitly
        // checked to avoid mixing up attachments, which could be dangerous.
-@@ -204,6 +205,7 @@ class Downloader {
+@@ -203,6 +204,7 @@ class Downloader {
          const newBuffer = await this.downloadAsBytes(record, {
            retries,
            checkHash,
@@ -931,7 +945,7 @@ index 67a1f32261..6ff0a3b7c6 100644
          });
          const blob = new Blob([newBuffer]);
          // Store in cache but don't wait for it before returning.
-@@ -237,7 +239,7 @@ class Downloader {
+@@ -236,7 +238,7 @@ class Downloader {
        }
  
        try {
@@ -940,7 +954,7 @@ index 67a1f32261..6ff0a3b7c6 100644
        } catch (e) {
          // Failed to read from cache, e.g. IndexedDB unusable.
          console.error(e);
-@@ -300,7 +302,7 @@ class Downloader {
+@@ -308,7 +310,7 @@ class Downloader {
     * @returns {String} the absolute file path to the downloaded attachment.
     */
    async downloadToDisk(record, options = {}) {
@@ -949,7 +963,7 @@ index 67a1f32261..6ff0a3b7c6 100644
      const {
        attachment: { filename, size, hash },
      } = record;
-@@ -359,33 +361,10 @@ class Downloader {
+@@ -363,33 +365,10 @@ class Downloader {
     */
    async downloadAsBytes(record, options = {}) {
      const {
@@ -987,10 +1001,10 @@ index 67a1f32261..6ff0a3b7c6 100644
  
    /**
 -- 
-2.39.0
+2.39.2
 
 
-From cac0e35f9b818570f37681ee7cd12071e8e5d747 Mon Sep 17 00:00:00 2001
+From 53632cb8587284498e10a10d4fe936a7953fef2e Mon Sep 17 00:00:00 2001
 From: grizzlyuser <grizzlyuser@protonmail.com>
 Date: Wed, 30 Dec 2020 19:22:20 +0200
 Subject: [PATCH 13/13] Disable CRLite entirely for now
@@ -1015,10 +1029,10 @@ certificate revocations.
  2 files changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
-index fca74af174..d05d118e58 100644
+index fdb61eaf0c..f6a356b92b 100644
 --- a/modules/libpref/init/StaticPrefList.yaml
 +++ b/modules/libpref/init/StaticPrefList.yaml
-@@ -13250,7 +13250,7 @@
+@@ -13579,7 +13579,7 @@
  # 3: Consult CRLite and enforce "Not Revoked" results, but defer to OCSP for "Revoked".
  - name: security.pki.crlite_mode
    type: RelaxedAtomicUint32
@@ -1040,5 +1054,5 @@ index 5844ffecfd..6084ffc93c 100644
      case CRLiteMode::Disabled:
      case CRLiteMode::TelemetryOnly:
 -- 
-2.39.0
+2.39.2