resync patches

patches/20_0_configuration_tweaks.patch

@@ -79,10 +79,10 @@ index 5f4256c8..36438eab 100644
              'no-scripting: behind-the-scene false'
          ].join('\n'),
 diff --git a/src/js/storage.js b/src/js/storage.js
-index 1a5d0cd4..7b7684c5 100644
+index 530e9162..3d4bf1e2 100644
 --- a/src/js/storage.js
 +++ b/src/js/storage.js
-@@ -1346,7 +1346,7 @@
+@@ -1349,7 +1349,7 @@
              next = 0;
              var µb = µBlock;
              µb.assets.updateStart({
@@ -91,7 +91,7 @@ index 1a5d0cd4..7b7684c5 100644
              });
          }, updateDelay);
      };
-@@ -1446,7 +1446,7 @@
+@@ -1449,7 +1449,7 @@
              this.loadFilterLists();
          }
          if ( this.userSettings.autoUpdate ) {

patches/20_1_header_parsing.patch

@@ -1,5 +1,5 @@
 diff --git a/src/js/storage.js b/src/js/storage.js
-index 7b7684c5..2207ba45 100644
+index 3d4bf1e2..229b3df0 100644
 --- a/src/js/storage.js
 +++ b/src/js/storage.js
 @@ -822,15 +822,33 @@

patches/integration/10_1_compile_flags.patch

@@ -60,7 +60,7 @@ index db6361a3..729792b1 100644
          s = s.slice(2);
      }
 diff --git a/src/js/storage.js b/src/js/storage.js
-index a536f90e..85acec49 100644
+index 049db27a..156acb48 100644
 --- a/src/js/storage.js
 +++ b/src/js/storage.js
 @@ -446,7 +446,8 @@

patches/integration/10_2_extended_resources.patch

@@ -61,7 +61,7 @@ index 038079e1..ac43aece 100644
          //   Ignore instances of exception filter with negated hostnames,
          //   because there is no way to create an exception to an exception.
 diff --git a/src/js/storage.js b/src/js/storage.js
-index 85acec49..2e53737d 100644
+index 156acb48..0223d58f 100644
 --- a/src/js/storage.js
 +++ b/src/js/storage.js
 @@ -991,7 +991,7 @@
@@ -129,7 +129,7 @@ index 85acec49..2e53737d 100644
          }
      });
  };
-@@ -1311,7 +1338,10 @@
+@@ -1314,7 +1341,10 @@
              }
          }
          // https://github.com/gorhill/uBlock/issues/2594
@@ -141,7 +141,7 @@ index 85acec49..2e53737d 100644
              if (
                  this.hiddenSettings.ignoreRedirectFilters === true &&
                  this.hiddenSettings.ignoreScriptInjectFilters === true
-@@ -1354,6 +1384,11 @@
+@@ -1357,6 +1387,11 @@
              if ( cached ) {
                  this.loadRedirectResources(details.content);
              }

patches/integration/10_6_lint_filters.patch

@@ -335,7 +335,7 @@ index bf2d6018..8b7913c9 100644
      }
 
 diff --git a/src/js/storage.js b/src/js/storage.js
-index 2e53737d..1a5d0cd4 100644
+index 0223d58f..530e9162 100644
 --- a/src/js/storage.js
 +++ b/src/js/storage.js
 @@ -411,7 +411,11 @@