Merge pull request #1474 from cliqz-oss/DB-2415

 DB-2415: Merge with 73.0.1

Author: alver-cliqz

mozilla-release/.cron.yml

@@ -92,13 +92,9 @@ jobs:
           include-push-tasks: true
       run-on-projects:
           - mozilla-central
-          - mozilla-beta
       when:
           by-project:
               mozilla-central: [{hour: 10, minute: 0}]
-              mozilla-beta:
-                  - {weekday: 'Monday', hour: 10, minute: 0}
-                  - {weekday: 'Thursday', hour: 10, minute: 0}
 
     - name: tp6m-fennec-v68
       job:

mozilla-release/browser/app/blocklist.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1580842055124">
+<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1581702872026">
   <emItems>
     <emItem blockID="i334" id="{0F827075-B026-42F3-885D-98981EE7B1AE}">
       <prefs/>
@@ -3616,6 +3616,50 @@
       <prefs/>
       <versionRange minVersion="0" maxVersion="*" severity="3"/>
     </emItem>
+    <emItem blockID="e480bd4d-7ff0-425c-9c1d-4153fa55ea81" id="/^((Search_Secure_clone_oRrmYYtiAX@www\.searchsecurepro\.co)|(Search_Secure_clone_rHXTjLgNGR@www\.searchsecureprime\.co)|(Search_Safe_pHUandPyRQ@www\.searchsafe\.site)|(SearchSafe_IEHxXeEbnC@www\.searchsafe\.site)|(Search_Secure_ByKsqSMauFtest@www\.testsearchsecurepro\.co)|(Search_Secure_GyQyTTzqnYtest@www\.searchsecuretest\.co)|(Search_Secure_NhrEwtJEhM@www\.searchsecurenow\.com)|(Search_Cipher_bBzgbIQyiC@www\.searchcipher\.co)|(Protect_My_Search_Online_clone_jtypmmXRwz@www\.protectmysearchonline\.com)|(MyAstroFinder_LTEnkWRkmt@www\.myastrofinder\.co)|(Live_Weather_Check_PZjCbwpxyH@www\.liveweathercheck\.com)|(Travel_Deals_Center_clone_GvEXeOfSMc@www\.traveldealscenter\.co)|(Dictionary_Pro_ARbsoVmMdl@www\.dictionarypro\.co))$/">
+      <prefs/>
+      <versionRange minVersion="0" maxVersion="*" severity="3"/>
+    </emItem>
+    <emItem blockID="1dbaa501-a6b0-439b-9871-79f081f4afdd" id="/^((\{0970b6b2-6702-443d-84fa-90f5b5cf7c10\})|(\{9ba7732f-7e77-4dae-9885-a9cb91930b0b\})|(\{dd43f6d2-30c7-43df-bce6-6edc46c84d9d\})|(\{72207416-61e9-4960-9cb2-87d2df8486fa\})|(\{d53274cb-43e2-4cbc-b1f4-5463cc026ab0\})|(\{e1faa92b-b124-463e-b247-2609d534733c\})|(\{654068ac-aa86-4f05-aab3-f9dbea380021\})|(\{58d9fc43-39c7-41be-96a6-a27b1e179191\})|(\{f5469e0b-d4cc-4c30-9922-f0c82f1e04e2\})|(\{2ebc9fc9-8642-4f97-935a-6885e66ed6db\})|(\{b7d87fb6-afc7-4544-b798-7fcc1c8114f0\})|(\{d36916ad-9b5b-4390-b302-321c43d85753\})|(\{1e67d5ab-aff2-4540-a2e7-cd19ee112ab7\})|(\{82f9d6fb-cbbb-4862-8c18-c0876aa00c3a\})|(\{2a78a205-7363-4d76-9eea-a862be445724\})|(\{bb65aeb0-db01-4f8b-893a-634d2977269f\})|(\{5cac0db7-8b8d-44e1-8932-687b152feb8b\})|(\{6cade252-0973-49b2-acda-36960804c0f3\})|(\{61e466b4-00e9-4ed2-94bc-dbfade21f066\})|(\{316b549c-841f-4f2e-9e91-5a8cf5c22808\})|(\{73571d19-5073-4b32-915a-a2350e814cf1\})|(\{2e5d7ab6-cdea-4a23-8bb5-3245ccec2c5f\})|(\{fbf35eb0-14de-483f-90aa-3f8c4ea773f0\})|(\{4a9619bf-edd4-4f6c-a787-c919cd4b1d17\})|(\{167fc8e3-1bcf-4f46-a8f1-1722db81c4a0\})|(\{b861c901-a92c-475a-9efd-805d01a1c6bf\})|(\{6800f73d-3133-4697-a368-16c1f6e63894\}))$/">
+      <prefs/>
+      <versionRange minVersion="0" maxVersion="*" severity="3"/>
+    </emItem>
+    <emItem blockID="0e546e4e-6d89-41a0-92fb-987b98efea6f" id="/^((\{7b931d6c-4721-482d-8fcb-8c789bafc9a4\})|(\{03ea1c25-7fae-4ca7-9e9a-4b161936232a\})|(\{06580af3-ba0f-4e49-966d-932b19f6914d\})|(\{7f2afade-1aa3-4acd-8161-4a7d111535c4\})|(\{45fc7dea-37bf-46ca-9ccd-4b156778ed55\})|(\{b8f12b3f-ebe5-4599-9c51-1414ba5783be\})|(\{6440c999-2444-49d0-b8b4-188503a14a32\})|(\{0741d175-fd06-414e-91ad-095d6484b8e9\})|(\{db88d1a7-fc18-46b5-b015-bd9599966cad\})|(\{4f3df885-1268-43ce-9e2a-45668ce523c3\})|(\{938ec54b-e728-4e04-9a05-108b2246cf51\})|(\{bd474d1d-02ad-40a4-9237-4cd64d16de55\})|(\{622b8278-44d4-4f9a-ad96-1363247ae6c6\})|(\{9fd1d710-ebe9-4da5-a488-d51eb1e88ac7\})|(\{ee4314d4-00a2-48ce-bd11-4364496faa8c\})|(\{a06cfa87-55e7-4c65-a71c-a5e984c38e94\})|(\{1e36e1a3-6756-4ecc-9138-6939b23ed54c\})|(\{219cb4e4-5e4a-484a-844f-fee741dc65fc\})|(\{057669e1-0925-4d28-bd20-0fb643ad290e\})|(\{466bf5d6-c235-4731-9539-ebf90346f096\})|(\{a96faf19-5035-4149-9664-773abbc0881b\})|(\{656b685b-a458-4651-bb39-66242c67dd6d\})|(\{1acdd00a-744a-4875-be39-5a136aa20d7d\})|(\{58873ce7-60eb-46b9-a4af-ae62095b3fb1\})|(\{387033d3-4292-486e-80f4-44e531349a54\})|(\{5b8b07d1-4e0a-4c96-aad5-672a00c1358e\})|(\{15a8fac7-2bf1-4536-b4a3-7f51c9b7fa1a\})|(\{668952b1-4609-453e-9972-e9557192070a\})|(\{5f017950-0824-4806-9cda-e17d454f1b18\})|(\{008db332-feb7-447c-8359-829c2e5fc374\})|(\{3d412505-479b-47c0-b330-3599533e783a\})|(\{117a7b8a-6c7e-4fff-8d48-e12b02871b91\})|(\{8753c4a4-e083-49db-872c-eef47d1d58ab\})|(\{f439338b-3af7-4afe-bd48-77ee1039077e\})|(\{32588122-b871-43fa-b845-60b548a30235\})|(\{89a92c73-87b1-48b1-bc68-b814d1348d1d\})|(\{dbb477cc-8be4-44f4-9cc2-845632a7e433\})|(\{da48acfb-08ed-484d-90b3-0e63c759a4f4\})|(\{af40910c-c446-4a65-843e-5c39b6ef38f7\})|(\{0121e1fe-e88a-452f-ba88-7c330f87c137\})|(\{9cc2b320-5edf-4b20-be94-108583cc9b66\})|(\{babab679-6c9b-40c2-b62b-e21a3b4b5734\})|(\{5e4d38a3-eefd-4fb6-bbe6-5eb69295f37e\})|(\{ffb5e280-9fb1-42c8-bfbc-ac2db8232d9c\})|(\{50198f5f-f09b-4d09-96e7-ca94e327ce7b\})|(\{eee19d83-6edb-4b9d-b483-1070d60595a7\})|(\{7c5e2b18-56ad-4249-8390-03dd99aa5b09\})|(\{61af5d39-dd37-46fb-8ead-c7756764458c\})|(\{fb0dabc2-2a3d-45b2-8ed4-dc22b74f0ab4\})|(\{e3eb4df8-0cfb-4380-a7c0-856d4deda887\})|(\{180a38cb-115e-4794-a039-696446dc6b4a\})|(\{91dc3cb5-ab77-4e1c-af09-d827a0df9e08\})|(\{c4fec1da-703f-49fa-bd3a-5d7f939d2ae0\})|(\{a75f51d6-8d4b-4a28-b706-300403b82859\})|(\{d79394db-944c-4820-a90c-a2f48ab5fff1\})|(\{d6f11f95-a27b-47cd-bbcf-a9b5f2dd2a36\})|(\{3e64646d-9618-44ca-bf27-e424e76bd622\})|(\{43b57421-3ba8-4116-82c8-afd142c05674\})|(\{30935b8f-9a74-4e49-b6f5-8bb95d3ab3a7\})|(\{1ec5af15-c738-492d-bdcf-c14fd5be5e13\})|(\{feff2b30-7349-4e7b-9a9c-541f97dbc9e5\})|(\{48dbfb68-13d3-4372-820d-d52ea58ebdfd\})|(\{1a3a904a-3daa-4d1a-8260-c20b44fec6e3\})|(\{3794f3f1-6a11-48fb-a7c9-b33344ee82ca\})|(\{e3587df7-7358-4a36-aeff-944db7ab30ff\})|(\{43a526a3-28ea-409f-933c-2ef3d9a0629b\})|(\{2d3e88ab-b4af-47d4-b79b-a0becf1437b2\})|(\{0e02d0ec-97b5-4b46-b42e-d4179b067478\})|(\{dc7083b2-64f5-4ec0-a84b-3e5fdd552f11\})|(\{69d07419-67e5-4465-ad46-b969d5e5c3f8\})|(\{f31bdeec-878f-4465-b9f5-e844b45eb9a2\})|(\{9b63b79e-32c8-425b-ad18-753b58b73cbe\})|(\{8caf71a8-6c65-4cd4-95c6-9913dd169278\})|(\{e1f6fe90-e0fe-418d-9ff6-566cdd5b60e9\})|(\{e34bd75e-5e7e-48e6-a84e-1d18e5fcfb2d\})|(\{087940d8-dc20-4e9e-829b-7bd96c37b02d\})|(\{48defe55-de7a-4051-a5cf-ac6a649e66bc\})|(\{8bd54503-66cb-49dc-81ec-9fa0e9c42fe3\})|(\{ed9f9df1-9f6c-4e4a-a4ac-5d422a7c2a5c\})|(\{13261711-0eeb-457e-9035-7c415e286830\})|(\{E3F6115C-B027-11E8-AD5B-6E4CAE35F1A2\})|(\{93654046-f548-4d3e-9370-cc2244406725\})|(\{943ba377-5410-47cb-a025-30d55960622c\})|(\{426123a8-3e04-4887-a4a7-18931eaa428e\})|(\{4c50cefd-8f14-41ab-b719-8606b116d1c2\})|(\{ab2d09e4-07c0-461b-94f3-b2ea2a6773b9\})|(\{3f20ebf2-5869-431e-a73d-53d435176b04\})|(\{5b845034-25ed-4b92-bfac-ed7b305a3e13\})|(\{24c45b33-30e2-4d41-adb1-2a1bd9942ca6\})|(\{46f426fa-dc37-4b1f-ae63-11370ec65b39\})|(\{d678f055-e538-4c58-8a61-746166ac5063\})|(\{f852266a-7f88-47d8-b610-6ca130d9774c\})|(\{dce62517-e86a-40e0-9361-64c2e61f011a\})|(\{f7883a1d-0f04-4f8b-85ec-f339b791335a\})|(\{204f251f-feba-487a-9bbc-ca8b22b222af\})|(\{59c8031e-40de-485b-9988-69a4f4f51e52\})|(\{a5207f0f-109a-406f-8d86-3a2c806c9c7b\})|(\{3b66b98a-8782-4f16-a2f6-33175f9b0101\}))$/">
+      <prefs/>
+      <versionRange minVersion="0" maxVersion="*" severity="3"/>
+    </emItem>
+    <emItem blockID="8b5feaac-be07-4612-a090-4714b80191f0" id="/^((\{0E64F71A-6B21-4324-A5D9-69231DE8C20C\})|(\{747e7f5b-c9Fa-4e4f-b466-639b88c8998f\})|(\{8693cb76-1caf-4115-9bd7-6bab02330326\})|(\{cf8452e1-0ddb-44d2-95eb-4cb8e7a35707\})|(\{79bbada5-9050-4d8c-9367-0aad8185cd90\})|(\{C7928956-827D-4649-A234-BB758377C005\})|(\{512d597b-9bbb-47cf-b0e6-526456ee6d26\})|(\{fd591fc9-480d-4f04-8ae5-0be02121b425\})|(\{e3258209-0248-4092-bc59-3032565d2f0a\})|(\{725fc0a6-1f6b-4cf9-ae17-748d111dc16d\})|(\{3e30848f-3b39-425b-8538-d85da166cb19\})|(\{9e27a3ff-0131-4aed-bc7c-2364bd89d7c9\})|(\{74e039b8-a2db-4a41-9155-4ccfc2c86682\})|(\{cfd9177e-c8c6-4d94-b5e9-d87850e2c8aa\})|(\{e21459c1-5604-4324-a3a0-8d23800725ec\})|(\{a563f3c0-d631-442f-ae27-1467cd47f1f4\})|(\{cbb3237c-ed1f-4735-a364-1849c0907b3b\})|(\{5c88311a-c457-4d3a-961c-3dc0cf01e6f9\})|(\{0bdf29c1-0c18-40cf-b3a2-c938b5cfdabc\})|(\{56e0ce0d-ffff-46a4-b2cf-1260d6898b94\})|(\{673d181c-5a1f-42c9-a8a2-f2f5af4a2a2a\})|(\{63dc2763-30bb-45fc-90ce-0d2a5c07a46a\})|(\{2751af61-65b3-4e7b-b098-497d6d6d7629\})|(\{5ce7c96e-2e99-4a6d-8f5e-cbcd68fd64b6\})|(\{e7e1a9ef-2755-445f-a639-d9bbf5e1982f\})|(\{ef5483ba-d634-468b-93d0-1bed3f09306b\})|(\{10367a10-912e-47c8-ab86-9a752230e097\})|(\{bf13ca91-6471-45c9-999a-e6176ffa9681\})|(\{7b8ddd2d-c2cc-428c-8Ede-604995d8B4da\})|(\{d05d4f3c-74ba-40bf-afa0-ad944df067ae\})|(\{fed8f5bc-0324-4007-8e90-84709e0c57c8\})|(\{9ef981d5-0b21-41fd-9412-008633de79f2\})|(\{1569b001-9f51-46a2-a4ed-f2122c475799\})|(\{340eab9c-f3c6-4a6c-9439-79733e12df5d\})|(\{1ab78f66-5390-4db2-8d1e-c759599ef2a4\})|(\{ce00b27c-1a7d-40f9-be61-57ae046ebe1a\})|(\{9fc1abcd-3044-4bbb-b04f-c233f1d20bfc\})|(\{78255a39-463e-4fce-9a2a-acca442414f3\})|(\{159bf803-5c0e-4863-bfb1-7a036174bef5\})|(\{7828da87-6bf1-4799-91cd-6e9167511fa5\})|(\{9aa7920f-677b-4904-9ea3-cae4c4320d15\})|(\{3e78b05f-90aa-496c-ac3f-cbc92a738fa1\})|(\{cd9d2474-fff2-4f19-8452-0ec2f4422117\})|(\{c7722662-0964-4341-9232-0fdebb37811e\})|(\{fdb0fb76-f05d-4732-9348-6f8765673e14\})|(\{05abc1ee-f871-4ce6-a51d-6011cdf545ba\})|(\{300e263c-aed7-4df7-b197-82d5122ccf6a\})|(\{14775497-c7c4-4209-9d6b-a8a40c0aed1a\})|(\{10f8343f-0f77-4cb4-8266-e06dde15e8ca\})|(\{d2a58c6b-be02-4ea5-9e7e-6982454e9ef3\})|(\{0f27c13a-5921-4e7c-86c0-b43ad63a4bea\})|(\{f1922123-3aad-41cb-8ab5-281ec8cbe351\})|(\{be0f8a88-522f-43a3-8146-5b2ad0985987\})|(\{44056c1f-6259-4ec2-8e60-b1c65f9b1039\})|(\{1e4c4a84-ea2a-45c0-935e-59cc375575ee\})|(\{62a11f62-84b9-425f-b506-93c3711b73e7\})|(\{bcb5539d-0913-4d90-94a0-e3144ab239ac\})|(\{e4dd1b2b-dcd2-494e-b69f-8c76e89a6234\})|(\{48eeddb6-f7f9-415d-9835-b859e37ed024\})|(\{ddf2a2fa-a5ed-4765-a44c-4b56077cd588\})|(\{2a208cb8-5297-47b4-91a7-0e66475218d8\})|(\{7ec57eac-456d-442a-85f2-477cb20c3dde\})|(\{20aa1960-d5c2-48fb-ae09-fa6261381537\})|(\{b4ebedae-d18f-46d6-8b87-679d1fd27f3d\})|(\{67fa631f-29fe-4001-892c-1dfdd56e5ed3\})|(\{ae92cb39-b2a6-4865-a125-1b273ffb4a1c\})|(\{5b2245da-f41b-4fb3-88b3-5e9a097e06c7\})|(\{69272cbc-110d-4b5c-b903-16bd118ddf45\})|(\{d4d22de7-54af-40a1-99f7-c2b0f2d86a23\})|(\{e1445f3b-92ee-4085-a57f-380e96ed8316\})|(\{f9830d93-3782-44e9-b199-d2355f61b98f\})|(\{218769cc-3b47-4978-ac59-8a9447bcb193\})|(\{f472ddca-60dd-4d6b-90c7-244a84d0a487\})|(\{8af6985d-1eef-47be-8213-bd6e25dad273\})|(\{da95491a-1812-442a-bde4-7a29f69044d4\})|(\{f8d10888-29b8-48d3-8e5f-e02e41fb642e\})|(\{e9091337-2af8-440e-a318-ca9e0f053fc0\})|(\{3ba1e00c-8339-4ae3-a87e-f4af9f1ee33f\})|(\{b40e5bcd-5966-424f-8a15-6ecc3dba050a\})|(\{c376e851-c30c-48a1-9f59-d528d34560b8\})|(\{8ad33b1d-31a7-47e6-bb46-6c91bc1daea3\})|(\{dac8f2fe-662b-4017-bf62-5052d0b23af9\})|(\{c27b6b15-fd63-458e-91b8-5974a7b2242b\})|(\{b222e127-a52c-4884-8a0a-065342b0c74d\})|(\{f53f1857-3f7f-4cf2-9e4e-2533f2c253ee\})|(\{eb260b8d-f7d3-48d8-a29a-c2b07e1ed36e\})|(\{49f6227b-4803-46aa-b189-466869e8dc5d\})|(\{a8694ce8-04ee-49c6-81cf-cf005e7009b4\})|(\{c53aa3f1-3385-4e2d-9d38-daf09b0db7bd\})|(\{9b230441-bb88-4060-bcc9-637cc5a54639\})|(\{895ac4f5-bd07-41c9-bbe1-cdb4d2be9975\})|(\{6886d657-954f-427b-b52f-9ddb1b52da62\})|(\{d1bc06d5-8470-4120-a2af-8e05b252ccca\})|(\{2aad1b2d-c29f-4623-83ac-6291c169c4d5\})|(\{e54137a1-794f-482d-93b6-13e2dddf7bf7\})|(\{773b7d0b-dc32-4125-83b4-a74887588698\})|(\{dd8a0577-a2ef-4719-b138-8aae7cf05add\})|(\{9b0dc71f-13e1-42f7-9e64-518cf228c079\}))$/">
+      <prefs/>
+      <versionRange minVersion="0" maxVersion="*" severity="3"/>
+    </emItem>
+    <emItem blockID="39473bb3-638d-4b7e-a847-f197e6320564" id="/^((\{ebba9c65-d04c-4c02-afd1-476d7c06fc2f\})|(\{117f05e4-3403-4cbe-a041-30fa60054e9f\})|(\{03417bad-eb5b-4bd4-89f8-f10d78fce082\})|(\{42f0a4e1-710d-4154-b34a-731dbbe2097b\})|(\{6a0a9103-3482-4717-aca8-f22ee2228d25\})|(\{23d5c4a6-1231-4f87-ebf9-e5800eae221b\})|(\{99a32eb1-5da4-4a35-beb6-7c3b5222ce04\}))$/">
+      <prefs/>
+      <versionRange minVersion="0" maxVersion="*" severity="3"/>
+    </emItem>
+    <emItem blockID="52b9033d-de65-48ad-9062-7c340835feb0" id="/^((\{312951c4-a455-4886-a2f1-e4fb05b9fee7\})|(traderibis@gmail\.com))$/">
+      <prefs/>
+      <versionRange minVersion="0" maxVersion="*" severity="3"/>
+    </emItem>
+    <emItem blockID="a98992d1-8a30-406f-944d-c0161d0aaa21" id="{e0a905db-294f-4e91-be75-8b5c7c5df90a}">
+      <prefs/>
+      <versionRange minVersion="0" maxVersion="*" severity="3"/>
+    </emItem>
+    <emItem blockID="d33858b8-d192-4be2-a844-b151f0f287ca" id="/^((\{0bbf5ce8-0bfb-4589-a4e8-4f1e435389d2\})|(\{820847ac-fb62-47a4-a6be-00d863584c76\})|(\{703d2caf-edff-4198-baa3-615135f97890\})|(\{f459049d-939d-432e-83c7-07ced47e629a\})|(\{0d56e009-957a-4575-a984-ecd22ccf3120\})|(\{88386103-f99d-4aab-83c2-64106a77748e\})|(\{29e30d06-1030-4a82-8e29-25706012da97\})|(\{c0d5c1cb-e676-4ff7-8189-793efc86fa2f\})|(\{aade33ec-2184-4759-8de5-5d61f1e29e72\})|(\{72dc5fd5-179b-40b6-9218-e88434939ed8\})|(\{8c9ec486-bd7b-40dd-ab49-1ca3ff452484\})|(\{67c0ce2e-2359-44e7-b9d9-1061a3c4a041\})|(\{149c0e63-b3f6-4f8d-bb1d-94b7e36d8aea\})|(\{c3a1e646-c155-4a40-b5bf-ac9252e6b632\})|(\{6876f3d2-97d6-46d6-b9bf-aa46264f6c3c\})|(\{330a08b1-d93e-48a2-9081-e93e25190eec\})|(\{443305ec-55d7-411c-bb4a-96e83b4e631e\})|(\{945964bd-5c29-48e3-9dd6-26741626c1ba\})|(\{ec8513c5-2bcc-45b0-ae77-da6685cfafd9\})|(\{57703f70-e1b7-462d-bf7e-657bac5eb30c\})|(\{8c1d6a6c-3745-429e-8ec5-2a374320e703\})|(\{2ff583b8-72a9-40bd-877b-b355ad33ce44\})|(\{f2ed910e-ab21-4ad3-a70a-8adca5e683f6\})|(\{4ae1f921-575e-4599-8b77-e8e7ab337860\})|(\{cfe7c709-6df6-4d54-9f4c-6fc3967904ce\})|(\{4e0cceff-558b-4902-9870-55ecb16f78a6\})|(\{093726f6-5907-480b-81fc-fafe4f04b5e8\})|(\{4a2650e6-fb1b-4e83-b0ad-4e991c9ac01e\})|(\{2dcd1f94-6a18-47c3-826a-d8f1044b3ade\})|(\{90e61a54-35d6-44c8-bb33-88623e6a03ae\})|(\{61389b8e-55eb-43ad-a68d-bebefe7476ad\})|(\{f8890846-fcc1-479f-a90b-dce3e486b0ba\}))$/">
+      <prefs/>
+      <versionRange minVersion="0" maxVersion="*" severity="3"/>
+    </emItem>
+    <emItem blockID="ba0f5f7c-8998-49f1-89a8-7f3a15c41cc8" id="/^((\{6e27c586-e50c-49b1-9925-5427f3e9f028\})|(\{ae6dcbb6-d0a6-494b-bdfc-ea9d7b8f7667\})|(\{14aec2a8-0289-43f3-85fb-5d52491a0538\})|(\{b541ce5d-e99a-4629-9167-e71ac65bf32f\}))$/">
+      <prefs/>
+      <versionRange minVersion="0" maxVersion="*" severity="3"/>
+    </emItem>
+    <emItem blockID="d5259975-b1c3-4f50-861b-d7b4c082b58a" id="/^((something@ok)|(\{4eefc8e1-086b-43a3-bb21-17c05f43cd3a\})|(adv@blocker)|(adv\.3\.2\.8@blocker)|(\{f56e22e4-f6f9-48ca-aca3-480d9b293a16\})|(\{b26aabf7-6b17-424f-a71d-e8ca37ccb672\}))$/">
+      <prefs/>
+      <versionRange minVersion="0" maxVersion="*" severity="3"/>
+    </emItem>
+    <emItem blockID="1c5195a4-afb7-47ef-83c6-7c3c6f5d0ed1" id="/^((\{04871291-3f6e-4969-a991-4183decfacef\})|(\{9493fc95-5a66-445e-9200-c9b617942c05\})|(\{a89d4fea-98ea-42bf-aeb7-e14059e809a2\})|(\{aabe1376-bc1f-440d-a275-284d026f3058\})|(\{b6aefc39-259d-4485-b8fa-c9b2ea77223e\})|(\{5ce16faf-66ca-401c-bf43-7c75cf75487e\})|(\{dfdf383a-eff4-4ae4-a8b8-97640748e795\})|(\{6a563873-967b-4644-afb1-bc3e9da68128\}))$/">
+      <prefs/>
+      <versionRange minVersion="0" maxVersion="*" severity="3"/>
+    </emItem>
   </emItems>
   <pluginItems>
     <pluginItem blockID="p332">

mozilla-release/browser/app/winlauncher/DllBlocklistInit.cpp

@@ -33,9 +33,14 @@ LauncherVoidResultWithLineInfo InitializeDllBlocklistOOP(
   return mozilla::Ok();
 }
 
+LauncherVoidResultWithLineInfo InitializeDllBlocklistOOPFromLauncher(
+    const wchar_t* aFullImagePath, HANDLE aChildProcess) {
+  return mozilla::Ok();
+}
+
 #else
 
-LauncherVoidResultWithLineInfo InitializeDllBlocklistOOP(
+static LauncherVoidResultWithLineInfo InitializeDllBlocklistOOPInternal(
     const wchar_t* aFullImagePath, HANDLE aChildProcess) {
   CrossProcessDllInterceptor intcpt(aChildProcess);
   intcpt.Init(L"ntdll.dll");
@@ -127,6 +132,23 @@ LauncherVoidResultWithLineInfo InitializeDllBlocklistOOP(
   return Ok();
 }
 
+LauncherVoidResultWithLineInfo InitializeDllBlocklistOOP(
+    const wchar_t* aFullImagePath, HANDLE aChildProcess) {
+  // We come here when the browser process launches a sandbox process.
+  // If the launcher process already failed to bootstrap the browser process,
+  // we should not attempt to bootstrap a child process.
+  if (!(gBlocklistInitFlags & eDllBlocklistInitFlagWasBootstrapped)) {
+    return Ok();
+  }
+
+  return InitializeDllBlocklistOOPInternal(aFullImagePath, aChildProcess);
+}
+
+LauncherVoidResultWithLineInfo InitializeDllBlocklistOOPFromLauncher(
+    const wchar_t* aFullImagePath, HANDLE aChildProcess) {
+  return InitializeDllBlocklistOOPInternal(aFullImagePath, aChildProcess);
+}
+
 #endif  // defined(MOZ_ASAN) || defined(_M_ARM64)
 
 }  // namespace mozilla

mozilla-release/browser/app/winlauncher/DllBlocklistInit.h

@@ -16,6 +16,9 @@ namespace mozilla {
 LauncherVoidResultWithLineInfo InitializeDllBlocklistOOP(
     const wchar_t* aFullImagePath, HANDLE aChildProcess);
 
+LauncherVoidResultWithLineInfo InitializeDllBlocklistOOPFromLauncher(
+    const wchar_t* aFullImagePath, HANDLE aChildProcess);
+
 }  // namespace mozilla
 
 #endif  // mozilla_DllBlocklistInit_h

mozilla-release/browser/app/winlauncher/LauncherProcessWin.cpp

@@ -43,7 +43,8 @@
 static mozilla::LauncherVoidResult PostCreationSetup(
     const wchar_t* aFullImagePath, HANDLE aChildProcess,
     HANDLE aChildMainThread, const bool aIsSafeMode) {
-  return mozilla::InitializeDllBlocklistOOP(aFullImagePath, aChildProcess);
+  return mozilla::InitializeDllBlocklistOOPFromLauncher(aFullImagePath,
+                                                        aChildProcess);
 }
 
 #if !defined( \

mozilla-release/browser/config/version.txt

@@ -1 +1 @@
-73.0
+73.0.1

mozilla-release/browser/extensions/doh-rollout/background.js

@@ -73,21 +73,25 @@ const stateManager = {
       case "uninstalled":
         break;
       case "disabled":
-        rollout.setSetting(TRR_MODE_PREF, 0);
+        await rollout.setSetting(TRR_MODE_PREF, 0);
         break;
       case "manuallyDisabled":
-        browser.experiments.preferences.clearUserPref(DOH_SELF_ENABLED_PREF);
+        await browser.experiments.preferences.clearUserPref(
+          DOH_SELF_ENABLED_PREF
+        );
         break;
       case "UIOk":
-        rollout.setSetting(DOH_SELF_ENABLED_PREF, true);
+        await rollout.setSetting(DOH_SELF_ENABLED_PREF, true);
         break;
       case "enabled":
-        rollout.setSetting(TRR_MODE_PREF, 2);
-        rollout.setSetting(DOH_SELF_ENABLED_PREF, true);
+        await rollout.setSetting(TRR_MODE_PREF, 2);
+        await rollout.setSetting(DOH_SELF_ENABLED_PREF, true);
         break;
       case "UIDisabled":
-        rollout.setSetting(TRR_MODE_PREF, 5);
-        browser.experiments.preferences.clearUserPref(DOH_SELF_ENABLED_PREF);
+        await rollout.setSetting(TRR_MODE_PREF, 5);
+        await browser.experiments.preferences.clearUserPref(
+          DOH_SELF_ENABLED_PREF
+        );
         break;
     }
 

mozilla-release/browser/extensions/doh-rollout/test/browser/browser_rollback.js

@@ -67,6 +67,7 @@ add_task(async function testRollback() {
   // Rollback!
   setPassingHeuristics();
   Preferences.reset(prefs.DOH_ENABLED_PREF);
+  await waitForStateTelemetry();
   await ensureTRRMode(0);
   await ensureNoHeuristicsTelemetry();
   simulateNetworkChange();
@@ -87,6 +88,7 @@ add_task(async function testRollback() {
 
   // Rollback again for good measure! This time with failing heuristics.
   Preferences.reset(prefs.DOH_ENABLED_PREF);
+  await waitForStateTelemetry();
   await ensureNoTRRModeChange(0);
   await ensureNoHeuristicsTelemetry();
   simulateNetworkChange();
@@ -107,6 +109,7 @@ add_task(async function testRollback() {
 
   // Rollback again, this time with TRR mode set to 2 prior to doing so.
   Preferences.reset(prefs.DOH_ENABLED_PREF);
+  await waitForStateTelemetry();
   await ensureTRRMode(0);
   await ensureNoHeuristicsTelemetry();
   simulateNetworkChange();