Merge m-c to autoland. a=merge
authorRyan VanderMeulen <ryanvm@gmail.com>
Mon, 06 Nov 2017 14:51:08 -0500
changeset 693804 482202ada27cafcef70f73f31bbe47c9f45e7db9
parent 693803 b7990b68f2716889e1f1e030ee5b00578a419824 (current diff)
parent 693772 4ea775c267be77107929d68799628a66027f3172 (diff)
child 693805 713b8f8146a2f3f99cd2402c1f70df83c43f6c03
push id87924
push userbmo:mozilla@hocat.ca
push dateMon, 06 Nov 2017 22:10:10 +0000
reviewersmerge
milestone58.0a1
Merge m-c to autoland. a=merge
toolkit/crashreporter/minidump-analyzer/MinidumpAnalyzerUtils.h
toolkit/crashreporter/minidump-analyzer/MozStackFrameSymbolizer.cpp
toolkit/crashreporter/minidump-analyzer/MozStackFrameSymbolizer.h
toolkit/crashreporter/minidump-analyzer/Win64ModuleUnwindMetadata.cpp
toolkit/crashreporter/minidump-analyzer/Win64ModuleUnwindMetadata.h
toolkit/crashreporter/test/unit/head_win64cfi.js
toolkit/crashreporter/test/unit/test_crash_win64cfi_alloc_large.js
toolkit/crashreporter/test/unit/test_crash_win64cfi_alloc_small.js
toolkit/crashreporter/test/unit/test_crash_win64cfi_epilog.js
toolkit/crashreporter/test/unit/test_crash_win64cfi_infinite_code_chain.exe
toolkit/crashreporter/test/unit/test_crash_win64cfi_infinite_code_chain.js
toolkit/crashreporter/test/unit/test_crash_win64cfi_infinite_entry_chain.exe
toolkit/crashreporter/test/unit/test_crash_win64cfi_infinite_entry_chain.js
toolkit/crashreporter/test/unit/test_crash_win64cfi_invalid_exception_rva.exe
toolkit/crashreporter/test/unit/test_crash_win64cfi_invalid_exception_rva.js
toolkit/crashreporter/test/unit/test_crash_win64cfi_not_a_pe.exe
toolkit/crashreporter/test/unit/test_crash_win64cfi_not_a_pe.js
toolkit/crashreporter/test/unit/test_crash_win64cfi_push_nonvol.js
toolkit/crashreporter/test/unit/test_crash_win64cfi_save_nonvol.js
toolkit/crashreporter/test/unit/test_crash_win64cfi_save_nonvol_far.js
toolkit/crashreporter/test/unit/test_crash_win64cfi_save_xmm128.js
toolkit/crashreporter/test/unit/test_crash_win64cfi_save_xmm128_far.js
toolkit/crashreporter/test/unit/test_crash_win64cfi_unknown_op.js
toolkit/crashreporter/test/win64UnwindInfoTests.asm
--- a/build.gradle
+++ b/build.gradle
@@ -62,16 +62,20 @@ if ('multi' == System.env.AB_CD) {
     // Multi-l10n builds set `AB_CD=multi`, which isn't a valid locale.  This
     // causes the
     //
     // |mach build| > |mach gradle| > |make gradle-targets| > AndroidManifest.xml > strings.xml > multi/brand.dtd
     //
     // dependency chain to fail, since multi isn't a real locale.  To avoid
     // this, if Gradle is invoked with AB_CD=multi, we don't invoke Make at all.
     task generateCodeAndResources()
+} else if (System.env.IS_LANGUAGE_REPACK == '1') {
+    // Single-locale l10n repacks set `IS_LANGUAGE_REPACK=1` and handle resource
+    // and code generation themselves.
+    task generateCodeAndResources()
 } else {
     task generateCodeAndResources(type:Exec) {
         workingDir "${topobjdir}"
 
         commandLine mozconfig.substs.GMAKE
         args '-C'
         args "${topobjdir}/mobile/android/base"
         args 'gradle-targets'
--- a/mobile/android/config/mozconfigs/android-aarch64/l10n-nightly
+++ b/mobile/android/config/mozconfigs/android-aarch64/l10n-nightly
@@ -1,40 +1,22 @@
 NO_NDK=1
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
+. "$topsrcdir/mobile/android/config/mozconfigs/android-aarch64/nightly"
+
 # L10n
 ac_add_options --with-l10n-base=../../l10n-central
 
+# Don't autoclobber l10n, as this can lead to missing binaries and broken builds
+# Bug 1283438
+mk_add_options AUTOCLOBBER=
+
 . "$topsrcdir/build/mozconfig.no-compile"
 
 # Global options
 ac_add_options --disable-tests
 
-# Android
-ac_add_options --with-android-min-sdk=21
-ac_add_options --target=aarch64-linux-android
-
 ac_add_options --enable-updater
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
-export MOZILLA_OFFICIAL=1
-
-ac_add_options --with-branding=mobile/android/branding/nightly
-
-ac_add_options --disable-stdcxx-compat
-
-# Don't autoclobber l10n, as this can lead to missing binaries and broken builds
-# Bug 1283438
-mk_add_options AUTOCLOBBER=
-
-# Disable Keyfile Loading (and checks) since l10n doesn't need these keys
-# This overrides the settings in the common android mozconfig
-ac_add_options --without-mozilla-api-keyfile
-ac_add_options --without-google-api-keyfile
-ac_add_options --without-adjust-sdk-keyfile
-ac_add_options --without-leanplum-sdk-keyfile
-ac_add_options --without-pocket-api-keyfile
-# Similarly explicitly disable install tracking for l10n, we'll inherit from en-US
-export MOZ_INSTALL_TRACKING=
-
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-api-16/l10n-nightly
+++ b/mobile/android/config/mozconfigs/android-api-16/l10n-nightly
@@ -1,45 +1,22 @@
 NO_NDK=1
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
+. "$topsrcdir/mobile/android/config/mozconfigs/android-api-16/nightly"
+
 # L10n
 ac_add_options --with-l10n-base=../../l10n-central
 
+# Don't autoclobber l10n, as this can lead to missing binaries and broken builds
+# Bug 1283438
+mk_add_options AUTOCLOBBER=
+
 . "$topsrcdir/build/mozconfig.no-compile"
 
 # Global options
 ac_add_options --disable-tests
 
-# Android
-# Warning: Before increasing the with-android-min-sdk value, please note several places in and out
-# of tree have to be changed. Otherwise, places like Treeherder or archive.mozilla.org will
-# advertise a bad API level. This may confuse people. As an example, please look at bug 1384482.
-# If you think you can't handle the whole set of changes, please reach out to the Release
-# Engineering team.
-ac_add_options --with-android-min-sdk=16
-ac_add_options --target=arm-linux-androideabi
-
 ac_add_options --enable-updater
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
-export MOZILLA_OFFICIAL=1
-
-ac_add_options --with-branding=mobile/android/branding/nightly
-
-ac_add_options --disable-stdcxx-compat
-
-# Don't autoclobber l10n, as this can lead to missing binaries and broken builds
-# Bug 1283438
-mk_add_options AUTOCLOBBER=
-
-# Disable Keyfile Loading (and checks) since l10n doesn't need these keys
-# This overrides the settings in the common android mozconfig
-ac_add_options --without-mozilla-api-keyfile
-ac_add_options --without-google-api-keyfile
-ac_add_options --without-adjust-sdk-keyfile
-ac_add_options --without-leanplum-sdk-keyfile
-ac_add_options --without-pocket-api-keyfile
-# Similarly explicitly disable install tracking for l10n, we'll inherit from en-US
-export MOZ_INSTALL_TRACKING=
-
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-x86/l10n-nightly
+++ b/mobile/android/config/mozconfigs/android-x86/l10n-nightly
@@ -1,35 +1,22 @@
 NO_NDK=1
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
+. "$topsrcdir/mobile/android/config/mozconfigs/android-x86/nightly"
+
 # L10n
 ac_add_options --with-l10n-base=../../l10n-central
 
+# Don't autoclobber l10n, as this can lead to missing binaries and broken builds
+# Bug 1283438
+mk_add_options AUTOCLOBBER=
+
 . "$topsrcdir/build/mozconfig.no-compile"
 
 # Global options
 ac_add_options --disable-tests
 
-# Android
-# Warning: Before increasing the with-android-min-sdk value, please note several places in and out
-# of tree have to be changed. Otherwise, places like Treeherder or archive.mozilla.org will
-# advertise a bad API level. This may confuse people. As an example, please look at bug 1384482.
-# If you think you can't handle the whole set of changes, please reach out to the Release
-# Engineering team.
-ac_add_options --target=i386-linux-android
-ac_add_options --with-android-min-sdk=16
-
 ac_add_options --enable-updater
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
-export MOZILLA_OFFICIAL=1
-
-ac_add_options --with-branding=mobile/android/branding/nightly
-
-ac_add_options --disable-stdcxx-compat
-
-# Don't autoclobber l10n, as this can lead to missing binaries and broken builds
-# Bug 1283438
-mk_add_options AUTOCLOBBER=
-
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/geckoview/build.gradle
+++ b/mobile/android/geckoview/build.gradle
@@ -50,17 +50,18 @@ android {
 
         versionCode computeVersionCode()
         versionName "${mozconfig.substs.MOZ_APP_VERSION}-${mozconfig.substs.MOZ_UPDATE_CHANNEL}"
         consumerProguardFiles 'proguard-rules.txt'
 
         // TODO: ensure these fields always agree with mobile/android/geckoview/BuildConfig.java.in,
         // either by diffing the processed files or by generating the output from a single source.
         buildConfigField 'String', "GRE_MILESTONE", "\"${mozconfig.substs.GRE_MILESTONE}\""
-        buildConfigField 'String', "MOZ_APP_ABI", "\"${mozconfig.substs.TARGET_XPCOM_ABI}\"";
+        // This should really come from the included binaries, but that's not easy.
+        buildConfigField 'String', "MOZ_APP_ABI", mozconfig.substs['COMPILE_ENVIRONMENT'] ? "\"${ mozconfig.substs.TARGET_XPCOM_ABI}\"" : '"arm-eabi-gcc3"';
         buildConfigField 'String', "MOZ_APP_BASENAME", "\"${mozconfig.substs.MOZ_APP_BASENAME}\"";
 
         // For the benefit of future archaeologists:
         // GRE_BUILDID is exactly the same as MOZ_APP_BUILDID unless you're running
         // on XULRunner, which is never the case on Android.
         // 
         // Mimic Python: open(os.path.join(buildconfig.topobjdir, 'buildid.h')).readline().split()[2]
         buildConfigField 'String', "MOZ_APP_BUILDID", "\"${file("${topobjdir}/buildid.h").getText('utf-8').split()[2]}\"";
--- a/mobile/android/gradle/with_gecko_binaries.gradle
+++ b/mobile/android/gradle/with_gecko_binaries.gradle
@@ -147,35 +147,42 @@ ext.configureVariantWithJNIWrappers = { 
     // by configuring the classpath at evaluation-time, not configuration-time.
     //
     // The specific dependency on the `prepareDependencies` task may not be
     // necessary, but commits like
     // https://github.com/evant/gradle-retrolambda/commit/15108c65ee43be499a1359d9d4f88b0851d46769
     // suggest that it is.  It certainly doesn't hurt.
     def prepareDependenciesTask = tasks.getByName("prepare${variant.name.capitalize()}Dependencies")
 
-    def wrapperTask = task("generateJNIWrappersFor${module}${variant.name.capitalize()}", type: JavaExec) {
-        classpath "${topobjdir}/build/annotationProcessors/annotationProcessors.jar"
-
-        // Configure the classpath at evaluation-time, not at
-        // configuration-time: see above comment.
-        doFirst {
-            classpath variant.javaCompile.classpath
-            // Include android.jar.
-            classpath variant.javaCompile.options.bootClasspath
+    def wrapperTask
+    if (System.env.IS_LANGUAGE_REPACK == '1') {
+        // Single-locale l10n repacks set `IS_LANGUAGE_REPACK=1` and don't
+        // really have a build environment.
+        wrapperTask = task("generateJNIWrappersFor${module}${variant.name.capitalize()}")
+    } else {
+        wrapperTask = task("generateJNIWrappersFor${module}${variant.name.capitalize()}", type: JavaExec) {
+            classpath "${topobjdir}/build/annotationProcessors/annotationProcessors.jar"
+    
+            // Configure the classpath at evaluation-time, not at
+            // configuration-time: see above comment.
+            doFirst {
+                classpath variant.javaCompile.classpath
+                // Include android.jar.
+                classpath variant.javaCompile.options.bootClasspath
+            }
+    
+            main = 'org.mozilla.gecko.annotationProcessors.AnnotationProcessor'
+            args module
+            args jarTask.outputs.files.iterator().next()
+    
+            workingDir "${topobjdir}/mobile/android/base"
+    
+            dependsOn jarTask
+            dependsOn prepareDependenciesTask
         }
-
-        main = 'org.mozilla.gecko.annotationProcessors.AnnotationProcessor'
-        args module
-        args jarTask.outputs.files.iterator().next()
-
-        workingDir "${topobjdir}/mobile/android/base"
-
-        dependsOn jarTask
-        dependsOn prepareDependenciesTask
     }
 
     if (module == 'Generated') {
         tasks["bundle${variant.name.capitalize()}"].dependsOn wrapperTask
     } else {
         tasks["assemble${variant.name.capitalize()}"].dependsOn wrapperTask
     }
 }
--- a/security/manager/ssl/StaticHPKPins.h
+++ b/security/manager/ssl/StaticHPKPins.h
@@ -1153,9 +1153,9 @@ static const TransportSecurityPreload kP
   { "za.search.yahoo.com", false, true, false, -1, &kPinset_yahoo },
   { "zh.search.yahoo.com", false, true, false, -1, &kPinset_yahoo },
 };
 
 // Pinning Preload List Length = 480;
 
 static const int32_t kUnknownId = -1;
 
-static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1518376970709000);
+static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1518464018329000);
--- a/security/manager/ssl/nsSTSPreloadList.errors
+++ b/security/manager/ssl/nsSTSPreloadList.errors
@@ -14,123 +14,122 @@ 91-freedom.com: could not connect to hos
 9ss6.com: could not connect to host
 aaronmcguire.me: could not connect to host
 abolition.co: could not connect to host
 accwing.com: could not connect to host
 acrossgw.com: could not connect to host
 adamfontenot.com: could not connect to host
 adamgold.net: could not connect to host
 adjagu.org: could not connect to host
+adquisitio.co.uk: could not connect to host
+adquisitio.es: could not connect to host
+adquisitio.fr: could not connect to host
+adquisitio.it: could not connect to host
 adzie.xyz: could not connect to host
 aevpn.org: could not connect to host
+affily.io: could not connect to host
 agowa338.de: could not connect to host
 akiba-server.info: could not connect to host
 akita-stream.com: could not connect to host
 akoww.de: could not connect to host
 akul.co.in: could not connect to host
 al-f.net: could not connect to host
 alamgir.works: could not connect to host
 alasta.info: could not connect to host
 alauda-home.de: could not connect to host
 alexandernorth.ch: could not connect to host
 alexey-shamara.ru: could not connect to host
 alexmol.tk: could not connect to host
 alexperry.io: could not connect to host
-alexvdveen.nl: could not connect to host
 alilialili.ga: could not connect to host
 alphie.me: could not connect to host
 altahrim.net: could not connect to host
 ameho.me: could not connect to host
 amua.fr: could not connect to host
 anastasia-shamara.ru: could not connect to host
 andiplusben.com: could not connect to host
+andreaskluge.eu: could not connect to host
 andrei-coman.com: could not connect to host
 andrepicard.de: could not connect to host
 annetaan.fi: could not connect to host
 answers-online.ru: could not connect to host
 anyways.at: could not connect to host
-aoku3d.com: could not connect to host
 apkoyunlar.club: could not connect to host
 appdrinks.com: could not connect to host
 arawaza.biz: could not connect to host
 arawaza.info: could not connect to host
 arent.kz: could not connect to host
 arksan.com.tr: could not connect to host
-arminpech.de: could not connect to host
 artisense.de: could not connect to host
 artyland.ru: could not connect to host
 askmagicconch.com: could not connect to host
 assdecoeur.org: could not connect to host
 at1.co: could not connect to host
 athi.pl: could not connect to host
 austinsutphin.com: could not connect to host
 australiancattle.dog: could not connect to host
 autostop-occasions.be: could not connect to host
 autozane.com: could not connect to host
 awan.tech: could not connect to host
 awf0.xyz: could not connect to host
+axrec.de: could not connect to host
 b8a.me: could not connect to host
 bakaweb.fr: could not connect to host
 balonmano.co: could not connect to host
 bandarifamily.com: could not connect to host
 barbate.fr: could not connect to host
-batfoundry.com: could not connect to host
 bbdos.ru: could not connect to host
 beasel.biz: could not connect to host
 beelen.fr: could not connect to host
 bellavistaoutdoor.com: could not connect to host
 belua.com: could not connect to host
 bencorby.com: could not connect to host
 benjamin-horvath.com: could not connect to host
 benjamin-suess.de: could not connect to host
 benzou-space.com: could not connect to host
 berduri.com: could not connect to host
 berthelier.me: could not connect to host
 bey.io: could not connect to host
-billaud.eu.org: could not connect to host
 binimo.com: could not connect to host
 bip.gov.sa: could not connect to host
 bitmessage.ch: could not connect to host
 bizeau.ch: could not connect to host
 blackdiam.net: could not connect to host
 blackscytheconsulting.com: could not connect to host
 blinkenlight.com.au: could not connect to host
+blog.gparent.org: could not connect to host
 blumen-garage.de: could not connect to host
 bm-i.ch: could not connect to host
-bobep.ru: could not connect to host
 bodrumfarm.com: could not connect to host
 bolwerk.com.br: could not connect to host
 borisbesemer.com: could not connect to host
 bouncourseplanner.net: could not connect to host
 brage.info: could not connect to host
-bratteng.me: could not connect to host
 brettabel.com: could not connect to host
 brfvh24.se: could not connect to host
 brunner.ninja: could not connect to host
 bsuess.de: could not connect to host
 buka.jp: could not connect to host
-bullbits.com: could not connect to host
 burlesquemakeup.com: could not connect to host
 businessfurs.info: could not connect to host
 businessmodeler.se: could not connect to host
 buyshoe.org: could not connect to host
 bvexplained.co.uk: could not connect to host
 by1898.com: could not connect to host
 bypass.kr: could not connect to host
 c16t.uk: could not connect to host
-ca.gparent.org: could not connect to host
 cafesg.net: could not connect to host
 calculatoaresecondhand.xyz: could not connect to host
 callabs.net: could not connect to host
 callsigns.ca: could not connect to host
+calories.org: could not connect to host
 carlandfaith.com: could not connect to host
 casa-mea-inteligenta.ro: could not connect to host
 casinoreal.com: could not connect to host
 caughtredhanded.co.nz: could not connect to host
-cbdev.de: could not connect to host
 centos.pub: could not connect to host
 challengeskins.com: could not connect to host
 chaoticlaw.com: could not connect to host
 charmyadesara.com: could not connect to host
 charonsecurity.com: could not connect to host
 cheah.xyz: could not connect to host
 cheesefusion.com: could not connect to host
 childrendeservebetter.org: could not connect to host
@@ -139,16 +138,17 @@ chloehorler.com: could not connect to ho
 chosenplaintext.org: could not connect to host
 chsterz.de: could not connect to host
 chziyue.com: could not connect to host
 cjtkfan.club: could not connect to host
 clearchatsandbox.com: could not connect to host
 clearviewwealthprojector.com.au: could not connect to host
 cloudbleed.info: could not connect to host
 cloudimproved.com: could not connect to host
+cloveros.ga: could not connect to host
 cnlic.com: could not connect to host
 coco-cool.fr: could not connect to host
 code.fm: could not connect to host
 codenlife.xyz: could not connect to host
 codera.co.uk: could not connect to host
 codercross.com: could not connect to host
 colleencornez.com: could not connect to host
 coloppe.com: could not connect to host
@@ -179,75 +179,73 @@ darlastudio66.com: could not connect to 
 datorb.com: could not connect to host
 davidscherzer.at: could not connect to host
 davros.eu: could not connect to host
 davros.ru: could not connect to host
 dawnson.is: could not connect to host
 dawnsonb.com: could not connect to host
 days.one: could not connect to host
 dbcom.ru: could not connect to host
-dcc.moe: could not connect to host
-dclaisse.fr: could not connect to host
 de-servers.de: could not connect to host
 decoyrouting.com: could not connect to host
+deloittequant.com: could not connect to host
 derchris.me: could not connect to host
 derivativeshub.pro: could not connect to host
 dev-talk.eu: could not connect to host
 devkid.net: could not connect to host
 devops.moe: could not connect to host
 dick.red: could not connect to host
-die-borts.ch: could not connect to host
 diguass.us: could not connect to host
 dijks.com: could not connect to host
 dirtycat.ru: could not connect to host
 disadattamentolavorativo.it: could not connect to host
 disco-crazy-world.de: could not connect to host
 djangogolf.com: could not connect to host
 dlyl888.com: could not connect to host
-doc.to: could not connect to host
 dojifish.space: could not connect to host
 dolphin-hosting.com: could not connect to host
 domengrad.ru: could not connect to host
 dreaming.solutions: could not connect to host
 dreizwosechs.de: could not connect to host
 drighes.com: could not connect to host
 dronexpertos.com: could not connect to host
 droomhuis-in-zuid-holland-kopen.nl: could not connect to host
 dubrovskiy.net: could not connect to host
 dubrovskiy.pro: could not connect to host
 duch.cloud: could not connect to host
 duelsow.eu: could not connect to host
 duks.com.br: could not connect to host
 duo.money: could not connect to host
 duole30.com: could not connect to host
 e-wishlist.net: could not connect to host
-e3q.de: could not connect to host
 eagleridgecampground.com: could not connect to host
 eatfitoutlet.com.br: could not connect to host
 ebaymotorssucks.com: could not connect to host
 eeb98.com: could not connect to host
 eez.ee: could not connect to host
+egbert.net: could not connect to host
 ehuber.info: could not connect to host
-ekong366.com: could not connect to host
+elars.de: could not connect to host
 eled.io: could not connect to host
 elisabeth-strunz.de: could not connect to host
 elonbase.com: could not connect to host
 elsword.moe: could not connect to host
+endlessdiy.ca: could not connect to host
 endspamwith.us: could not connect to host
 energy-drink-magazin.de: could not connect to host
 engg.ca: could not connect to host
 enriquepiraces.com: could not connect to host
-epulsar.ru: could not connect to host
 ericdiao.com: could not connect to host
 eriser.fr: could not connect to host
 estan.cn: could not connect to host
 eurostrategy.vn.ua: could not connect to host
 eveshaiwu.com: could not connect to host
 exceed.global: could not connect to host
 faber.org.ru: could not connect to host
+facilitrak.com: could not connect to host
 faithwatch.org: could not connect to host
 falkus.net: could not connect to host
 farm24.co.uk: could not connect to host
 feedstringer.com: could not connect to host
 feirlane.org: could not connect to host
 fernangp.com: could not connect to host
 filhomes.ph: could not connect to host
 findmybottleshop.com.au: could not connect to host
@@ -255,76 +253,75 @@ firebaseio.com: could not connect to hos
 firexarxa.de: could not connect to host
 first-time-offender.com: could not connect to host
 fixate.ru: could not connect to host
 fixmyglitch.com: could not connect to host
 flow.su: could not connect to host
 flucky.xyz: could not connect to host
 flygpost.com: could not connect to host
 foodserve.in: could not connect to host
-foodwise.marketing: could not connect to host
 forglemmigej.net: could not connect to host
-fortress.sk: could not connect to host
+forsakringsarkivet.se: could not connect to host
 foshanshequ.com: could not connect to host
 fossewayflowers.co.uk: could not connect to host
 fossewayflowers.com: could not connect to host
 foudufafa.de: could not connect to host
 foxmay.co.uk: could not connect to host
 fr0zenbits.io: could not connect to host
 fragnic.com: could not connect to host
 franckyz.com: could not connect to host
+franksiler.com: could not connect to host
 fransallen.com: could not connect to host
 freaksites.dk: could not connect to host
 fredliang.cn: could not connect to host
 fredtec.ru: could not connect to host
 freelansir.com: could not connect to host
-freend.me: could not connect to host
 freesounding.ru: could not connect to host
 fromlemaytoz.com: could not connect to host
 frosty-gaming.xyz: could not connect to host
 frowin-stemmer.de: could not connect to host
 fukuko.biz: could not connect to host
 fukuko.xyz: could not connect to host
+fukuoka-cityliner.jp: could not connect to host
 funfunmstdn.tokyo: could not connect to host
 funideas.org: could not connect to host
 funksteckdosen24.de: could not connect to host
 futbolvivo.tv: could not connect to host
 g4w.co: could not connect to host
+gabriele-kluge.de: could not connect to host
 gafachi.com: could not connect to host
 gaiserik.com: could not connect to host
 gam3rs.de: could not connect to host
 game-gentle.com: could not connect to host
 gasbarkenora.com: could not connect to host
 gasnews.net: could not connect to host
 gayforgenji.com: could not connect to host
 gaygeeks.de: could not connect to host
 gbl.selfip.net: could not connect to host
 gdhzcgs.com: could not connect to host
 geeklair.net: could not connect to host
 geeks.berlin: could not connect to host
 gehrke.nrw: could not connect to host
 generationnext.pl: could not connect to host
 geneve.guide: could not connect to host
-getfilterlive.org: could not connect to host
 getgeek.dk: could not connect to host
 getgeek.ee: could not connect to host
 getgeek.es: could not connect to host
 getgeek.fi: could not connect to host
 getgeek.fr: could not connect to host
 getgeek.io: could not connect to host
 getgeek.no: could not connect to host
 getgeek.nu: could not connect to host
 getgeek.pl: could not connect to host
 getwarden.net: could not connect to host
 gevaulug.fr: could not connect to host
 gfoss.gr: could not connect to host
-ggss.cf: could not connect to host
-gibraltar.at: could not connect to host
 glasner.photo: could not connect to host
 gmantra.org: could not connect to host
+gnilebein.de: could not connect to host
 gnom.me: could not connect to host
 godrive.ga: could not connect to host
 google: could not connect to host
 gottfridsberg.org: could not connect to host
 goukon.ru: could not connect to host
 gozadentro.com: could not connect to host
 gradsm-ci.net: could not connect to host
 granth.io: could not connect to host
@@ -346,51 +343,50 @@ hasalittle.wang: could not connect to ho
 hdy.nz: could not connect to host
 heijblok.com: could not connect to host
 heisenberg.co: could not connect to host
 hellomouse.tk: could not connect to host
 helpantiaging.com: could not connect to host
 helsingfors.guide: could not connect to host
 henriknoerr.com: could not connect to host
 hentaimaster.net: could not connect to host
-heptner24.de: could not connect to host
 here.ml: could not connect to host
 hg881.com: could not connect to host
 hiraku.me: could not connect to host
 homophoni.com: could not connect to host
 hoodoo.io: could not connect to host
 hoodoo.tech: could not connect to host
 horeizai.net: could not connect to host
-horrendous-servers.com: could not connect to host
+horrell.ca: could not connect to host
 horvathd.eu: could not connect to host
 hudingyuan.cn: could not connect to host
 hukkatavara.com: could not connect to host
 hundter.com: could not connect to host
 ibase.com: could not connect to host
 ictpro.info: could not connect to host
 iec.pe: could not connect to host
 ifxnet.com: could not connect to host
 ikenmeyer.eu: could not connect to host
 ileat.com: could not connect to host
 imperdintechnologies.com: could not connect to host
 impulse-clan.de: could not connect to host
-industrialstarter.com: could not connect to host
 inexpensivecomputers.net: could not connect to host
 informatik.zone: could not connect to host
 ingalls.run: could not connect to host
 injust.me: could not connect to host
-insblauehinein.nl: could not connect to host
 inscript.pl: could not connect to host
 insouciant.org: could not connect to host
+installgentoo.net: could not connect to host
 investorloanshub.com: could not connect to host
 iris-insa.com: could not connect to host
 isamiok.com: could not connect to host
 issuesofconcern.in: could not connect to host
 itpro-mg.de: could not connect to host
 itproject.guru: could not connect to host
+itshka.rv.ua: could not connect to host
 ivanpolchenko.com: could not connect to host
 ixio.cz: could not connect to host
 jaaxypro.com: could not connect to host
 jakincode.army: could not connect to host
 japan4you.org: could not connect to host
 jaredfraser.com: could not connect to host
 javascriptlab.fr: could not connect to host
 jayharris.ca: could not connect to host
@@ -404,61 +400,63 @@ johand.io: could not connect to host
 jonathansanchez.pro: could not connect to host
 jonpads.com: could not connect to host
 joostbovee.nl: could not connect to host
 jornalalerta.com.br: could not connect to host
 juliawebber.co.za: could not connect to host
 just-pools.co.za: could not connect to host
 justmy.website: could not connect to host
 juventusmania1897.com: could not connect to host
+jym.fit: could not connect to host
+kabus.org: could not connect to host
 kaika-facilitymanagement.de: could not connect to host
 kamikaichimaru.com: could not connect to host
 kapo.info: could not connect to host
 karanlyons.com: could not connect to host
 karuneshjohri.com: could not connect to host
 katzen.me: could not connect to host
 kawaiiku.com: could not connect to host
 kawaiiku.de: could not connect to host
-keinanung.nl: could not connect to host
 kenrogers.co: could not connect to host
 kenvix.com: could not connect to host
 keyihao.cn: could not connect to host
 kieranweightman.me: could not connect to host
-kikuzuki.org: could not connect to host
 kinepolis-studio.ga: could not connect to host
 kitchenaccessories.pro: could not connect to host
 kjchernov.info: could not connect to host
 kjoglum.me: could not connect to host
 kngk-azs.ru: could not connect to host
 knightsweep.com: could not connect to host
 knownsec.cf: could not connect to host
 koketteriet.se: could not connect to host
 kollawat.me: could not connect to host
-komget.net: could not connect to host
 konicaprinterdriver.com: could not connect to host
+koningskwartiertje.nl: could not connect to host
 konventseliten.se: could not connect to host
 kopfsalat.eu: could not connect to host
 kopular.com: could not connect to host
 kousaku.jp: could not connect to host
 kozmik.co: could not connect to host
+kpvpn.com: could not connect to host
 krag.be: could not connect to host
 kteen.info: could not connect to host
-kucheryavenkovn.ru: could not connect to host
 kylling.io: could not connect to host
 l18.io: could not connect to host
 laboutiquemarocaineduconvoyeur.ma: could not connect to host
 lacasa.fr: could not connect to host
 lachawoj.de: could not connect to host
+lafema.de: could not connect to host
 lathamlabs.com: could not connect to host
 lathamlabs.net: could not connect to host
 lathamlabs.org: could not connect to host
 lavapot.com: could not connect to host
 lazulu.com: could not connect to host
 lcti.biz: could not connect to host
 ldcraft.pw: could not connect to host
+le23.fr: could not connect to host
 lebal.se: could not connect to host
 legaltip.eu: could not connect to host
 legitaxi.com: could not connect to host
 leifdreizler.com: could not connect to host
 leiming.co: could not connect to host
 leninalbertop.com.ve: could not connect to host
 lenkunz.me: could not connect to host
 leonardcamacho.me: could not connect to host
@@ -472,44 +470,43 @@ linksanitizer.com: could not connect to 
 linksextremist.at: could not connect to host
 linuxcommand.ru: could not connect to host
 linvx.org: could not connect to host
 lissabon.guide: could not connect to host
 littleservice.cn: could not connect to host
 litz.ca: could not connect to host
 litzenberger.ca: could not connect to host
 liukang.tech: could not connect to host
+liul.in: could not connect to host
 livnev.me: could not connect to host
+lmerza.com: could not connect to host
 lobosdomain.no-ip.info: could not connect to host
 localhorst.xyz: could not connect to host
 locker3.com: could not connect to host
 logcat.info: could not connect to host
 logic8.ml: could not connect to host
+lookyman.net: could not connect to host
 loss.no: could not connect to host
 lovelytimes.net: could not connect to host
 luav.org: could not connect to host
-lubomirkazakov.com: could not connect to host
 luisyr.com: could not connect to host
 lukasunger.cz: could not connect to host
 lukasunger.net: could not connect to host
 m4g.ru: could not connect to host
 macedopesca.com.br: could not connect to host
-mader.jp: could not connect to host
 madrants.net: could not connect to host
 magnacumlaude.co: could not connect to host
 maik-mahlow.de: could not connect to host
 mail4geek.com: could not connect to host
 martin-mattel.com: could not connect to host
 marvinkeller.de: could not connect to host
 mastodon.my: could not connect to host
 matcha-iga.jp: could not connect to host
 mathijskingma.nl: could not connect to host
 mattwb65.com: could not connect to host
-maypolevilla.co.uk: could not connect to host
-mayrhofer.eu.org: could not connect to host
 mcdanieldevelopmentservices.com: could not connect to host
 mchopkins.net: could not connect to host
 meanevo.com: could not connect to host
 mecanicadom.com: could not connect to host
 mediadandy.com: could not connect to host
 melonstudios.net: could not connect to host
 mentax.net: could not connect to host
 metachris.com: could not connect to host
@@ -538,35 +535,38 @@ mpserver12.org: could not connect to hos
 mrliu.me: could not connect to host
 mtn.cc: could not connect to host
 munduch.cz: could not connect to host
 muslimbanter.co.za: could not connect to host
 mvnet.com.br: could not connect to host
 myfrenchtattoo.fr: could not connect to host
 naphex.rocks: could not connect to host
 narodsovety.ru: could not connect to host
+natanaelys.com: could not connect to host
 nauck.org: could not connect to host
 ncdesigns-studio.com: could not connect to host
 nedcf.org.uk: could not connect to host
 neer.io: could not connect to host
+nemecl.eu: could not connect to host
 nesterov.pw: could not connect to host
 netica.fr: could not connect to host
 netulo.com: could not connect to host
 nevadafiber.net: could not connect to host
 nexuscorporation.in: could not connect to host
 nfluence.org: could not connect to host
 nico.st: could not connect to host
 nienfun.com: could not connect to host
 nikolasbradshaw.com: could not connect to host
 niouininon.eu: could not connect to host
 nirada.info: could not connect to host
 niva.synology.me: could not connect to host
 nkb.in.th: could not connect to host
 nkp-media.de: could not connect to host
 nlegall.fr: could not connect to host
+nobly.de: could not connect to host
 northwoodsfish.com: could not connect to host
 notesforpebble.com: could not connect to host
 novascan.net: could not connect to host
 novelabs.eu: could not connect to host
 nowremindme.com: could not connect to host
 nsdev.cn: could not connect to host
 nstd.net: could not connect to host
 nup.pw: could not connect to host
@@ -577,26 +577,23 @@ office-ruru.com: could not connect to ho
 oliverspringer.eu: could not connect to host
 onewebdev.info: could not connect to host
 online-scene.com: could not connect to host
 onstud.com: could not connect to host
 onwie.fr: could not connect to host
 opengg.me: could not connect to host
 oscsdp.cz: could not connect to host
 outetc.com: could not connect to host
-ovnrain.com: could not connect to host
 oxygaming.com: could not connect to host
 oxymc.com: could not connect to host
 p4chivtac.com: could not connect to host
 panj.ws: could not connect to host
 pardnoy.com: could not connect to host
-passphrase.today: could not connect to host
 passrhce.com: could not connect to host
 passrhcsa.com: could not connect to host
-patflix.com: could not connect to host
 patrickbusch.net: could not connect to host
 patrickneuro.de: could not connect to host
 pautadiaria.com: could not connect to host
 pear2pear.de: could not connect to host
 perkbrian.com: could not connect to host
 persjrp.ca: could not connect to host
 persoform.ch: could not connect to host
 pgpmail.cc: could not connect to host
@@ -606,16 +603,17 @@ picallo.es: could not connect to host
 picone.com.au: could not connect to host
 pinebaylibrary.org: could not connect to host
 pitfire.io: could not connect to host
 pixelbash.de: could not connect to host
 plaasprodukte.com: could not connect to host
 planbox.info: could not connect to host
 playform.cloud: could not connect to host
 plussizereviews.com: could not connect to host
+pnsc.is: could not connect to host
 pointagri.com: could not connect to host
 polit.im: could not connect to host
 poolinstallers.co.za: could not connect to host
 pouets.ovh: could not connect to host
 powerentertainment.tv: could not connect to host
 privcloud.org: could not connect to host
 projectasterk.com: could not connect to host
 proxydesk.eu: could not connect to host
@@ -630,17 +628,16 @@ qscloud.de: could not connect to host
 qto.net: could not connect to host
 rainbin.com: could not connect to host
 readityourself.net: could not connect to host
 real-compare.com: could not connect to host
 realwoo.com: could not connect to host
 reignsphere.net: could not connect to host
 reismil.ch: could not connect to host
 relvan.com: could not connect to host
-renemayrhofer.com: could not connect to host
 report-to.io: could not connect to host
 report-url.com: could not connect to host
 report-url.io: could not connect to host
 reporturi.com: could not connect to host
 reporturi.io: could not connect to host
 reporturl.com: could not connect to host
 reporturl.io: could not connect to host
 reqognize.com: could not connect to host
@@ -661,38 +658,40 @@ rpgmaker.es: could not connect to host
 rs-devdemo.host: could not connect to host
 rsldb.com: could not connect to host
 rubyist.today: could not connect to host
 runcarina.com: could not connect to host
 rundumcolumn.xyz: could not connect to host
 runementors.com: could not connect to host
 ruobiyi.com: could not connect to host
 ruudkoot.nl: could not connect to host
+rxbusiness.com: could not connect to host
 saferedirectlink.com: could not connect to host
-saint-astier-triathlon.com: could not connect to host
 sallysubs.com: could not connect to host
 salzamt.tk: could not connect to host
 samaritan.tech: could not connect to host
 sanatrans.com: could not connect to host
+santojuken.co.jp: could not connect to host
 sarndipity.com: could not connect to host
 sbiewald.de: could not connect to host
 scheidtweiler.de: could not connect to host
 scm-2017.org: could not connect to host
 sctm.at: could not connect to host
-sebastian-lutsch.de: could not connect to host
 secitem.de: could not connect to host
 sectest.ml: could not connect to host
 security.xn--q9jyb4c: could not connect to host
 securitysoapbox.com: could not connect to host
 securoswiss.ch: could not connect to host
 sellmoretires.com: could not connect to host
+sep23.ru: could not connect to host
 servfefe.com: could not connect to host
 sesha.co.za: could not connect to host
 shadowplus.net: could not connect to host
 shadowrocket.net: could not connect to host
+shansing.cn: could not connect to host
 sharevari.com: could not connect to host
 shavingks.com: could not connect to host
 sheratan.web.id: could not connect to host
 sheying.tm: could not connect to host
 shirakaba-cc.com: could not connect to host
 shopifycloud.com: could not connect to host
 shoppingreview.org: could not connect to host
 siliconchip.me: could not connect to host
@@ -700,73 +699,75 @@ simbolo.co.uk: could not connect to host
 simplerses.com: could not connect to host
 siqi.wang: could not connect to host
 skarox.com: could not connect to host
 skarox.net: could not connect to host
 skarox.ru: could not connect to host
 sky-aroma.com: could not connect to host
 skylocker.net: could not connect to host
 skylocker.nl: could not connect to host
-skynetnetwork.eu.org: could not connect to host
+sl1pkn07.wtf: could not connect to host
 slovoice.org: could not connect to host
 smith.is: could not connect to host
 socialworkout.com: could not connect to host
 socialworkout.net: could not connect to host
 socialworkout.org: could not connect to host
 socialworkout.tv: could not connect to host
 socketize.com: could not connect to host
 sodiao.cc: could not connect to host
 sojingle.net: could not connect to host
 solos.im: could not connect to host
-somali-derp.com: could not connect to host
 soulema.com: could not connect to host
 soundhunter.xyz: could not connect to host
 sowingseasons.com: could not connect to host
-sowncloud.de: could not connect to host
 spha.info: could not connect to host
 spicywombat.com: could not connect to host
+spinner.dnshome.de: could not connect to host
 spom.net: could not connect to host
 sportsmanadvisor.com: could not connect to host
+sputnik1net.org: could not connect to host
+stadionmanager.com: could not connect to host
 stadtgartenla.com: could not connect to host
 statgram.me: could not connect to host
 static-assets.io: could not connect to host
 stbennett.org: could not connect to host
 stefanovski.io: could not connect to host
 steffi-in-australien.com: could not connect to host
 steven-bennett.com: could not connect to host
 stickswag.cf: could not connect to host
 stilettomoda.com.br: could not connect to host
 stpip.com: could not connect to host
 stressfreehousehold.com: could not connect to host
 strydom.me.uk: could not connect to host
+studport.rv.ua: could not connect to host
 stylle.me: could not connect to host
+sulek.eu: could not connect to host
 sunjaydhama.com: could not connect to host
 sunn.ie: could not connect to host
 sussexwebdesigns.com: could not connect to host
 sviz.pro: could not connect to host
 takusan.ru: could not connect to host
 talktwincities.com: could not connect to host
 tatsidou.gr: could not connect to host
+tcpweb.net: could not connect to host
 tdelmas.eu: could not connect to host
 tdelmas.ovh: could not connect to host
 tdsb.cf: could not connect to host
 tdsbhack.tk: could not connect to host
 techask.it: could not connect to host
 techpit.us: could not connect to host
 telugu4u.net: could not connect to host
 tenispopular.com: could not connect to host
-tepid.org: could not connect to host
 teracloud.at: could not connect to host
+terrax.net: could not connect to host
 thackbarth.net: could not connect to host
 theprivacysolution.com: could not connect to host
 thesehighsandlows.com: could not connect to host
 thinkcash.nl: could not connect to host
-thinkindifferent.net: could not connect to host
 thinktux.net: could not connect to host
-threv.net: could not connect to host
 thynx.io: could not connect to host
 tiliaze.info: could not connect to host
 tiliaze.net: could not connect to host
 timysewyn.be: could not connect to host
 tokaido.com: could not connect to host
 topdetoxcleanse.com: could not connect to host
 topnotchendings.com: could not connect to host
 totallynotaserver.com: could not connect to host
@@ -794,93 +795,96 @@ valshamar.is: could not connect to host
 vanderstraeten.dynv6.net: could not connect to host
 vapehour.com: could not connect to host
 vapeshopsupply.com: could not connect to host
 varela-electricite.fr: could not connect to host
 venmos.com: could not connect to host
 versfin.net: could not connect to host
 vgatest.nl: could not connect to host
 vinetalk.net: could not connect to host
-viscopic.com: could not connect to host
 visiontree.eu: could not connect to host
 vlogge.com: could not connect to host
 vmug.pl: could not connect to host
 vrtouring.org: could not connect to host
 vsx.ch: could not connect to host
 vxapps.com: could not connect to host
 w4.no: could not connect to host
 waixingrenfuli.vip: could not connect to host
 wanashi.com: could not connect to host
 warlions.info: could not connect to host
 warp-radio.com: could not connect to host
 warp-radio.tv: could not connect to host
 watchweasel.com: could not connect to host
 we.serveftp.net: could not connect to host
 weareincognito.org: could not connect to host
+web-wave.jp: could not connect to host
 webart-factory.de: could not connect to host
 webcatechism.com: could not connect to host
 webdesigneauclaire.com: could not connect to host
+webhackspro.com: could not connect to host
 webtech.com.br: could not connect to host
 webthings.com.br: could not connect to host
 wecanvisit.com: could not connect to host
 welby.cat: could not connect to host
 welcomehelp.de: could not connect to host
+wer-kommt-her.de: could not connect to host
 werhatunsverraten.eu: could not connect to host
 werkinc.de: could not connect to host
 werkkrew.xyz: could not connect to host
 wetthost.com: could not connect to host
 whilsttraveling.com: could not connect to host
 winnersports.co: could not connect to host
 wireframesoftware.com: could not connect to host
-wiretrip.io: could not connect to host
 wissl.org: could not connect to host
 wolfemg.com: could not connect to host
 wolfenland.net: could not connect to host
 woomu.me: could not connect to host
 wooplagaming.com: could not connect to host
 workemy.com: could not connect to host
 worldfree4.org: could not connect to host
 wp-fastsearch.de: could not connect to host
 wp6.pw: could not connect to host
 wriedts.de: could not connect to host
 www-8887999.com: could not connect to host
 www.re: could not connect to host
 www.sb: could not connect to host
 www.simbolo.co.uk: could not connect to host
+wzrd.in: could not connect to host
 xia100.xyz: could not connect to host
 xiaoyu.net: could not connect to host
 xing.ml: could not connect to host
 xn--8mr166hf6s.xn--fiqs8s: could not connect to host
 xn--yj8h0m.ws: could not connect to host
 xqin.net: could not connect to host
 xtremenutrition.com.br: could not connect to host
 yabrt.cn: could not connect to host
 yaucy.win: could not connect to host
-ybresson.com: could not connect to host
 yffengshi.ml: could not connect to host
-yobbelwobbel.de: could not connect to host
 yoga.is-an-engineer.com: could not connect to host
 yux.fr: could not connect to host
 yvesx.com: could not connect to host
 zaoext.com: could not connect to host
 zby.io: could not connect to host
+zeloz.xyz: could not connect to host
 zenghx.tk: could not connect to host
 zerosource.net: could not connect to host
+zhangfangzhou.com: could not connect to host
 zhiin.net: could not connect to host
+ziegler-family.com: could not connect to host
 ztytian.com: could not connect to host
 zuefle.net: could not connect to host
 zukix.com: could not connect to host
 zulu7.com: could not connect to host
 zuviel.space: could not connect to host
 zzw.ca: could not connect to host
 0005.com: could not connect to host
 0005aa.com: could not connect to host
 007sascha.de: did not receive HSTS header
 020wifi.nl: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]"  nsresult: "0x80004005 (NS_ERROR_FAILURE)"  location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 119"  data: no]
-0222aa.com: could not connect to host
+0222aa.com: did not receive HSTS header
 048.ag: could not connect to host
 050508.com: could not connect to host
 0f.io: could not connect to host
 0g.org.uk: could not connect to host
 0o0.ooo: could not connect to host
 0p.no: did not receive HSTS header
 0w0.vc: could not connect to host
 0x0a.net: could not connect to host
@@ -911,17 +915,17 @@ 127011-networks.ch: could not connect to
 12vpn.org: could not connect to host
 12vpnchina.com: could not connect to host
 1396.net: could not connect to host
 1536.cf: could not connect to host
 163pwd.com: could not connect to host
 166166.com: could not connect to host
 16deza.com: did not receive HSTS header
 16packets.com: could not connect to host
-173vpn.cn: could not connect to host
+173vpn.cn: did not receive HSTS header
 173vpns.com: did not receive HSTS header
 188betwarriors.co.uk: could not connect to host
 188trafalgar.ca: did not receive HSTS header
 195gm.com: could not connect to host
 1a-jva.de: could not connect to host
 1atic.com: could not connect to host
 1co-jp.net: did not receive HSTS header
 1cover.com: could not connect to host
@@ -935,24 +939,24 @@ 1years.cc: could not connect to host
 206rc.net: max-age too low: 2592000
 20hs.cn: did not receive HSTS header
 21lg.co: could not connect to host
 247quickbooks.com: did not receive HSTS header
 24hourpaint.com: could not connect to host
 24sihu.com: could not connect to host
 25daysof.io: could not connect to host
 2859cc.com: could not connect to host
-2acbi-asso.fr: did not receive HSTS header
+2acbi-asso.fr: could not connect to host
 2bizi.ru: could not connect to host
 2brokegirls.org: could not connect to host
 2carpros.com: did not receive HSTS header
 2intermediate.co.uk: did not receive HSTS header
 2or3.tk: could not connect to host
 2smart4food.com: did not receive HSTS header
-2ss.jp: did not receive HSTS header
+2ss.jp: could not connect to host
 300651.ru: did not receive HSTS header
 300m.com: did not receive HSTS header
 300mbmovie24.com: did not receive HSTS header
 300mbmovies4u.cc: could not connect to host
 301.website: could not connect to host
 302.nyc: could not connect to host
 314166.com: could not connect to host
 32ph.com: could not connect to host
@@ -991,17 +995,16 @@ 4sqsu.eu: could not connect to host
 4w-performers.link: could not connect to host
 50millionablaze.org: could not connect to host
 513vpn.net: did not receive HSTS header
 517vpn.cn: could not connect to host
 518maicai.com: did not receive HSTS header
 540.co: did not receive HSTS header
 54bf.com: could not connect to host
 56ct.com: could not connect to host
-5francs.com: did not receive HSTS header
 5piecesofadvice.com: could not connect to host
 5w5.la: could not connect to host
 60ych.net: did not receive HSTS header
 6120.eu: did not receive HSTS header
 64616e.xyz: could not connect to host
 660011.com: max-age too low: 0
 69square.com: could not connect to host
 721av.com: max-age too low: 2592000
@@ -1086,17 +1089,16 @@ accounts-p.com: could not connect to hos
 accuritconsulting.com: did not receive HSTS header
 accuritpresence.com: did not receive HSTS header
 aceadvisory.biz: did not receive HSTS header
 acg.sb: did not receive HSTS header
 acgmoon.org: did not receive HSTS header
 acheirj.com.br: could not connect to host
 acheritage.co.uk: could not connect to host
 acisonline.net: did not receive HSTS header
-acksoft.fr: did not receive HSTS header
 acoffeeshops.com: could not connect to host
 acorns.com: did not receive HSTS header
 acr.im: could not connect to host
 acrepairdrippingsprings.com: could not connect to host
 acritelli.com: did not receive HSTS header
 acslimited.co.uk: did not receive HSTS header
 activateplay.com: max-age too low: 86400
 active-escape.com: could not connect to host
@@ -1127,17 +1129,17 @@ admiral.dp.ua: did not receive HSTS head
 admitcard.co.in: did not receive HSTS header
 admsel.ec: could not connect to host
 adoge.me: could not connect to host
 adonairelogios.com.br: could not connect to host
 adopteunsiteflash.com: could not connect to host
 adquisitio.de: could not connect to host
 adquisitio.in: could not connect to host
 adriancohea.ninja: did not receive HSTS header
-adrianseo.ro: could not connect to host
+adrianseo.ro: did not receive HSTS header
 adrl.ca: could not connect to host
 adsfund.org: could not connect to host
 aduedu.de: did not receive HSTS header
 adunanza.net: did not receive HSTS header
 advancedstudio.ro: did not receive HSTS header
 advantagemechanicalinc.com: did not receive HSTS header
 adventures.is: did not receive HSTS header
 adver.top: did not receive HSTS header
@@ -1415,17 +1417,16 @@ appuro.com: did not receive HSTS header
 aquariumaccessories.shop: could not connect to host
 aquilalab.com: could not connect to host
 arabdigitalexpression.org: did not receive HSTS header
 aradulconteaza.ro: could not connect to host
 aran.me.uk: could not connect to host
 arboineuropa.nl: did not receive HSTS header
 arboleda-hurtado.com: could not connect to host
 arbu.eu: max-age too low: 2419200
-arcbit.io: could not connect to host
 ardao.me: could not connect to host
 ardorlabs.se: could not connect to host
 arewedubstepyet.com: did not receive HSTS header
 areyouever.me: did not receive HSTS header
 argennon.xyz: could not connect to host
 arguggi.co.uk: could not connect to host
 ariacreations.net: did not receive HSTS header
 arislight.com: did not receive HSTS header
@@ -1803,17 +1804,16 @@ blackburn.link: could not connect to hos
 blackkeg.ca: could not connect to host
 blacklane.com: did not receive HSTS header
 blackly.uk: max-age too low: 0
 blackpayment.ru: could not connect to host
 blackunicorn.wtf: could not connect to host
 blakerandall.xyz: could not connect to host
 blantik.net: could not connect to host
 blauwwit.be: did not receive HSTS header
-blazor.nl: did not receive HSTS header
 blendlecdn.com: could not connect to host
 blenheimchalcot.com: did not receive HSTS header
 blessnet.jp: did not receive HSTS header
 blha303.com.au: could not connect to host
 blidz.com: did not receive HSTS header
 blitzprog.org: did not receive HSTS header
 blmiller.com: could not connect to host
 blocksatz-medien.de: could not connect to host
@@ -1894,19 +1894,20 @@ branchtrack.com: did not receive HSTS he
 brandnewdays.nl: could not connect to host
 brandon.so: could not connect to host
 brandred.net: could not connect to host
 brandspray.com: could not connect to host
 brasilien.guide: could not connect to host
 brasilmorar.com: could not connect to host
 bratteng.xyz: could not connect to host
 bravz.de: could not connect to host
-bremensaki.com: could not connect to host
+bremensaki.com: max-age too low: 2592000
 brenden.net.au: did not receive HSTS header
 bress.cloud: did not receive HSTS header
+brettpemberton.xyz: did not receive HSTS header
 brickoo.com: could not connect to host
 brickyardbuffalo.com: did not receive HSTS header
 bridholm.se: could not connect to host
 brightstarkids.com.au: did not receive HSTS header
 brilliantbuilders.co.uk: did not receive HSTS header
 britzer-toner.de: did not receive HSTS header
 brix.ninja: did not receive HSTS header
 brks.xyz: could not connect to host
@@ -2080,17 +2081,17 @@ cargobay.net: could not connect to host
 caringladies.org: could not connect to host
 carlo.mx: did not receive HSTS header
 carlolly.co.uk: could not connect to host
 carlosalves.info: could not connect to host
 carpliyz.com: could not connect to host
 carroarmato0.be: did not receive HSTS header
 carsforbackpackers.com: could not connect to host
 cartesunicef.be: did not receive HSTS header
-cartoonhd.cc: did not receive HSTS header
+cartoonhd.cc: could not connect to host
 carwashvapeur.be: could not connect to host
 casc.cz: did not receive HSTS header
 casedi.org: max-age too low: 0
 casefall.com: could not connect to host
 cash-pos.com: could not connect to host
 cashmyphone.ch: could not connect to host
 casino-cashflow.ru: did not receive HSTS header
 casinostest.com: could not connect to host
@@ -2159,16 +2160,17 @@ charitystreet.co.uk: could not connect t
 charliemcneive.com: could not connect to host
 charlipopkids.com.au: could not connect to host
 charnleyhouse.co.uk: did not receive HSTS header
 charp.eu: could not connect to host
 chartstoffarm.de: max-age too low: 10
 chaska.co.za: did not receive HSTS header
 chat-porc.eu: did not receive HSTS header
 chatbot.me: did not receive HSTS header
+chateau-belvoir.com: did not receive HSTS header
 chateauconstellation.ch: did not receive HSTS header
 chatup.cf: could not connect to host
 chcemvediet.sk: max-age too low: 1555200
 cheapdns.org: could not connect to host
 cheazey.net: did not receive HSTS header
 chebedara.com: could not connect to host
 checkout.google.com: did not receive HSTS header (error ignored - included regardless)
 cheerflow.com: could not connect to host
@@ -2223,16 +2225,17 @@ churrasqueirafacil.com.br: could not con
 cidr.ml: could not connect to host
 cigarblogs.net: could not connect to host
 cigi.site: could not connect to host
 ciicutini.ro: did not receive HSTS header
 cim2b.de: could not connect to host
 cimalando.eu: could not connect to host
 cinartelorgu.com: did not receive HSTS header
 cintdirect.com: could not connect to host
+cio.gov: did not receive HSTS header
 cioconference.co.nz: could not connect to host
 ciplanutrition.com: did not receive HSTS header
 cirrohost.com: did not receive HSTS header
 ciscohomeanalytics.com: could not connect to host
 ciscommerce.net: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]"  nsresult: "0x80004005 (NS_ERROR_FAILURE)"  location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 119"  data: no]
 citiagent.cz: could not connect to host
 cityoflaurel.org: did not receive HSTS header
 cium.ru: could not connect to host
@@ -2376,17 +2379,16 @@ computeremergency.com.au: did not receiv
 computertal.de: could not connect to host
 concentrade.de: did not receive HSTS header
 concord-group.co.jp: did not receive HSTS header
 confirm365.com: could not connect to host
 conflux.tw: did not receive HSTS header
 conformal.com: could not connect to host
 congz.me: could not connect to host
 conjugacao.com.br: did not receive HSTS header
-connect.facebook.net: did not receive HSTS header
 connect.ua: could not connect to host
 connected-verhuurservice.nl: did not receive HSTS header
 connectfss.com: could not connect to host
 consciousandglamorous.com: could not connect to host
 consciousbrand.org.au: could not connect to host
 consciousbranding.org.au: could not connect to host
 consciousbrands.net.au: could not connect to host
 console.python.org: did not receive HSTS header
@@ -2511,16 +2513,17 @@ cspbuilder.info: could not connect to ho
 cssps.org: could not connect to host
 cssu.in: did not receive HSTS header
 csvalpha.nl: did not receive HSTS header
 csvape.com: did not receive HSTS header
 ct-status.org: could not connect to host
 ct-watches.dk: did not receive HSTS header
 cthulhuden.com: could not connect to host
 ctrl.blog: did not receive HSTS header
+cube-cloud.com: did not receive HSTS header
 cubecart-demo.co.uk: did not receive HSTS header
 cubecart-hosting.co.uk: did not receive HSTS header
 cubecart.net: did not receive HSTS header
 cubeserver.eu: could not connect to host
 cubewano.com: could not connect to host
 cucc.date: did not receive HSTS header
 cujanovic.com: did not receive HSTS header
 cujba.com: could not connect to host
@@ -2630,16 +2633,17 @@ davidglidden.eu: did not receive HSTS he
 davidhunter.scot: did not receive HSTS header
 davidnoren.com: did not receive HSTS header
 davidreinhardt.de: could not connect to host
 daylightcompany.com: did not receive HSTS header
 daytonaseaside.com: did not receive HSTS header
 db.gy: could not connect to host
 dbx.ovh: could not connect to host
 dcaracing.nl: could not connect to host
+dcc.cat: did not receive HSTS header
 dccode.gov: could not connect to host
 dccraft.net: could not connect to host
 dcl.re: did not receive HSTS header
 dcuofriends.net: could not connect to host
 dcurt.is: did not receive HSTS header
 dcw.io: did not receive HSTS header
 ddatsh.com: did not receive HSTS header
 debank.tv: did not receive HSTS header
@@ -2705,16 +2709,17 @@ detector.exposed: could not connect to h
 detest.org: could not connect to host
 detutorial.com: did not receive HSTS header
 deuxvia.com: could not connect to host
 dev: could not connect to host
 dev-aegon.azurewebsites.net: did not receive HSTS header
 dev-bluep.pantheonsite.io: did not receive HSTS header
 devcu.com: could not connect to host
 devcu.net: could not connect to host
+develop.cool: did not receive HSTS header
 develop.fitness: could not connect to host
 devh.net: could not connect to host
 devincrow.me: could not connect to host
 devisonline.ch: could not connect to host
 devmsg.com: did not receive HSTS header
 devnsec.com: could not connect to host
 devnull.team: could not connect to host
 devopps.me: did not receive HSTS header
@@ -2730,16 +2735,17 @@ dhpcs.com: did not receive HSTS header
 dhpiggott.net: did not receive HSTS header
 diablotine.rocks: could not connect to host
 diagnosia.com: did not receive HSTS header
 diamondcare.com.br: could not connect to host
 dianlujitao.com: did not receive HSTS header
 dicando.com: max-age too low: 2592000
 dicelab.co.uk: could not connect to host
 dicionariofinanceiro.com: did not receive HSTS header
+dicoding.com: did not receive HSTS header
 dieb.photo: could not connect to host
 dierenkruiden.nl: could not connect to host
 diewebstube.de: could not connect to host
 diezel.com: could not connect to host
 diferenca.com: did not receive HSTS header
 digired.xyz: could not connect to host
 digitalbank.kz: could not connect to host
 digitaldaddy.net: could not connect to host
@@ -2848,16 +2854,17 @@ doridian.de: could not connect to host
 doridian.net: did not receive HSTS header
 doridian.org: could not connect to host
 doriginal.es: did not receive HSTS header
 dorkfarm.com: did not receive HSTS header
 dosenbierrepublik.com: did not receive HSTS header
 dot42.no: could not connect to host
 dotadata.me: could not connect to host
 dotspaperie.com: could not connect to host
+doublethink.online: did not receive HSTS header
 doujin.nagoya: could not connect to host
 dovecotadmin.org: could not connect to host
 doveholesband.co.uk: did not receive HSTS header
 dovetailnow.com: could not connect to host
 download.jitsi.org: did not receive HSTS header
 downsouthweddings.com.au: could not connect to host
 doxcelerate.com: max-age too low: 69
 drach.xyz: did not receive HSTS header
@@ -2877,17 +2884,16 @@ dreamcatcherblog.de: could not connect t
 dreamlighteyeserum.com: could not connect to host
 dreamsforabetterworld.com.au: did not receive HSTS header
 drewgle.net: could not connect to host
 drhopeson.com: could not connect to host
 drinknaturespower.com: could not connect to host
 drinkvabeer.com: could not connect to host
 drishti.guru: could not connect to host
 drivercopilot.com: could not connect to host
-drkmtrx.xyz: did not receive HSTS header
 droidboss.com: did not receive HSTS header
 droncentrum.pl: could not connect to host
 droomhuis-in-brielle-kopen.nl: could not connect to host
 droomhuis-in-de-friese-meren-kopen.nl: could not connect to host
 droomhuis-in-delfzijl-kopen.nl: could not connect to host
 droomhuis-in-friesland-kopen.nl: could not connect to host
 droomhuis-in-laren-kopen.nl: could not connect to host
 droomhuis-in-pekela-kopen.nl: could not connect to host
@@ -2911,17 +2917,16 @@ dubik.su: did not receive HSTS header
 dudesunderwear.com.br: could not connect to host
 duelysthub.com: could not connect to host
 duerls.de: did not receive HSTS header
 dukec.me: could not connect to host
 dullsir.com: did not receive HSTS header
 dungi.org: could not connect to host
 duongpho.com: did not receive HSTS header
 duskopy.top: could not connect to host
-dutchessuganda.com: did not receive HSTS header
 dutchrank.com: did not receive HSTS header
 duuu.ch: could not connect to host
 dycontrol.de: could not connect to host
 dylanscott.com.au: did not receive HSTS header
 dynamic-innovations.net: could not connect to host
 dynamize.solutions: could not connect to host
 dyrkar.com: did not receive HSTS header
 dzimejl.sk: did not receive HSTS header
@@ -2985,16 +2990,17 @@ edelblack.ch: could not connect to host
 edelsteincosmetic.com: did not receive HSTS header
 eden-noel.at: could not connect to host
 edenaya.com: did not receive HSTS header
 edgereinvent.com: did not receive HSTS header
 ediscomp.sk: did not receive HSTS header
 edissecurity.sk: did not receive HSTS header
 edix.ru: could not connect to host
 edk.com.tr: did not receive HSTS header
+edlinus.cn: did not receive HSTS header
 edmodo.com: did not receive HSTS header
 edpubs.gov: did not receive HSTS header
 eduardnikolenko.ru: could not connect to host
 educatio.tech: could not connect to host
 educourse.ga: could not connect to host
 eduvance.in: did not receive HSTS header
 eeetrust.org: did not receive HSTS header
 eengezinswoning-in-alphen-aan-den-rijn-kopen.nl: could not connect to host
@@ -3120,27 +3126,25 @@ enum.eu.org: could not connect to host
 enumify.com: could not connect to host
 enviapresentes.com.br: could not connect to host
 envygeeks.com: could not connect to host
 eol34.com: could not connect to host
 eoldb.org: could not connect to host
 epanurse.com: could not connect to host
 ephry.com: could not connect to host
 epicmc.games: could not connect to host
-epicpages.com: could not connect to host
 epoxate.com: could not connect to host
 eq8.net.au: could not connect to host
 eqim.me: could not connect to host
 equate.net.au: did not receive HSTS header
 equatetechnologies.com.au: did not receive HSTS header
 equilibre-yoga-jennifer-will.com: could not connect to host
 equitee.co: did not receive HSTS header
 equityflows.com: did not receive HSTS header
 erawanarifnugroho.com: did not receive HSTS header
-erclab.kr: could not connect to host
 eressea.xyz: could not connect to host
 ergorium.com: did not receive HSTS header
 ergorium.eu: did not receive HSTS header
 ericbond.net: could not connect to host
 erichalv.com: did not receive HSTS header
 ericyl.com: could not connect to host
 eridanus.uk: could not connect to host
 eriel.com.br: could not connect to host
@@ -3281,29 +3285,29 @@ faluninfo.ba: did not receive HSTS heade
 fam-weyer.de: did not receive HSTS header
 fame-agency.net: could not connect to host
 familie-sprink.de: could not connect to host
 familie-zimmermann.at: could not connect to host
 familylawhotline.org: did not receive HSTS header
 famio.cn: could not connect to host
 fanflow.com: did not receive HSTS header
 fant.dk: did not receive HSTS header
+fantasticgardenersmelbourne.com.au: did not receive HSTS header
 fantasyfootballpundit.com: did not receive HSTS header
 fanyl.cn: could not connect to host
 farces.com: did not receive HSTS header
 farwat.ru: did not receive HSTS header
 fashion.net: did not receive HSTS header
 fashioncare.cz: did not receive HSTS header
 fashionholic.my: did not receive HSTS header
 fasset.jp: could not connect to host
 fastcomcorp.com: did not receive HSTS header
 fastcomcorp.net: did not receive HSTS header
 fastograph.com: could not connect to host
 fastopen.ml: could not connect to host
-fastpresence.com: did not receive HSTS header
 fastworx.com: could not connect to host
 fatgeekflix.net: could not connect to host
 fatherhood.gov: did not receive HSTS header
 fatlossguide.xyz: could not connect to host
 fatwin.pw: could not connect to host
 fatzebra.com.au: max-age too low: 0
 fayolle.info: did not receive HSTS header
 fbox.li: could not connect to host
@@ -3334,17 +3338,16 @@ festember.com: did not receive HSTS head
 festrip.com: could not connect to host
 fettbrot.tk: did not receive HSTS header
 fexmen.com: could not connect to host
 ff-getzersdorf.at: did not receive HSTS header
 ffmradio.de: did not receive HSTS header
 fics-twosigma.com: could not connect to host
 fideleslaici.com: did not receive HSTS header
 fiendishmasterplan.com: did not receive HSTS header
-fifichachnil.paris: did not receive HSTS header
 fiftyshadesofluca.ml: could not connect to host
 fig.co: did not receive HSTS header
 fightr.co: could not connect to host
 fiksel.info: did not receive HSTS header
 fikt.space: could not connect to host
 filebox.moe: could not connect to host
 filemeal.com: did not receive HSTS header
 filey.co.uk: did not receive HSTS header
@@ -3526,17 +3529,17 @@ furiffic.com: did not receive HSTS heade
 furnation.com: could not connect to host
 furry.be: did not receive HSTS header
 fusedrops.com: could not connect to host
 fusionmate.com: could not connect to host
 futbol11.com: did not receive HSTS header
 futurestarsusa.org: did not receive HSTS header
 futuretechnologi.es: could not connect to host
 futureyouhealth.com: did not receive HSTS header
-fuvpn.com: did not receive HSTS header
+fuvpn.com: could not connect to host
 fwest.ovh: did not receive HSTS header
 fwest98.ovh: did not receive HSTS header
 fws.gov: did not receive HSTS header
 fx-rk.com: did not receive HSTS header
 fysiohaenraets.nl: did not receive HSTS header
 fzn.io: could not connect to host
 fzslm.me: could not connect to host
 g-i-s.vn: did not receive HSTS header
@@ -3660,16 +3663,17 @@ gfm.tech: could not connect to host
 gfournier.ca: could not connect to host
 gfwsb.ml: could not connect to host
 ggss.ml: could not connect to host
 gheorghe-sarcov.ga: could not connect to host
 gheorghesarcov.ga: could not connect to host
 gheorghesarcov.tk: could not connect to host
 ghkim.net: could not connect to host
 ghostcir.com: could not connect to host
+ghrelinblocker.info: did not receive HSTS header
 giakki.eu: could not connect to host
 gianlucapartengo.photography: did not receive HSTS header
 gibraltar-firma.com: did not receive HSTS header
 gidea.nu: could not connect to host
 gietvloergarant.nl: did not receive HSTS header
 giftgofers.com: did not receive HSTS header
 giftservices.nl: could not connect to host
 gigacloud.org: max-age too low: 0
@@ -3708,17 +3712,17 @@ glotter.com: did not receive HSTS header
 gloucesterphotographer.com: did not receive HSTS header
 glubbforum.de: did not receive HSTS header
 glws.org: did not receive HSTS header
 gm-assicurazioni.it: could not connect to host
 gmail.com: did not receive HSTS header (error ignored - included regardless)
 gmat.ovh: could not connect to host
 gmoes.at: max-age too low: 600000
 go.ax: did not receive HSTS header
-go2sh.de: did not receive HSTS header
+go2sh.de: could not connect to host
 go4it.solutions: did not receive HSTS header
 goabonga.com: could not connect to host
 goalsetup.com: did not receive HSTS header
 goaltree.ch: did not receive HSTS header
 goarmy.eu: could not connect to host
 goat.chat: did not receive HSTS header
 goat.xyz: max-age too low: 86400
 goben.ch: could not connect to host
@@ -3731,16 +3735,17 @@ gogetssl.com: did not receive HSTS heade
 goggs.eu: could not connect to host
 gogold-g.com: could not connect to host
 gold24.in: did not receive HSTS header
 goldegg-training.com: did not receive HSTS header
 goldendata.io: could not connect to host
 goldminer.ga: could not connect to host
 goldpros.com: did not receive HSTS header
 golocal-media.de: could not connect to host
+gomiblog.com: did not receive HSTS header
 gong8.win: could not connect to host
 gonzalosanchez.mx: did not receive HSTS header
 goodenough.nz: did not receive HSTS header
 goodfurday.ca: did not receive HSTS header
 goodtech.com.br: could not connect to host
 goodwin43.ru: could not connect to host
 google: could not connect to host (error ignored - included regardless)
 googlemail.com: did not receive HSTS header (error ignored - included regardless)
@@ -3762,17 +3767,17 @@ gotocloud.ru: did not receive HSTS heade
 gotowned.org: max-age too low: 0
 gotspot.com: could not connect to host
 gottcode.org: did not receive HSTS header
 gourmettia.com: did not receive HSTS header
 gouv.ovh: did not receive HSTS header
 gov.ax: could not connect to host
 goverage.org: did not receive HSTS header
 govillemo.ca: did not receive HSTS header
-gparent.org: could not connect to host
+gparent.org: did not receive HSTS header
 gpo.gov: did not receive HSTS header
 gpsfix.cz: did not receive HSTS header
 gpstuner.com: did not receive HSTS header
 graavaapi.elasticbeanstalk.com: could not connect to host
 gracesofgrief.com: could not connect to host
 grachtenpandverkopen.nl: could not connect to host
 grafitec.ru: did not receive HSTS header
 grana.com: did not receive HSTS header
@@ -3806,17 +3811,16 @@ greg.red: could not connect to host
 gregmilton.com: could not connect to host
 gregmilton.org: could not connect to host
 gregorytlee.me: could not connect to host
 grekland.guide: could not connect to host
 gremots.com: could not connect to host
 greplin.com: could not connect to host
 gresb.com: did not receive HSTS header
 gretchelizartistry.com: did not receive HSTS header
-grettogeek.com: did not receive HSTS header
 grevesgarten.de: could not connect to host
 greyline.se: could not connect to host
 gribani.com: could not connect to host
 grid2osm.org: could not connect to host
 grigalanzsoftware.com: could not connect to host
 gripopgriep.net: could not connect to host
 groenemeijer.frl: max-age too low: 2628000
 groenewoud.run: could not connect to host
@@ -3854,16 +3858,17 @@ guguke.net: did not receive HSTS header
 guilde-vindicta.fr: did not receive HSTS header
 guillaume-leduc.fr: did not receive HSTS header
 guillaumematheron.fr: did not receive HSTS header
 guineafruitcorp.com: could not connect to host
 gulch.in.ua: did not receive HSTS header
 gulenet.com: could not connect to host
 gulfcoast-sandbox.com: could not connect to host
 gulshankumar.net: did not receive HSTS header
+guniram.com: did not receive HSTS header
 gunnarhafdal.com: did not receive HSTS header
 gunnaro.com: could not connect to host
 guntbert.net: could not connect to host
 guoqiang.info: did not receive HSTS header
 gurom.lv: could not connect to host
 gurusupe.com: could not connect to host
 guso.gq: could not connect to host
 guso.ml: could not connect to host
@@ -3959,16 +3964,17 @@ hash-list.com: could not connect to host
 hasilocke.de: did not receive HSTS header
 hasinase.de: did not receive HSTS header
 haste.ch: could not connect to host
 hastherebeenamassshooting.today: could not connect to host
 hatoko.net: could not connect to host
 haufschild.de: could not connect to host
 haurumcraft.net: could not connect to host
 hausarzt-stader-str.de: did not receive HSTS header
+havasuinsurance.com: did not receive HSTS header
 haveeruexaminer.com: could not connect to host
 havenmoon.com: could not connect to host
 havenswift-hosting.co.uk: did not receive HSTS header
 hawthornharpist.com: could not connect to host
 haxoff.com: could not connect to host
 haxon.me: could not connect to host
 haxx.hu: did not receive HSTS header
 haydenhill.us: could not connect to host
@@ -4011,16 +4017,17 @@ helpmebuild.com: did not receive HSTS he
 helpmij.cf: did not receive HSTS header
 hemlockhillscabinrentals.com: did not receive HSTS header
 hencagon.com: could not connect to host
 hepteract.us: could not connect to host
 herbertmouwen.nl: could not connect to host
 heritagedentistry.ca: did not receive HSTS header
 herpaderp.net: could not connect to host
 herrenfahrt.com: did not receive HSTS header
+hertz.bj: did not receive HSTS header
 herzbotschaft.de: did not receive HSTS header
 hetmer.com: did not receive HSTS header
 hetmer.cz: did not receive HSTS header
 hetmer.net: did not receive HSTS header
 heutger.net: did not receive HSTS header
 hex2013.com: did not receive HSTS header
 heyguevara.com: could not connect to host
 heywoodtown.co.uk: did not receive HSTS header
@@ -4503,16 +4510,17 @@ javan.ga: could not connect to host
 javelinsms.com: could not connect to host
 javilacat.info: could not connect to host
 jayblock.com: did not receive HSTS header
 jaylen.com.ar: did not receive HSTS header
 jayschulman.com: did not receive HSTS header
 jayscoaching.com: did not receive HSTS header
 jayshao.com: did not receive HSTS header
 jbelien.be: did not receive HSTS header
+jbelien.photography: did not receive HSTS header
 jbfp.dk: could not connect to host
 jbj.co.uk: did not receive HSTS header
 jbn.mx: could not connect to host
 jcch.de: could not connect to host
 jcf-office.com: did not receive HSTS header
 jcor.me: did not receive HSTS header
 jcoscia.com: could not connect to host
 jctf.io: could not connect to host
@@ -4572,27 +4580,29 @@ jn1.me: did not receive HSTS header
 joakimalgroy.com: could not connect to host
 jobflyapp.com: could not connect to host
 jobshq.com: did not receive HSTS header
 jobss.co.uk: did not receive HSTS header
 joelgonewild.com: did not receive HSTS header
 johannes-sprink.de: could not connect to host
 johnbrownphotography.ch: did not receive HSTS header
 johncardell.com: did not receive HSTS header
+johndong.net: did not receive HSTS header
 johners.me: could not connect to host
 johngaltgroup.com: did not receive HSTS header
 johnhgaunt.com: did not receive HSTS header
 johnkastler.net: could not connect to host
 johnmcgovern.com: max-age too low: 43200
 johnrom.com: did not receive HSTS header
 johnverkerk.com: could not connect to host
 jointoweb.com: could not connect to host
 jonas-keidel.de: did not receive HSTS header
 jonasgroth.se: did not receive HSTS header
 jonathan.ir: could not connect to host
+jonathanreyes.com: did not receive HSTS header
 jondarby.com: did not receive HSTS header
 jongha.me: could not connect to host
 jonn.me: could not connect to host
 jonnichols.info: did not receive HSTS header
 jonsno.ws: could not connect to host
 jordanstrustcompany.cn: could not connect to host
 jordanstrustcompany.ru: could not connect to host
 joretapo.fr: could not connect to host
@@ -4614,17 +4624,17 @@ jrgold.me: could not connect to host
 jrmd.io: could not connect to host
 jrvar.com: could not connect to host
 jsanders.us: did not receive HSTS header
 jsbentertainment.nl: did not receive HSTS header
 jsg-technologies.de: did not receive HSTS header
 jualautoclave.com: did not receive HSTS header
 jualssh.com: could not connect to host
 juandesouza.com: did not receive HSTS header
-juka.pp.ua: did not receive HSTS header
+juka.pp.ua: could not connect to host
 juku-wing.jp: could not connect to host
 juliamweber.de: could not connect to host
 julian-kipka.de: did not receive HSTS header
 julian-witusch.de: could not connect to host
 julido.de: did not receive HSTS header
 jumbox.xyz: could not connect to host
 jumbster.com: max-age too low: 2592000
 jumping-duck.com: could not connect to host
@@ -4667,17 +4677,17 @@ kalami.nl: could not connect to host
 kaleidomarketing.com: did not receive HSTS header
 kambodja.guide: could not connect to host
 kamcvicit.sk: could not connect to host
 kamikano.com: could not connect to host
 kamikatse.net: could not connect to host
 kanada.guide: could not connect to host
 kaneo-gmbh.de: did not receive HSTS header
 kaniklani.co.za: could not connect to host
-kanjo.de: max-age too low: 0
+kanjo.de: did not receive HSTS header
 kanscooking.org: did not receive HSTS header
 kany.me: did not receive HSTS header
 kanzlei-wirtschaftsrecht.berlin: did not receive HSTS header
 kaohub.com: could not connect to host
 kaplatz.is: could not connect to host
 kapucini.si: max-age too low: 0
 kaputt.com: could not connect to host
 kapverde.guide: could not connect to host
@@ -4772,16 +4782,17 @@ kitestar.co.uk: did not receive HSTS hea
 kitk.at: could not connect to host
 kitsostech.com: could not connect to host
 kitsta.com: could not connect to host
 kiwiirc.com: max-age too low: 5256000
 kiyo.space: could not connect to host
 kizil.net: could not connect to host
 kjaermaxi.me: did not receive HSTS header
 kjg-bachrain.de: could not connect to host
+klas.or.id: did not receive HSTS header
 klauwd.com: could not connect to host
 klaxn.org: could not connect to host
 klean-ritekc.com: did not receive HSTS header
 kleertjesvoordelig.nl: could not connect to host
 kleinerarchitekturfuehrer.de: could not connect to host
 kleppe.co: could not connect to host
 kletterkater.com: did not receive HSTS header
 klicktojob.de: could not connect to host
@@ -4811,17 +4822,17 @@ kolaykaydet.com: did not receive HSTS he
 kolozsvaricsuhe.hu: did not receive HSTS header
 komikito.com: could not connect to host
 kompetenzwerft.de: did not receive HSTS header
 konata.us: could not connect to host
 kontaxis.network: could not connect to host
 koopjesnel.nl: could not connect to host
 koordinate.net: could not connect to host
 kori.ml: did not receive HSTS header
-koriyoukai.net: could not connect to host
+koriyoukai.net: did not receive HSTS header
 kornersafe.com: did not receive HSTS header
 korni22.org: did not receive HSTS header
 korsanparti.org: could not connect to host
 kostuumstore.nl: did not receive HSTS header
 kotois.com: could not connect to host
 kotonehoko.net: could not connect to host
 kotovstyle.ru: could not connect to host
 koukni.cz: did not receive HSTS header
@@ -4923,16 +4934,17 @@ langhun.me: did not receive HSTS header
 laniakean.com: did not receive HSTS header
 lanzainc.xyz: did not receive HSTS header
 laobox.fr: could not connect to host
 laospage.com: could not connect to host
 laplaceduvillage.net: could not connect to host
 laplanetebleue.com: did not receive HSTS header
 laquack.com: could not connect to host
 laredsemanario.com: could not connect to host
+larraz.es: did not receive HSTS header
 lasercloud.ml: could not connect to host
 laserfuchs.de: did not receive HSTS header
 lashstuff.com: did not receive HSTS header
 lastpass.com: did not receive HSTS header
 latelierdekathy.com: could not connect to host
 latemodern.com: could not connect to host
 latinred.com: could not connect to host
 latus.xyz: could not connect to host
@@ -5213,16 +5225,18 @@ macchaberrycream.com: could not connect 
 macchedil.com: did not receive HSTS header
 macdj.tk: could not connect to host
 macgeneral.de: did not receive HSTS header
 macsandcheesedreams.com: could not connect to host
 madars.org: did not receive HSTS header
 maddin.ga: could not connect to host
 madebyfalcon.co.uk: did not receive HSTS header
 madebymagnitude.com: did not receive HSTS header
+mademoiselle-emma.be: did not receive HSTS header
+mademoiselle-emma.fr: did not receive HSTS header
 maderwin.com: did not receive HSTS header
 madesoftware.com.br: did not receive HSTS header
 mafamane.com: could not connect to host
 mafiareturns.com: max-age too low: 2592000
 magenx.com: did not receive HSTS header
 magia360.com: did not receive HSTS header
 magneticanvil.com: did not receive HSTS header
 mahamed91.pw: could not connect to host
@@ -5293,17 +5307,16 @@ marcontrol.com: did not receive HSTS hea
 marcosteixeira.tk: could not connect to host
 marcschlagenhauf.de: could not connect to host
 marcus-scheffler.com: did not receive HSTS header
 marcush.de: could not connect to host
 margaretrosefashions.co.uk: could not connect to host
 marialempke.com: could not connect to host
 mariannematthew.com: could not connect to host
 marie-curie.fr: could not connect to host
-marie-elisabeth.dk: did not receive HSTS header
 marie-en-provence.com: did not receive HSTS header
 marienschule-sundern.de: did not receive HSTS header
 markaconnor.com: did not receive HSTS header
 markayapilandirma.com: could not connect to host
 markcp.me: could not connect to host
 market.android.com: did not receive HSTS header (error ignored - included regardless)
 marketespace.fr: did not receive HSTS header
 markhaehnel.de: max-age too low: 172800
@@ -5498,16 +5511,17 @@ micro-rain-systems.com: did not receive 
 microme.ga: could not connect to host
 micropple.net: could not connect to host
 microtalk.org: could not connect to host
 midirs.org: did not receive HSTS header
 midonet.org: did not receive HSTS header
 midwestwomenworkers.org: could not connect to host
 miegl.cz: could not connect to host
 miemie.jp: could not connect to host
+mig5.net: did not receive HSTS header
 migeeks.de: did not receive HSTS header
 mightydicks.io: could not connect to host
 mightydicks.tech: could not connect to host
 mightysounds.cz: max-age too low: 0
 migrator.co: did not receive HSTS header
 miguksaram.com: could not connect to host
 mijcorijneveld.nl: did not receive HSTS header
 mijn-email.org: could not connect to host
@@ -5547,16 +5561,17 @@ minecraftforum.ch: could not connect to 
 minecraftforums.cf: could not connect to host
 minecraftforums.gq: could not connect to host
 minecraftforums.ml: could not connect to host
 minecraftserverz.com: could not connect to host
 minecraftvoter.com: could not connect to host
 mineover.es: could not connect to host
 mingo.nl: max-age too low: 2592000
 minh.at: could not connect to host
+minhanossasenhora.com.br: did not receive HSTS header
 mini-piraten.de: did not receive HSTS header
 minikneet.nl: could not connect to host
 minimoo.se: could not connect to host
 minnesotadata.com: could not connect to host
 minora.io: could not connect to host
 minoris.se: could not connect to host
 miragrow.com: could not connect to host
 mirindadomo.ru: did not receive HSTS header
@@ -5638,17 +5653,16 @@ monautoneuve.fr: did not receive HSTS he
 mondar.io: could not connect to host
 mondopoint.com: did not receive HSTS header
 mondwandler.de: could not connect to host
 moneromerchant.com: could not connect to host
 moneycrownmedia.com: could not connect to host
 monika-sokol.de: did not receive HSTS header
 monitaure.io: could not connect to host
 monitman.com: did not receive HSTS header
-monpermismoto.com: did not receive HSTS header
 monsieurbureau.com: did not receive HSTS header
 montanacures.org: could not connect to host
 montanwerk.de: could not connect to host
 montonicms.com: could not connect to host
 moon.lc: could not connect to host
 moonless.net: could not connect to host
 moonloupe.com: could not connect to host
 moosemanstudios.com: could not connect to host
@@ -5674,17 +5688,16 @@ motherbase.io: could not connect to host
 motionfreight.com: could not connect to host
 motionpicturesolutions.com: did not receive HSTS header
 motocyklovedily.cz: did not receive HSTS header
 mottvd.com: could not connect to host
 moudicat.com: max-age too low: 6307200
 moula.com.au: did not receive HSTS header
 mountainmusicpromotions.com: did not receive HSTS header
 moviedollars.com: did not receive HSTS header
-moviefreeze.com: did not receive HSTS header
 moviesabout.net: could not connect to host
 moy-gorod.od.ua: did not receive HSTS header
 moy.cat: did not receive HSTS header
 mozoa.net: could not connect to host
 mp3juices.is: could not connect to host
 mpkossen.com: did not receive HSTS header
 mqas.net: could not connect to host
 mr-hosting.com: could not connect to host
@@ -5703,16 +5716,17 @@ mstd.tokyo: did not receive HSTS header
 mstdn-tech.jp: could not connect to host
 mszaki.com: did not receive HSTS header
 mt.me.uk: could not connect to host
 mtamaki.com: could not connect to host
 mtdn.jp: could not connect to host
 mtg-esport.de: did not receive HSTS header
 mujadin.se: did not receive HSTS header
 mullen.net.au: did not receive HSTS header
+multikalender.de: did not receive HSTS header
 mundodapoesia.com: did not receive HSTS header
 munich-rage.de: could not connect to host
 munkiepus.com: did not receive HSTS header
 munuc.org: did not receive HSTS header
 munzee.com: did not receive HSTS header
 muonium.ch: could not connect to host
 muriburi.land: could not connect to host
 muriburiland.com: could not connect to host
@@ -5795,17 +5809,17 @@ nadia.pt: could not connect to host
 nagios.by: could not connect to host
 nagoya-kyuyo.com: could not connect to host
 naiharngym.com: did not receive HSTS header
 najedlo.sk: could not connect to host
 nakamastreamingcommunity.com: could not connect to host
 nakliyatsirketi.biz: could not connect to host
 nakuro.de: could not connect to host
 nalexandru.xyz: could not connect to host
-nalifornia.com: could not connect to host
+nalifornia.com: did not receive HSTS header
 nalinux.cz: did not receive HSTS header
 nallon.com.br: could not connect to host
 namacindia.com: did not receive HSTS header
 namaho.com: could not connect to host
 named.ga: could not connect to host
 nametaken-cloud.duckdns.org: could not connect to host
 namethatbone.com: could not connect to host
 namorico.me: could not connect to host
@@ -5931,45 +5945,44 @@ nikcub.com: could not connect to host
 niklaslindblad.se: did not receive HSTS header
 niloxy.com: did not receive HSTS header
 ninchisho-online.com: did not receive HSTS header
 ninhs.org: could not connect to host
 ninjaspiders.com: did not receive HSTS header
 nippler.org: did not receive HSTS header
 nippombashi.net: did not receive HSTS header
 nipponcareers.com: did not receive HSTS header
-nitropanel.com: did not receive HSTS header
 nixien.fr: could not connect to host
 nixmag.net: could not connect to host
 nkautoservice.nl: could not connect to host
 nll.fi: could not connect to host
 nmadda.com: could not connect to host
 nmctest.net: could not connect to host
 nmueller.at: could not connect to host
 nnote.net: did not receive HSTS header
 nnya.cat: could not connect to host
 no-ip.cz: did not receive HSTS header
 no17sifangjie.cc: could not connect to host
 nocallaghan.com: could not connect to host
 noclegi-online.pl: did not receive HSTS header
 noctinus.tk: did not receive HSTS header
 node-core-app.com: could not connect to host
 nodebrewery.com: could not connect to host
+nodefoo.com: did not receive HSTS header
 nodespin.com: could not connect to host
 nodetemple.com: could not connect to host
 nodi.at: did not receive HSTS header
 noexpect.org: could not connect to host
 noima.com: did not receive HSTS header
 noisebridge.social: could not connect to host
 nolberg.net: did not receive HSTS header
 nolimitsbook.de: did not receive HSTS header
 nolte.work: could not connect to host
 nomorebytes.de: could not connect to host
 noodlesandwich.com: did not receive HSTS header
-nootropicsource.com: did not receive HSTS header
 nope.website: could not connect to host
 nopex.no: could not connect to host
 nopol.de: could not connect to host
 norandom.com: could not connect to host
 norb.at: could not connect to host
 nordlicht.photography: did not receive HSTS header
 norge.guide: could not connect to host
 northcutt.com: did not receive HSTS header
@@ -6027,31 +6040,32 @@ null-sec.ru: could not connect to host
 null.cat: did not receive HSTS header
 null.tips: could not connect to host
 nullpoint.at: did not receive HSTS header
 nullpro.com: could not connect to host
 numericacu.com: did not receive HSTS header
 numero-di-telefono.it: could not connect to host
 numista.com: did not receive HSTS header
 nuos.org: could not connect to host
+nuovamoda.al: did not receive HSTS header
 nurserybook.co: did not receive HSTS header
 nusatrip-api.com: did not receive HSTS header
 nutricuerpo.com: did not receive HSTS header
 nutritionculture.com: could not connect to host
 nutsandboltsmedia.com: did not receive HSTS header
 nwa.xyz: could not connect to host
 nweb.co.nz: could not connect to host
 nwork.media: could not connect to host
 nyazeeland.guide: could not connect to host
 nycroth.com: could not connect to host
 nyesider.org: could not connect to host
 nyored.com: did not receive HSTS header
 nyphox.net: could not connect to host
 nysepho.pw: could not connect to host
-nysifclaimcentral.com: could not connect to host
+nysifclaimcentral.com: did not receive HSTS header
 nystart.no: did not receive HSTS header
 nz.search.yahoo.com: max-age too low: 172800
 nzbs.io: could not connect to host
 nzquakes.maori.nz: could not connect to host
 o-rickroll-y.pw: could not connect to host
 o0o.one: could not connect to host
 oasis.mobi: could not connect to host
 oben.pl: did not receive HSTS header
@@ -6129,17 +6143,16 @@ online-casino.eu: did not receive HSTS h
 online-wetten.de: did not receive HSTS header
 online.swedbank.se: did not receive HSTS header
 onlinebiller.com: did not receive HSTS header
 onlinebizdirect.com: did not receive HSTS header
 onlinecompliance.org: did not receive HSTS header
 onlinedemo.hu: could not connect to host
 onlinedeposit.us: could not connect to host
 onlinekasino.de: did not receive HSTS header
-onlinepokerspelen.be: did not receive HSTS header
 onlinepollsph.com: could not connect to host
 onlineschadestaat.nl: did not receive HSTS header
 onlinespielothek.com: did not receive HSTS header
 onlinewetten.de: could not connect to host
 only-roses.co.uk: did not receive HSTS header
 only-roses.com: did not receive HSTS header
 onlyshopstation.com: did not receive HSTS header
 onlyzero.net: could not connect to host
@@ -6257,16 +6270,17 @@ pagetoimage.com: could not connect to ho
 pahlawanpulsa.com: did not receive HSTS header
 paigeglass.com: did not receive HSTS header
 paino.cloud: could not connect to host
 paintingat.com: could not connect to host
 paisaone.com: did not receive HSTS header
 pajonzeck.de: could not connect to host
 paket.io: did not receive HSTS header
 paku.me: could not connect to host
+paleosquawk.com: did not receive HSTS header
 palmer.im: could not connect to host
 pamplona.tv: could not connect to host
 pamsoft.pl: max-age too low: 0
 pan.tips: could not connect to host
 panaceallc.net: could not connect to host
 panama-gbs.com: did not receive HSTS header
 panamaequity.com: did not receive HSTS header
 panamateakforestry.com: did not receive HSTS header
@@ -6282,17 +6296,16 @@ papelariadante.com.br: could not connect
 papercard.co.uk: did not receive HSTS header
 papercrunch.io: could not connect to host
 papierniak.net: could not connect to host
 papygeek.com: could not connect to host
 parabhairavayoga.com: max-age too low: 0
 paradiselost.com: max-age too low: 0
 parent5446.us: could not connect to host
 parentmail.co.uk: did not receive HSTS header
-parisfranceparking.com: did not receive HSTS header
 parisvox.info: did not receive HSTS header
 parithy.net: could not connect to host
 parkingplus.co.il: could not connect to host
 parkrocker.com: did not receive HSTS header
 parkwithark.com: could not connect to host
 parpaing-paillette.net: could not connect to host
 particonpsplus.it: did not receive HSTS header
 partirkyoto.jp: did not receive HSTS header
@@ -6595,17 +6608,16 @@ pressenews.net: did not receive HSTS hea
 pressfreedomfoundation.org: did not receive HSTS header
 prettygrouse.com: did not receive HSTS header
 pretzlaff.info: did not receive HSTS header
 preworkout.me: could not connect to host
 prezola.com: did not receive HSTS header
 prgslab.net: could not connect to host
 pridoc.se: did not receive HSTS header
 prilock.com: did not receive HSTS header
-princesparktouch.com: did not receive HSTS header
 principalstest.com: did not receive HSTS header
 printerest.io: could not connect to host
 printersonline.be: did not receive HSTS header
 printfn.com: could not connect to host
 priolkar.com: did not receive HSTS header
 privacylabs.io: did not receive HSTS header
 privacyrup.net: could not connect to host
 privytime.com: could not connect to host
@@ -6861,41 +6873,41 @@ remaimodern.org: did not receive HSTS he
 remedica.fr: did not receive HSTS header
 remedium.de: did not receive HSTS header
 rememberthis.co.za: could not connect to host
 remitatm.com: did not receive HSTS header
 remodela.com.ve: could not connect to host
 remonttitekniikka.fi: could not connect to host
 remoteham.com: could not connect to host
 remotestance.com: did not receive HSTS header
-renem.net: max-age too low: 2592000
+rencaijia.com: did not receive HSTS header
 rengarenkblog.com: could not connect to host
 renideo.fr: could not connect to host
 renkhosting.com: did not receive HSTS header
 renlong.org: did not receive HSTS header
 renrenss.com: could not connect to host
 rentacarcluj.xyz: did not receive HSTS header
 rentbrowsertrain.me: could not connect to host
 rentcarassist.com: could not connect to host
 renteater.com: could not connect to host
 rentex.com: did not receive HSTS header
 renyiyou.com: could not connect to host
 replacemychina.com: could not connect to host
 report-to.com: did not receive HSTS header
 reprolife.co.uk: could not connect to host
-reptrax.com: did not receive HSTS header
 res-rheingau.de: did not receive HSTS header
 res42.com: could not connect to host
 reserve-online.net: did not receive HSTS header
 residentsinsurance.co.uk: did not receive HSTS header
 resl20.servehttp.com: could not connect to host
 respice.xyz: could not connect to host
 respostas.com.br: did not receive HSTS header
 restaurace-klokocka.cz: did not receive HSTS header
 restchart.com: did not receive HSTS header
+restioson.me: did not receive HSTS header
 restrealitaet.de: did not receive HSTS header
 returnofwar.com: could not connect to host
 revapost.ch: could not connect to host
 revealdata.com: did not receive HSTS header
 revelaciones.tv: could not connect to host
 revello.org: did not receive HSTS header
 reverie.pw: could not connect to host
 review.info: did not receive HSTS header
@@ -7048,16 +7060,17 @@ safemovescheme.co.uk: could not connect 
 safersurfing.eu: did not receive HSTS header
 safewings-nh.nl: could not connect to host
 sagarhandicraft.com: could not connect to host
 sageth.com: max-age too low: 0
 sah3.net: could not connect to host
 saharalondon.com: max-age too low: 0
 saharmassachi.com: could not connect to host
 sail-nyc.com: did not receive HSTS header
+saint-astier-triathlon.com: did not receive HSTS header
 saintjohnlutheran.church: did not receive HSTS header
 sairai.bid: did not receive HSTS header
 sakaki.anime.my: max-age too low: 5184000
 sakaserver.com: did not receive HSTS header
 sakib.ninja: did not receive HSTS header
 sakurabuff.com: could not connect to host
 salserocafe.com: did not receive HSTS header
 salserototal.com: could not connect to host
@@ -7202,16 +7215,17 @@ securesuisse.ch: could not connect to ho
 securita.eu: did not receive HSTS header
 security-carpet.com: could not connect to host
 security-thoughts.org: could not connect to host
 securitybsides.pl: did not receive HSTS header
 securityglance.com: could not connect to host
 securityinet.biz: did not receive HSTS header
 securityinet.net: did not receive HSTS header
 securityinet.org.il: did not receive HSTS header
+securitywithnick.com: did not receive HSTS header
 securiviera.ch: did not receive HSTS header
 sedoexpert.nl: could not connect to host
 sedoexperts.nl: could not connect to host
 sedrubal.de: could not connect to host
 sedziapilkarski.pl: did not receive HSTS header
 seedboxers.net: could not connect to host
 seefunk.net: did not receive HSTS header
 seele.ca: could not connect to host
@@ -7394,16 +7408,17 @@ sirius-lee.net: could not connect to hos
 sitehost.io: did not receive HSTS header
 sitennisclub.com: did not receive HSTS header
 siterip.org: could not connect to host
 sites.google.com: did not receive HSTS header (error ignored - included regardless)
 sitesforward.com: did not receive HSTS header
 sitesten.com: did not receive HSTS header
 sixtwentyten.com: did not receive HSTS header
 sizingservers.be: did not receive HSTS header
+skandiabanken.no: did not receive HSTS header
 ski-insurance.com.au: did not receive HSTS header
 skidstresser.com: did not receive HSTS header
 skillproxy.com: could not connect to host
 skillproxy.net: could not connect to host
 skillproxy.org: could not connect to host
 skk.io: could not connect to host
 skoda-clever-lead.de: could not connect to host
 skoda-nurdiebesten.de: did not receive HSTS header
@@ -7435,28 +7450,29 @@ slightfuture.com: did not receive HSTS h
 slix.io: could not connect to host
 slope.haus: could not connect to host
 slovakiana.sk: did not receive HSTS header
 sluplift.com: did not receive HSTS header
 slycurity.de: did not receive HSTS header
 smablo.com: did not receive HSTS header
 smallcdn.rocks: could not connect to host
 smallshopit.com: did not receive HSTS header
-smares.de: did not receive HSTS header
+smares.de: could not connect to host
 smart-mirror.de: did not receive HSTS header
 smart-ov.nl: could not connect to host
 smartbuyelectric.com: could not connect to host
 smartcleaningcenter.nl: did not receive HSTS header
 smartcoin.com.br: could not connect to host
 smarterskies.gov: did not receive HSTS header
 smartfon4you.ru: max-age too low: 0
 smarthomedna.com: did not receive HSTS header
 smartofficesandsmarthomes.com: did not receive HSTS header
 smartphone.continental.com: could not connect to host
 smartrak.co.nz: did not receive HSTS header
+smartwurk.nl: did not receive HSTS header
 smdev.fr: could not connect to host
 smet.us: could not connect to host
 smexpt.com: did not receive HSTS header
 smimea.com: could not connect to host
 smirkingwhorefromhighgarden.pro: could not connect to host
 smittix.co.uk: did not receive HSTS header
 smkn1lengkong.sch.id: did not receive HSTS header
 smksi2.com: could not connect to host
@@ -7485,17 +7501,16 @@ socialgrowing.cl: did not receive HSTS h
 socialhead.io: could not connect to host
 socialhub.com: did not receive HSTS header
 socialprize.com: could not connect to host
 socialspirit.com.br: did not receive HSTS header
 sockeye.cc: could not connect to host
 socomponents.co.uk: could not connect to host
 sodacore.com: could not connect to host
 softballsavings.com: did not receive HSTS header
-softcreatr.de: did not receive HSTS header
 software.rocks: could not connect to host
 sogeek.me: could not connect to host
 sokolka.tv: did not receive HSTS header
 sol-3.de: did not receive HSTS header
 solarcom.com.br: could not connect to host
 solentes.com.br: could not connect to host
 solidfuelappliancespares.co.uk: did not receive HSTS header
 solidus.systems: did not receive HSTS header
@@ -7660,17 +7675,16 @@ stn.me.uk: did not receive HSTS header
 stockseyeserum.com: could not connect to host
 stocktrade.de: could not connect to host
 stoffe-monster.de: did not receive HSTS header
 stoick.me: could not connect to host
 stole-my.bike: could not connect to host
 stole-my.tv: could not connect to host
 stolkschepen.nl: did not receive HSTS header
 stonecutterscommunity.com: could not connect to host
-stopbreakupnow.org: did not receive HSTS header
 stopwoodfin.org: could not connect to host
 storbritannien.guide: could not connect to host
 storecove.com: did not receive HSTS header
 storeden.com: did not receive HSTS header
 storefrontify.com: did not receive HSTS header
 storiesofhealth.org: could not connect to host
 storillo.com: did not receive HSTS header
 stormhub.org: could not connect to host
@@ -7718,17 +7732,16 @@ sugarcitycon.com: could not connect to h
 sugarsweetorsour.com: did not receive HSTS header
 suian.or.jp: max-age too low: 86400
 suite73.org: could not connect to host
 summitbankofkc.com: did not receive HSTS header
 sumoatm.com: did not receive HSTS header
 sumoscout.de: could not connect to host
 suncountrymarine.com: did not receive HSTS header
 sundanceusa.com: did not receive HSTS header
-sunflyer.cn: did not receive HSTS header
 sunlandsg.vn: did not receive HSTS header
 sunnyfruit.ru: could not connect to host
 sunshinepress.org: could not connect to host
 sunyanzi.tk: could not connect to host
 suos.io: could not connect to host
 supcro.com: could not connect to host
 super-erotica.ru: could not connect to host
 super-garciniaslim.com: could not connect to host
@@ -7804,17 +7817,16 @@ t-complex.space: could not connect to ho
 t-ken.xyz: could not connect to host
 t-tz.com: could not connect to host
 t0dd.eu: could not connect to host
 t2i.nl: max-age too low: 3600
 t4c-rebirth.com: could not connect to host
 t4x.org: could not connect to host
 taabe.xyz: could not connect to host
 taberu-fujitsubo.com: did not receive HSTS header
-tacomafia.net: did not receive HSTS header
 tadigitalstore.com: could not connect to host
 tafoma.com: did not receive HSTS header
 tageau.com: could not connect to host
 taglondon.org: did not receive HSTS header
 tailify.com: did not receive HSTS header
 tails.com.ar: did not receive HSTS header
 talado.gr: could not connect to host
 tales-of-interia.de: could not connect to host
@@ -7830,21 +7842,20 @@ tandarts-haarlem.nl: did not receive HST
 tangel.me: could not connect to host
 tangibilizing.com: could not connect to host
 taniesianie.pl: did not receive HSTS header
 tankfreunde.de: did not receive HSTS header
 tante-bugil.net: could not connect to host
 tantotiempo.de: did not receive HSTS header
 tanze-jetzt.de: could not connect to host
 taotuba.net: did not receive HSTS header
-taozj.org: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]"  nsresult: "0x80004005 (NS_ERROR_FAILURE)"  location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 119"  data: no]
+taozj.org: did not receive HSTS header
 tapfinder.ca: could not connect to host
 tapka.cz: did not receive HSTS header
 tappublisher.com: did not receive HSTS header
-taranis.re: could not connect to host
 taravancil.com: did not receive HSTS header
 targaryen.house: could not connect to host
 tarhauskielto.fi: did not receive HSTS header
 tartaros.fi: could not connect to host
 taskstats.com: could not connect to host
 taskulu.ir: could not connect to host
 tasmansecurity.com: could not connect to host
 tassup.com: could not connect to host
@@ -7973,17 +7984,16 @@ thebrotherswarde.com: could not connect 
 thecapitalbank.com: did not receive HSTS header
 thecharlestonwaldorf.com: did not receive HSTS header
 thechunk.net: could not connect to host
 theclementinebutchers.com: could not connect to host
 theclubjersey.com: did not receive HSTS header
 thecoffeehouse.xyz: could not connect to host
 thecrochetcottage.net: could not connect to host
 thedrop.pw: did not receive HSTS header
-thedutchmarketers.com: did not receive HSTS header
 thedystance.com: could not connect to host
 theebookkeepers.co.za: did not receive HSTS header
 theelitebuzz.com: did not receive HSTS header
 theendofzion.com: did not receive HSTS header
 theescapistswiki.com: could not connect to host
 theeyeopener.com: did not receive HSTS header
 thefarbeyond.com: could not connect to host
 theflowerbasketonline.com: could not connect to host
@@ -8118,20 +8128,20 @@ tiremoni.ch: did not receive HSTS header
 tirex.media: did not receive HSTS header
 titanlab.de: could not connect to host
 titanleaf.com: could not connect to host
 titouan.co: did not receive HSTS header
 tittarpuls.se: could not connect to host
 titties.ml: could not connect to host
 tjc.wiki: could not connect to host
 tjeckien.guide: could not connect to host
-tjullrich.de: could not connect to host
 tkappertjedemetamorfose.nl: could not connect to host
 tkarstens.de: did not receive HSTS header
 tkonstantopoulos.tk: could not connect to host
+tlach.cz: did not receive HSTS header
 tlcdn.net: could not connect to host
 tlo.hosting: could not connect to host
 tlo.link: could not connect to host
 tlo.network: could not connect to host
 tls.li: could not connect to host
 tlsbv.nl: did not receive HSTS header
 tlshost.net: could not connect to host
 tm-solutions.eu: did not receive HSTS header
@@ -8160,16 +8170,17 @@ togelonlinecommunity.com: did not receiv
 tokenloan.com: could not connect to host
 tokoone.com: did not receive HSTS header
 tokotamz.net: could not connect to host
 tokotimbangandigitalmurah.web.id: did not receive HSTS header
 tokoyo.biz: could not connect to host
 tollmanz.com: did not receive HSTS header
 tolud.com: did not receive HSTS header
 tom.horse: did not receive HSTS header
+tom.run: did not receive HSTS header
 tomeara.net: could not connect to host
 tomevans.io: did not receive HSTS header
 tomlankhorst.nl: did not receive HSTS header
 tomli.me: could not connect to host
 tommsy.com: did not receive HSTS header
 tommyads.com: could not connect to host
 tommyweber.de: did not receive HSTS header
 tomphill.co.uk: could not connect to host
@@ -8200,17 +8211,16 @@ totalworkout.fitness: did not receive HS
 totem-eshop.cz: could not connect to host
 toucedo.de: could not connect to host
 touchbasemail.com: did not receive HSTS header
 touchpointidg.us: could not connect to host
 touchscreen-handy.de: did not receive HSTS header
 touchstonefms.co.uk: did not receive HSTS header
 touchtable.nl: did not receive HSTS header
 tourpeer.com: did not receive HSTS header
-toutenmusic.fr: did not receive HSTS header
 toxme.se: could not connect to host
 toyotamotala.se: could not connect to host
 tpbcdn.com: could not connect to host
 tpe-edu.com: could not connect to host
 tpms4u.at: did not receive HSTS header
 tracker-gps.ch: could not connect to host
 trackmeet.io: did not receive HSTS header
 tracktivity.com.au: did not receive HSTS header
@@ -8403,17 +8413,17 @@ unccdesign.club: could not connect to ho
 unclegen.xyz: could not connect to host
 under30stravelinsurance.com.au: did not receive HSTS header
 underkin.com: could not connect to host
 unfiltered.nyc: could not connect to host
 ungern.guide: could not connect to host
 uni-games.com: could not connect to host
 unicefkaarten.be: did not receive HSTS header
 unicooo.com: could not connect to host
-unifei.edu.br: did not receive HSTS header
+unifei.edu.br: could not connect to host
 uniformecomgas.com.br: could not connect to host
 uniformehumboldt.com.br: did not receive HSTS header
 unikitty-on-tour.com: could not connect to host
 unionstationapp.com: could not connect to host
 unison.com: did not receive HSTS header
 unisyssecurity.com: did not receive HSTS header
 unitlabs.net: could not connect to host
 unitrade-425.co.za: did not receive HSTS header
@@ -8551,16 +8561,17 @@ vestacp.top: could not connect to host
 vetdnacenter.com: did not receive HSTS header
 veterinaire-cazeres-foucault.fr: could not connect to host
 vetmgmt.com: could not connect to host
 veto.fish: could not connect to host
 vfree.org: could not connect to host
 vglimg.com: could not connect to host
 vh.net: could not connect to host
 vhost.co.id: could not connect to host
+viabemestar.com.br: did not receive HSTS header
 viadeux.com: could not connect to host
 viasinc.com: did not receive HSTS header
 vicianovi.cz: could not connect to host
 victorenxovais.com.br: could not connect to host
 victoriapemberton.com: did not receive HSTS header
 vidbuchanan.co.uk: did not receive HSTS header
 viddiaz.com: did not receive HSTS header
 videomail.io: did not receive HSTS header
@@ -8584,33 +8595,32 @@ viltsu.net: did not receive HSTS header
 vinasec.se: could not connect to host
 vincentkooijman.at: did not receive HSTS header
 vincentkooijman.nl: did not receive HSTS header
 vinciconps4.it: could not connect to host
 vinsetchampagne.fr: did not receive HSTS header
 vintageheartcoffee.com: did not receive HSTS header
 vio.no: did not receive HSTS header
 violenceinterrupted.org: did not receive HSTS header
-viosey.com: did not receive HSTS header
 viperdns.com: could not connect to host
 viphospitality.se: could not connect to host
 vipmusic.ga: could not connect to host
 vipnettikasinoklubi.com: could not connect to host
 viral8.jp: could not connect to host
 virginiacrimeanalysisnetwork.org: did not receive HSTS header
 virtualstrongbox.ca: did not receive HSTS header
 visaexpert.co.za: did not receive HSTS header
 visanhigia.com: did not receive HSTS header
 viserproject.com: did not receive HSTS header
 vision-painting.com: did not receive HSTS header
 visionthroughknowledge.com: did not receive HSTS header
 visitbroadstairs.com: could not connect to host
 vissanum.com: did not receive HSTS header
 vissersgrootboek.nl: did not receive HSTS header
-vistarait.com: did not receive HSTS header
+vistarait.com: could not connect to host
 visualvotes.co.uk: could not connect to host
 vitagenda.nl: could not connect to host
 vitalita.cz: did not receive HSTS header
 vitalorange.com: max-age too low: 7889238
 vitta.me: did not receive HSTS header
 viva-french.com: did not receive HSTS header
 vivasports.com.br: could not connect to host
 vivocloud.com: could not connect to host
@@ -8682,17 +8692,17 @@ walkeryoung.ca: could not connect to hos
 wallabag.it: did not receive HSTS header
 wallabag.org: did not receive HSTS header
 wallet.google.com: did not receive HSTS header (error ignored - included regardless)
 wallsblog.dk: could not connect to host
 walnutgaming.co.uk: could not connect to host
 walterlynnmosley.com: did not receive HSTS header
 wan.pp.ua: could not connect to host
 wanban.io: could not connect to host
-wangjun.me: could not connect to host
+wangjun.me: did not receive HSTS header
 wangkezun.com: could not connect to host
 wangqiliang.cn: did not receive HSTS header
 wangqiliang.org: did not receive HSTS header
 wangqiliang.xn--fiqs8s: could not connect to host
 wangzuan168.cc: could not connect to host
 wapjt.cn: could not connect to host
 wapt.fr: did not receive HSTS header
 warandpeace.xyz: could not connect to host
@@ -8705,17 +8715,17 @@ warsentech.com: could not connect to hos
 warsh.moe: did not receive HSTS header
 watchium.com: did not receive HSTS header
 waterforlife.net.au: did not receive HSTS header
 waterpoint.com.br: could not connect to host
 watersportmarkt.net: did not receive HSTS header
 watsonhall.uk: could not connect to host
 wattechweb.com: did not receive HSTS header
 wave.is: could not connect to host
-wavefloatrooms.com: did not receive HSTS header
+wavefloatrooms.com: could not connect to host
 wavefrontsystemstech.com: could not connect to host
 we-bb.com: could not connect to host
 wear2work.nl: did not receive HSTS header
 wearesouthafricans.com: did not receive HSTS header
 weaverhairextensions.nl: could not connect to host
 web-industry.fr: could not connect to host
 web-insider.net: could not connect to host
 web-redacteuren.nl: max-age too low: 0
@@ -8853,16 +8863,17 @@ withyoutube.com: did not receive HSTS he
 wittcher.com: could not connect to host
 wittydonut.com: could not connect to host
 witzemaschine.com: max-age too low: 0
 wiz.biz: could not connect to host
 wk-cpm.com: could not connect to host
 wlzhiyin.cn: could not connect to host
 wmcuk.net: could not connect to host
 wmfinanz.com: could not connect to host
+wmoda.com.br: did not receive HSTS header
 wnmm.nl: could not connect to host
 wnnc.co.uk: could not connect to host
 wobblylang.org: could not connect to host
 wochenentwicklung.com: did not receive HSTS header
 wodice.com: could not connect to host
 wohnungsbau-ludwigsburg.de: did not receive HSTS header
 woima.fi: max-age too low: 604800
 wolfesden.com: could not connect to host
@@ -9046,17 +9057,17 @@ xrp.pw: could not connect to host
 xtom.email: could not connect to host
 xtream-hosting.com: could not connect to host
 xtream-hosting.de: could not connect to host
 xtream-hosting.eu: could not connect to host
 xtreamhosting.eu: could not connect to host
 xtrim.ru: did not receive HSTS header
 xuexb.com: did not receive HSTS header
 xunn.io: did not receive HSTS header
-xuwei.de: did not receive HSTS header
+xuwei.de: could not connect to host
 xuyh0120.win: did not receive HSTS header
 xxbase.com: could not connect to host
 xynex.us: could not connect to host
 y-o-w.com: did not receive HSTS header
 y-s.pw: could not connect to host
 yachts-magazine.com: did not receive HSTS header
 yagi2.com: could not connect to host
 yamamo10.com: could not connect to host
@@ -9106,17 +9117,16 @@ yooooex.com: did not receive HSTS header
 yoru.me: did not receive HSTS header
 youcontrol.ru: could not connect to host
 youfencun.com: did not receive HSTS header
 youlog.net: could not connect to host
 youngandunited.nl: did not receive HSTS header
 youon.tokyo: could not connect to host
 yourbapp.ch: could not connect to host
 yourcomputer.expert: did not receive HSTS header
-yourforex.org: did not receive HSTS header
 yoursecondphone.co: could not connect to host
 yourstrongbox.com: could not connect to host
 ypiresia.fr: could not connect to host
 ytcuber.xyz: could not connect to host
 ytvwld.de: did not receive HSTS header
 yu7.jp: did not receive HSTS header
 yudan.com.br: could not connect to host
 yufan.me: did not receive HSTS header
@@ -9145,17 +9155,16 @@ zakoncontrol.com: did not receive HSTS h
 zamorano.edu: could not connect to host
 zamos.ru: max-age too low: 0
 zaneweb.org: could not connect to host
 zao.fi: could not connect to host
 zaoshanghao-dajia.rhcloud.com: could not connect to host
 zap.yt: did not receive HSTS header
 zarmarket.org: did not receive HSTS header
 zarooba.com: could not connect to host
-zary.me: did not receive HSTS header
 zavca.com: did not receive HSTS header
 zbigniewgalucki.eu: did not receive HSTS header
 zcon.nl: could not connect to host
 zdravotnickasluzba.eu: could not connect to host
 zdrowiepaleo.pl: did not receive HSTS header
 zebrababy.cn: could not connect to host
 zebry.nl: could not connect to host
 zecrypto.com: could not connect to host
@@ -9187,17 +9196,17 @@ zhang.wtf: could not connect to host
 zhangruilin.com: did not receive HSTS header
 zhaojin97.cn: could not connect to host
 zhendingresources.com: did not receive HSTS header
 zhh.in: could not connect to host
 zhihua-lai.com: did not receive HSTS header
 zhuji.com.cn: could not connect to host
 zi0r.com: did not receive HSTS header
 zian.online: could not connect to host
-zicklam.com: did not receive HSTS header
+zicklam.com: could not connect to host
 zigcore.com.br: could not connect to host
 zihao.me: did not receive HSTS header
 zinc-x.com: did not receive HSTS header
 zinenapse.info: could not connect to host
 zippy-download.com: could not connect to host
 zippy-download.de: could not connect to host
 zirtue.io: did not receive HSTS header
 zixo.sk: could not connect to host
@@ -9209,16 +9218,17 @@ zjutv.com: could not connect to host
 zk.gd: did not receive HSTS header
 zkillboard.com: did not receive HSTS header
 zking.ga: could not connect to host
 zmsastro.co.za: could not connect to host
 zmy.im: did not receive HSTS header
 zocken.com: did not receive HSTS header
 zoe.vc: could not connect to host
 zohar.link: could not connect to host
+zolotoy-standart.com.ua: did not receive HSTS header
 zomiac.pp.ua: could not connect to host
 zoneminder.com: did not receive HSTS header
 zoners.si: could not connect to host
 zonky.io: could not connect to host
 zoo24.de: did not receive HSTS header
 zoofaeth.de: did not receive HSTS header
 zoomingin.net: max-age too low: 5184000
 zoommailing.com: did not receive HSTS header
--- a/security/manager/ssl/nsSTSPreloadList.inc
+++ b/security/manager/ssl/nsSTSPreloadList.inc
@@ -3,17 +3,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /*****************************************************************************/
 /* This is an automatically generated file. If you're not                    */
 /* nsSiteSecurityService.cpp, you shouldn't be #including it.     */
 /*****************************************************************************/
 
 #include <stdint.h>
-const PRTime gPreloadListExpirationTime = INT64_C(1520796158151000);
+const PRTime gPreloadListExpirationTime = INT64_C(1520883205571000);
 %%
 0-1.party, 1
 0.me.uk, 1
 00001.am, 1
 00002.am, 1
 0005pay.com, 1
 0010100.net, 1
 00220022.net, 1
@@ -378,16 +378,17 @@ 5533445.com, 1
 555fl.com, 1
 555xl.com, 1
 55scc.com, 1
 57aromas.com, 1
 5apps.com, 1
 5c1fd0f31022cbc40af9f785847baaf9.space, 1
 5crowd.com, 1
 5ece.de, 1
+5francs.com, 1
 5gb.space, 1
 5h0r7.com, 1
 5kraceforals.com, 1
 5starbouncycastlehire.co.uk, 1
 605508.cc, 1
 605508.com, 1
 646.io, 0
 64bitgaming.de, 1
@@ -664,16 +665,17 @@ achromatisch.de, 1
 achterblog.de, 1
 achterhoekseveiligheidsbeurs.nl, 1
 achterstieg.dedyn.io, 1
 achtzehn.eu, 1
 achtzehnterachter.de, 1
 acidbin.co, 1
 aciksite.com, 1
 ackis.duckdns.org, 1
+acksoft.fr, 1
 acksoftdemo.fr, 1
 aclu.org, 0
 acluva.org, 0
 acme.beer, 1
 acmexyz123.info, 1
 acnpacific.com, 1
 aconnor.xyz, 1
 acorncastles.co.uk, 1
@@ -1793,17 +1795,17 @@ apila.us, 1
 apis.google.com, 1
 apis.moe, 1
 apisyouwonthate.com, 1
 apk.li, 1
 apk4fun.com, 1
 apkoyunlar.club, 1
 apl2bits.net, 1
 aplikaceproandroid.cz, 1
-aplis-online.de, 1
+aplis-online.de, 0
 aplpackaging.co.uk, 1
 aplu.fr, 1
 apmpproject.org, 1
 apn-dz.org, 1
 apn-einstellungen.de, 1
 apoil.org, 1
 apoly.de, 1
 aposke.com, 1
@@ -1915,16 +1917,17 @@ arawaza.info, 1
 araxis.com, 1
 arbeitskreis-asyl-eningen.de, 1
 arbeitslosenverwaltung.de, 1
 arbitrarion.com, 1
 arbitrary.ch, 1
 arboworks.com, 1
 arcadiaeng.com, 1
 arcaik.net, 1
+arcbit.io, 1
 arcbouncycastles.co.uk, 1
 arcenergy.co.uk, 1
 archii.ca, 1
 archimedicx.com, 1
 architectdirect.nl, 0
 architecte-interieur.be, 1
 archivesdelavieordinaire.ch, 1
 archlinux.de, 1
@@ -3546,16 +3549,17 @@ blankersfamily.com, 1
 blastentertainment.com.au, 1
 blastersklan.com, 1
 blastzoneentertainments.co.uk, 1
 blaudev.es, 1
 blauerhunger.de, 1
 blayne.me, 1
 blayneallan.com, 1
 blazeit.io, 1
+blazor.nl, 1
 bleaching-tipps.de, 1
 bleche-onlineshop.de, 1
 blechinger.io, 1
 blechpirat.name, 1
 blechschmidt.saarland, 1
 blenderrecipereviews.com, 1
 blendle.com, 1
 blendle.nl, 1
@@ -4101,17 +4105,16 @@ brejoc.com, 1
 brendanscherer.com, 1
 brentacampbell.com, 1
 brentnewbury.com, 1
 bressier.fr, 1
 bretcarmichael.com, 1
 brettabel.com, 1
 brettcornwall.com, 1
 brettelliff.com, 1
-brettpemberton.xyz, 1
 bretz-hufer.de, 1
 bretzner.fr, 1
 brevboxar.se, 1
 brewsouth.com, 1
 brewtrackr.com, 1
 brfvh24.se, 1
 brgins.com, 1
 brianalaway.com, 1
@@ -5113,17 +5116,16 @@ chaseganey.com, 1
 chat-libera.org, 1
 chat-senza-registrazione.net, 1
 chat.cz, 1
 chat40.net, 1
 chatbelgie.eu, 1
 chatbots.email, 1
 chatbots.systems, 1
 chatear.social, 1
-chateau-belvoir.com, 1
 chateau-de-lisle.fr, 1
 chateaudestrainchamps.com, 1
 chatfacile.org, 1
 chatint.com, 1
 chatitaly.org, 1
 chatme.im, 0
 chatnbook.com, 1
 chatnederland.eu, 1
@@ -5425,17 +5427,16 @@ ciner.is, 1
 cinerama.com.br, 1
 cinnabon.com, 1
 cinq-elements.com, 1
 cinq-elements.fr, 1
 cinq-elements.net, 1
 cinsects.de, 1
 cinteo.com, 1
 cinto.cc, 1
-cio.gov, 1
 cioscloud.com, 1
 cip.md, 1
 cipartyhire.co.uk, 1
 cipher.co.th, 1
 cipher.land, 1
 cipherboy.com, 1
 cipherli.st, 1
 ciphersuite.info, 1
@@ -5693,17 +5694,17 @@ cmylife.nl, 1
 cn.search.yahoo.com, 0
 cnam-idf.fr, 1
 cnam.net, 1
 cnbs.ch, 1
 cnc-lehrgang.de, 1
 cncbazar365.com, 1
 cncfraises.fr, 1
 cncrans.ch, 1
-cnetw.xyz, 0
+cnetw.xyz, 1
 cni-certing.it, 1
 cnlic.com, 1
 cnrd.me, 1
 cnwage.com, 1
 cnwarn.com, 1
 co-factor.ro, 1
 co-yutaka.com, 1
 co.search.yahoo.com, 0
@@ -6019,16 +6020,17 @@ conkret.ch, 1
 conkret.co.uk, 1
 conkret.de, 1
 conkret.eu, 1
 conkret.in, 1
 conkret.mobi, 1
 conmedapps.com, 1
 connect-ed.network, 1
 connect.dating, 1
+connect.facebook.net, 1
 connectedcare.md, 1
 connectingconcepts.com, 1
 connectmath.com, 1
 connectmy.car, 1
 connectum.eu, 1
 connext.de, 1
 conniesacademy.com, 1
 connorsmith.co, 1
@@ -6493,17 +6495,16 @@ ctnguyen.net, 1
 ctns.de, 1
 ctoforhire.com.au, 1
 ctomp.io, 1
 ctpe.net, 1
 ctrld.me, 1
 ctyi.me, 1
 cuanhua3s.com, 1
 cub-bouncingcastles.co.uk, 1
-cube-cloud.com, 1
 cube.de, 1
 cubecraft.net, 1
 cubecraftstore.com, 1
 cubecraftstore.net, 1
 cubekrowd.net, 1
 cubela.tech, 1
 cubia.de, 1
 cubia3.com, 1
@@ -7017,17 +7018,16 @@ dbq.com, 1
 dbrgn.ch, 1
 dbtsai.com, 1
 dbyz.co.uk, 1
 dc-occasies.be, 1
 dc562.org, 1
 dc585.info, 1
 dcautomacao.com.br, 1
 dcbouncycastles.co.uk, 1
-dcc.cat, 1
 dcc.moe, 1
 dccoffeeproducts.com, 1
 dcepler.net, 1
 dchatelain.ch, 1
 dchest.org, 1
 dckd.nl, 1
 dclaisse.fr, 1
 dcmt.co, 1
@@ -7367,17 +7367,16 @@ devafterdark.com, 1
 devalps.eu, 1
 devb.nl, 1
 devcast.io, 1
 devct.cz, 0
 devdesco.com, 1
 devdom.io, 1
 devdoodle.net, 1
 devel.cz, 1
-develop.cool, 1
 developer.mydigipass.com, 0
 developerfair.com, 1
 developermail.io, 1
 developers.facebook.com, 0
 developersclub.website, 1
 developfx.com, 1
 developmentaid.org, 1
 developmentsites.melbourne, 1
@@ -7484,17 +7483,16 @@ dicionariodegirias.com.br, 1
 dicionariodelatim.com.br, 1
 dicionariodenomesproprios.com.br, 1
 dicionariodesimbolos.com.br, 1
 dicionarioetimologico.com.br, 1
 dicionariopopular.com, 1
 dick.red, 1
 dickieslife.com, 1
 dickpics.ru, 1
-dicoding.com, 1
 didacte.com, 1
 didche.net, 1
 diddens.de, 1
 didierlaumen.be, 1
 didikhari.web.id, 1
 die-besten-weisheiten.de, 1
 die-blahuts.de, 1
 die-borts.ch, 1
@@ -7976,17 +7974,16 @@ dotneko.net, 1
 dotnetsandbox.ca, 1
 dotphoto.com, 1
 dotplex.com, 1
 dotplex.de, 1
 dotrox.net, 1
 dotsiam.com, 1
 doubleavineyards.com, 1
 doublefun.net, 1
-doublethink.online, 1
 doubleup.com.au, 1
 doubleyummy.uk, 1
 doucheba.gs, 1
 dougferris.id.au, 1
 doujinshi.info, 1
 dounats.com, 1
 douzer.de, 1
 dovenzorgmalawi.nl, 1
@@ -8105,16 +8102,17 @@ drixn.com, 1
 drixn.info, 1
 drixn.net, 1
 drizz.com.br, 1
 drjacquesmalan.com, 1
 drjenafernandez.com, 1
 drjoe.ca, 1
 drjuanitacollier.com, 1
 drkhsh.at, 1
+drkmtrx.xyz, 1
 drlangsdon.com, 1
 drlazarina.net, 1
 drms.us, 1
 drobniuch.pl, 0
 drogoz.moe, 1
 drogueriaelbarco.com, 1
 droidapp.nl, 1
 droidgyan.com, 1
@@ -8242,16 +8240,17 @@ duriaux-dentiste.ch, 1
 durys.be, 1
 dusmomente.com, 1
 dustri.org, 1
 dustycloth.com, 1
 dustygroove.com, 1
 dustyspokesbnb.ca, 1
 dutch.desi, 1
 dutch1.nl, 1
+dutchessuganda.com, 1
 dutchrank.nl, 1
 dutchwanderers.nl, 1
 dutchweballiance.nl, 1
 dutyfreeonboard.com, 1
 duyao.de, 0
 dv189.com, 1
 dvbris.co.uk, 1
 dvbris.com, 1
@@ -8496,17 +8495,16 @@ edicct.com, 1
 edisonchee.com, 1
 edisonlee55.com, 1
 edisonnissanparts.com, 1
 edit.yahoo.com, 0
 edited.de, 1
 edition-bambou.com, 1
 edition-sonblom.de, 1
 editoraacademiacrista.com.br, 1
-edlinus.cn, 1
 edmundcelis.com, 1
 edoss.co.za, 1
 edp-collaborative.com, 1
 edsm.net, 1
 edstep.com, 1
 edtech-hub.com, 1
 edtechwebb.com, 1
 edu6.cloud, 1
@@ -8996,16 +8994,17 @@ epic-vistas.de, 1
 epicbouncycastlehirenorwich.co.uk, 1
 epicbouncycastles.co.uk, 1
 epicenter.work, 1
 epicenter.works, 1
 epicentre.works, 1
 epichouse.net, 1
 epicinflatables.co.uk, 1
 epickitty.co.uk, 1
+epicpages.com, 1
 epicsecure.de, 1
 epicsoft.de, 1
 epicvistas.com, 1
 epicvistas.de, 1
 epicwalnutcreek.com, 1
 epilis.gr, 1
 epiphyte.network, 1
 epistas.com, 1
@@ -9056,16 +9055,17 @@ equinox.io, 1
 equipedefrance.tv, 1
 equipeferramentas.com.br, 1
 equipsupply.com, 1
 er-music.com, 1
 er.tl, 1
 erad.fr, 1
 erasmusplusrooms.com, 1
 erath.fr, 1
+erclab.kr, 1
 erdethamburgeronsdag.no, 1
 ereader.uno, 1
 erepublik-deutschland.de, 1
 erethon.com, 1
 erf-neuilly.com, 1
 ergo-open.de, 1
 ergovita.com.br, 1
 ergovitanet.com.br, 1
@@ -9665,17 +9665,16 @@ fancy-bridge.com, 1
 fander.it, 1
 fandler.cz, 1
 fandomservices.com, 1
 fanfareunion.ch, 1
 fangs.ink, 1
 fanjoe.be, 1
 fantasiapainter.com, 1
 fantasticcleaners.com.au, 1
-fantasticgardenersmelbourne.com.au, 1
 fantastichandymanmelbourne.com.au, 1
 fantasticpestcontrolmelbourne.com.au, 1
 fantasycastles.co.uk, 1
 fantasyescortsbirmingham.co.uk, 1
 fantasypartyhire.com.au, 1
 fantasyspectrum.com, 1
 fantopia.club, 1
 fanvoice.com, 1
@@ -9736,16 +9735,17 @@ fassi-sport.it, 1
 fastaim.de, 1
 fastbackmbg.be, 1
 fastbackmbm.be, 1
 fastcommerce.org, 1
 fastconfirm.com, 1
 fastforwardthemes.com, 1
 fastmail.com, 0
 fastonline.ro, 1
+fastpresence.com, 1
 fastrevision.com, 1
 fastwebsites.com.br, 1
 faszienrollen-info.de, 0
 fatdoge.cn, 1
 fatedata.com, 1
 fathers4equalrights.org, 1
 fatidique.com, 1
 fatimamoldes.com.br, 1
@@ -9922,16 +9922,17 @@ fidhouriet.ch, 1
 fiduciaire-ratio.ch, 1
 fieldclockapp.com, 1
 fieldtalk.co.uk, 1
 fieldwork-paysage.com, 1
 fierlafijn.net, 1
 fierman.eu, 0
 fierman.net, 0
 fierman.us, 0
+fifichachnil.paris, 1
 fifieldtech.com, 1
 fiftynorth.eu, 1
 fiftyonetielt.be, 1
 figan.cz, 1
 fight215.com, 1
 fight215.org, 1
 figshare.com, 1
 figura.cz, 1
@@ -11254,17 +11255,16 @@ ggss.cf, 1
 ggx.us, 1
 gh16.com.ar, 1
 gha.st, 1
 ghaglund.se, 1
 ghcif.de, 1
 ghi.gov, 1
 ghislainphu.fr, 1
 ghostblog.info, 1
-ghrelinblocker.info, 1
 ghrelinblocker.org, 1
 ghuntley.com, 1
 giacomodrago.com, 1
 giacomodrago.it, 1
 giacomopelagatti.it, 1
 gianproperties.com, 1
 giant-panda.com, 1
 giant-powerfit.co.uk, 1
@@ -11497,17 +11497,16 @@ goldmark.com.au, 1
 goldpreisfinder.at, 1
 goldsecurity.com, 1
 golf18network.com, 1
 golfburn.com, 1
 golfhausmallorca.com, 1
 golfscape.com, 1
 golik.net.pl, 1
 golser.info, 1
-gomiblog.com, 1
 gondawa.com, 1
 gongjianwei.com, 1
 gongjuhao.com, 1
 gonkar.com, 1
 gonx.dk, 1
 goo.gl, 1
 good-tips.pro, 1
 gooday.life, 1
@@ -11700,16 +11699,17 @@ gregoryrealestategroup.com, 1
 gregorywiest.com, 1
 grenadiercorps-kaarst.de, 1
 grenadiere-kaarst.de, 1
 grenadierkorps-kaarst.de, 1
 grenadierkorps.de, 1
 grepmaste.rs, 1
 grepular.com, 1
 gresak.io, 1
+grettogeek.com, 1
 greuel.online, 1
 greve.xyz, 1
 grey.house, 1
 greybit.net, 1
 greyhash.se, 1
 greysky.me, 1
 greyskymedia.com, 1
 greysolutions.it, 1
@@ -11850,17 +11850,16 @@ guinea-pig.co, 1
 guineapigmustach.es, 1
 gulenbase.no, 1
 gulfstream.ru, 1
 gulleyperformancecenter.com, 1
 gume4you.com, 1
 gumi.ca, 1
 gummibande.noip.me, 1
 gunhunter.com, 1
-guniram.com, 1
 gunwatch.co.uk, 1
 guphi.net, 0
 gurkan.in, 1
 gurmel.ru, 1
 gurochan.ch, 1
 guru-naradi.cz, 1
 gurueffect.com, 1
 gus.host, 1
@@ -12153,17 +12152,16 @@ haucke.xyz, 1
 hauntedfishtank.com, 0
 hauntedhouserecords.co.uk, 1
 haus-garten-test.de, 1
 hausundhof.com, 1
 hausverbrauch.de, 1
 hautarztzentrum.ch, 1
 hauteslatitudes.com, 1
 havasuhomepage.com, 1
-havasuinsurance.com, 1
 haveabounce.co.uk, 1
 haveforeningen-enghaven.dk, 1
 havefunbiking.com, 1
 haveibeenpwned.com, 1
 havellab.de, 1
 havelland-obstler.de, 1
 haven-moon.com, 1
 haven-staging.cloud, 1
@@ -12402,17 +12400,16 @@ herohirehq.co.uk, 1
 heroicpixel.com, 1
 heroin.org.uk, 1
 heroku.com, 1
 herr-webdesign.de, 1
 herrderzeit.de, 1
 herringsresidence.be, 1
 herrsmith.com, 1
 hertsbouncycastles.com, 1
-hertz.bj, 1
 herzig.cc, 1
 hesaplama.net, 1
 hessen-liebe.de, 1
 hetene.nl, 1
 hethely.ch, 1
 hetmeisjeachterpauw.nl, 1
 heute-kaufen.de, 1
 heverhagen.rocks, 1
@@ -14303,17 +14300,16 @@ jazz-alliance.org, 1
 jazzanet.com, 1
 jazzinutrecht.info, 1
 jazzncheese.com, 1
 jazzy.id.au, 1
 jazzy.pro, 1
 jazzysumi.com, 1
 jballelectronics.com, 1
 jbbd.fr, 1
-jbelien.photography, 1
 jbradaric.me, 1
 jbrowndesign.me, 1
 jbs-jardins.ch, 1
 jbsinternational.com, 1
 jbt-stl.com, 1
 jcaicedo.com, 1
 jcaicedo.tk, 1
 jccars-occasions.be, 1
@@ -14579,17 +14575,16 @@ johanli.com, 1
 johannaojanen.com, 1
 johannes-bauer.com, 1
 johannes-zinke.de, 1
 johannes.io, 1
 johannes.wtf, 1
 johannespichler.com, 1
 johnbeil.com, 1
 johnblackbourn.com, 1
-johndong.net, 0
 johnfulgenzi.com, 1
 johngallias.com, 1
 johngo.tk, 1
 johnguant.com, 1
 johnmalloneemd.com, 0
 johnmcintosh.pro, 1
 johnmh.me, 1
 johnmichel.org, 1
@@ -14621,17 +14616,16 @@ jonaskjodt.com, 1
 jonasmoeller.consulting, 0
 jonasmoeller.de, 0
 jonaswitmer.ch, 1
 jonathan-apps.com, 1
 jonathancarter.org, 1
 jonathandowning.uk, 0
 jonathandupree.com, 1
 jonathanmassacand.ch, 1
-jonathanreyes.com, 1
 jonathansanchez.pro, 1
 jonathanwisdom.com, 1
 jondevin.com, 1
 jonesborostatebank.com, 0
 jonferwerda.net, 1
 jonfor.net, 1
 jongbloed.nl, 1
 jongcs.com, 1
@@ -15405,17 +15399,17 @@ kitbag.com.au, 1
 kitchen-profi.by, 1
 kitchen-profi.com.ua, 1
 kitchen-profi.kz, 1
 kitchenaccessories.pro, 1
 kitchenpunx.com, 0
 kiteadventure.nl, 1
 kitegarage.eu, 1
 kiteschoolamsterdam.nl, 1
-kiteschooledam.nl, 1
+kiteschooledam.nl, 0
 kiteschoolijmuiden.nl, 1
 kiteschoolkatwijk.nl, 1
 kiteschoolnoordwijk.nl, 1
 kiteschoolschellinkhout.nl, 1
 kiteschoolwijkaanzee.nl, 1
 kiteschoolzandvoort.nl, 1
 kittmedia.com, 1
 kittpress.com, 1
@@ -15447,17 +15441,16 @@ kkyy.me, 1
 kkzxak47.com, 1
 kl-diaetist.dk, 1
 klaim.us, 1
 klamathrestoration.gov, 1
 klanggut.at, 1
 klares-licht.de, 1
 klarika.com, 1
 klarmobil-empfehlen.de, 1
-klas.or.id, 1
 klasfauseweh.de, 1
 klatschreime.de, 1
 klausbrinch.dk, 1
 klausimas.lt, 1
 klaver.it, 1
 klaw.xyz, 1
 kle.cz, 1
 kleaning.by, 1
@@ -16035,17 +16028,16 @@ laraeph.com, 1
 laranara.se, 1
 laraveldirectory.com, 1
 lareclame.fr, 1
 larepublicacultural.es, 1
 largescaleforums.com, 1
 largeviewer.com, 1
 lariscus.eu, 1
 larptreff.de, 1
-larraz.es, 1
 larrysalibra.com, 1
 lars-ewald.com, 1
 lars-mense.de, 1
 lars.cloud, 1
 larsbauer.xyz, 1
 larsklene.nl, 1
 larsmerke.de, 1
 laruga.co.uk, 1
@@ -17223,18 +17215,16 @@ maddi.biz, 1
 made-in-earth.co.jp, 1
 madebyshore.com, 1
 madeglobal.com, 1
 madeinchezmoi.net, 1
 madeinorder.com, 1
 madeinstudio3.com, 1
 madeintucson.org, 1
 madeitwor.se, 1
-mademoiselle-emma.be, 1
-mademoiselle-emma.fr, 1
 mademoiselledemargaux.com, 1
 mader.jp, 1
 madesurveying.co.uk, 1
 madin.ru, 1
 madirc.net, 1
 madmar.ee, 1
 madnetwork.org, 1
 madoka.nu, 1
@@ -17506,16 +17496,17 @@ margo-co.ch, 1
 margotlondon.co.uk, 1
 mariacristinadoces.com.br, 1
 mariage-photo.ch, 1
 marianatherapy.com, 1
 marianhoenscheid.de, 1
 mariannenan.nl, 1
 marianwehlus.de, 1
 mariaolesen.dk, 1
+marie-elisabeth.dk, 0
 marie.club, 1
 mariehane.com, 1
 mariemiramont.fr, 1
 marikafranke.de, 1
 marilsnijders.nl, 1
 marilynmartin.com.au, 1
 marilynstreats.com, 1
 marin-business-center.ch, 1
@@ -17623,17 +17614,17 @@ mascosolutions.com, 1
 maservant.net, 1
 mashek.net, 1
 masiniunelte.store.ro, 1
 masiul.is, 1
 maskinkultur.com, 1
 maslife365.com, 1
 massage-vitalite.fr, 1
 massage4u.net, 1
-massagecupping.com, 1
+massagecupping.com, 0
 massdrop.com, 1
 masse.org, 1
 massflix.com, 1
 masshiro.blog, 1
 massivum.de, 0
 massoni.pl, 1
 massotherapeutique.com, 1
 masta.ch, 1
@@ -18263,17 +18254,16 @@ midnight-visions.de, 1
 midnightmechanism.com, 1
 midriversmotorsllc.com, 1
 midterm.us, 1
 midtowndentistry.com, 1
 midwestbloggers.org, 1
 midweststructuralrepair.com, 1
 mieuxgrandir.ch, 1
 miffy.me, 1
-mig5.net, 1
 miggy.org, 1
 mightymillionsraffle.com, 1
 miguel.pw, 1
 migueldemoura.com, 1
 migueldominguez.ch, 1
 miguelgfierro.com, 1
 miguelmartinez.ch, 1
 miguelmenendez.pro, 1
@@ -18379,17 +18369,16 @@ minepic.org, 1
 minepod.fr, 1
 minesouls.fr, 1
 minez-nightswatch.com, 0
 minf3-games.de, 1
 mingram.net, 1
 mingwah.ch, 1
 mingy.ddns.net, 1
 mingyueli.com, 1
-minhanossasenhora.com.br, 1
 mini2.fi, 1
 minigames.com, 1
 minigolf-reisinger.com, 1
 minigolfandgames.co.uk, 1
 minikidz.es, 1
 minikneet.com, 1
 minilions.fr, 1
 minimaliston.com, 1
@@ -18708,16 +18697,17 @@ monobank.no, 1
 monochrometoys.com, 1
 monodukuri.com, 1
 monokoo.com, 1
 monolithapps.com, 1
 monolithindustries.com, 1
 monolithinteractive.com, 1
 monoseis-monotica.gr, 1
 monpc-pro.fr, 1
+monpermismoto.com, 1
 monpermisvoiture.com, 1
 monpetitforfait.com, 1
 monpetitmobile.com, 1
 monsieursavon.ch, 1
 monstermashentertainments.co.uk, 1
 montage-kaika.de, 1
 montagne-tendance.ch, 1
 montanana.com, 1
@@ -18835,16 +18825,17 @@ moveltix.net, 1
 movember.com, 0
 movepin.com, 1
 movie-cross.net, 1
 movie4k.fyi, 1
 movie4k.life, 1
 movie4kto.site, 1
 movie4kto.stream, 1
 moviedeposit.com, 1
+moviefreeze.com, 1
 movieguys.org, 1
 movienang.com, 1
 moviepilot.com, 1
 movil.uno, 1
 moving-pixtures.de, 1
 movinglogistics.nl, 0
 movingoklahoma.org, 1
 movingtohttps.com, 1
@@ -18995,17 +18986,16 @@ mulherportuguesa.com, 1
 muling.lu, 1
 mullens-usedcars.be, 1
 multi-vpn.biz, 1
 multibit.org, 1
 multibomasm.com.br, 1
 multicomhost.com, 1
 multigamecard.com, 1
 multigeist.de, 1
-multikalender.de, 1
 multimail.work, 1
 multimarques.com, 1
 multimedia-pool.com, 1
 multiplayernow.com, 1
 multipleservers.com, 1
 multiplexcy.com, 1
 multirep.ch, 1
 multitek.no, 1
@@ -20021,16 +20011,17 @@ nishaswonderland.be, 1
 nishaswonderland.nl, 1
 nishikino-maki.com, 1
 nishisbma.com, 1
 nissanofbismarckparts.com, 1
 nitaonline.org, 1
 nitifilter.com, 1
 nitrix.me, 1
 nitrokey.com, 1
+nitropanel.com, 1
 nitropur.com, 1
 nitropur.de, 1
 nitrous-networks.com, 1
 niu.moe, 1
 niva.synology.me, 1
 nivi.ca, 1
 nix.org.ua, 0
 nixonlibrary.gov, 1
@@ -20065,17 +20056,16 @@ nobly.de, 1
 noc.org, 1
 noc.wang, 1
 nocit.dk, 1
 nocs.cn, 1
 nodari.com.ar, 1
 nodariweb.com.ar, 1
 nodecompat.com, 1
 nodefiles.com, 1
-nodefoo.com, 1
 nodejs.de, 1
 nodelab-it.de, 1
 nodelia.com, 1
 nodepanel.net, 1
 nodeselect.com, 1
 nodesturut.cl, 1
 nodum.io, 1
 noeatnosleep.me, 1
@@ -20117,16 +20107,17 @@ noodles.net.nz, 1
 noodleyum.com, 1
 noodplan.co.za, 1
 noodweer.be, 1
 noon-entertainments.com, 1
 noop.ch, 1
 noordsee.de, 1
 noorsolidarity.com, 1
 nootropic.com, 1
+nootropicsource.com, 1
 nopaste.xyz, 1
 nopaynocure.com, 1
 nord-sud.be, 1
 nordakademie.de, 1
 nordic-survival.de, 1
 nordiccasinocommunity.com, 1
 nordinfo.fi, 1
 nordmoregatebilklubb.com, 1
@@ -20297,17 +20288,16 @@ numerik-games.ch, 1
 numero-aleatorio.com, 1
 numero1.ch, 1
 numerossanos.com.ar, 1
 numis.tech, 1
 numm.fr, 1
 numwave.nl, 1
 nunnenmacher.net, 1
 nunomoura.com, 1
-nuovamoda.al, 1
 nup.pw, 1
 nupef.org.br, 1
 nuquery.com, 1
 nuriacamaras.com, 1
 nursejj.com, 1
 nurses.dating, 1
 nurture.be, 1
 nuryahan.com.br, 1
@@ -20652,16 +20642,17 @@ onlinecasino.vlaanderen, 1
 onlinecasinobluebook.com, 1
 onlinecensorship.org, 1
 onlinecollegeessay.com, 1
 onlinefashion.it, 1
 onlinelegalmarketing.com, 1
 onlinelegalmedia.com, 1
 onlinelighting.com.au, 1
 onlinemarketingtraining.co.uk, 1
+onlinepokerspelen.be, 1
 onlinerollout.de, 1
 onlinestoreninjas.com, 1
 onlineth.com, 0
 onlinetravelmoney.co.uk, 1
 onlineweblearning.com, 1
 onlylebanon.net, 1
 onmaps.de, 1
 onmarketbookbuilds.com, 1
@@ -21058,17 +21049,16 @@ pakke.de, 1
 pakremit.com, 1
 paktolos.net, 1
 palabr.as, 1
 palapadev.com, 1
 palatin.at, 1
 palationtrade.com, 1
 palava.tv, 1
 palavatv.com, 1
-paleosquawk.com, 1
 palletflow.com, 1
 palli.ch, 1
 palmavile.us, 1
 palmaville.com, 1
 pamaniqu.nl, 1
 pamatv.hk, 1
 pammbook.com, 1
 pan.digital, 1
@@ -21150,16 +21140,17 @@ parcon.it, 1
 pardnoy.com, 1
 parentheseardenne.be, 1
 parentinterview.com, 1
 parentsintouch.co.uk, 1
 parfum-baza.ru, 1
 pariga.co.uk, 1
 paris-cyber.fr, 1
 parisescortgirls.com, 1
+parisfranceparking.com, 1
 parisfranceparking.de, 1
 parisfranceparking.fr, 1
 parisfranceparking.nl, 1
 parishome.jp, 1
 parkingpoint.co.uk, 1
 parksubaruoemparts.com, 1
 parkviewmotorcompany.com, 1
 parlamento.gub.uy, 1
@@ -22354,16 +22345,17 @@ primaconsulting.net, 1
 primalinea.pro, 1
 primates.com, 1
 primecaplending.com, 1
 primewho.org, 1
 primordialsnooze.com, 1
 prinbanat.ngo, 1
 princeagency.com, 1
 princeofwhales.com, 1
+princesparktouch.com, 1
 princessbackpack.de, 1
 princessmargaretlotto.com, 1
 principaltoolbox.com, 1
 principia-journal.de, 1
 principia-magazin.de, 1
 principia-online.de, 1
 princovi.cz, 1
 prinesdoma.at, 1
@@ -22627,17 +22619,17 @@ psychiatrie-betreuung.ch, 1
 psychic-healer-mariya-i-petrova-boyankinska-b-borovan-bg.com, 1
 psychintervention.com, 1
 psycho-lobby.com, 1
 psycho.space, 1
 psychoactive.com, 1
 psychoco.net, 1
 psychotherapie-kp.de, 1
 psydix.org, 1
-psyk.yt, 0
+psyk.yt, 1
 psylab.cc, 1
 psylab.re, 1
 psylab.vip, 1
 pt-server.de, 1
 ptal.eu, 1
 ptbi.org.pl, 1
 ptbx.co, 1
 pterodactylus.cz, 1
@@ -23376,22 +23368,22 @@ remedyrehab.com, 1
 rememberthemilk.com, 0
 remodelwithlegacy.com, 1
 remonti.info, 1
 remote.so, 1
 remoteutilities.com, 1
 removedrepo.com, 1
 renascentia.asia, 1
 renaultclubticino.ch, 1
-rencaijia.com, 1
 renderloop.com, 1
 rene-schwarz.com, 1
 rene-stolp.de, 1
 renearends.nl, 1
 reneleu.ch, 1
+renem.net, 0
 renemayrhofer.com, 1
 renerehelse.no, 0
 renewablefreedom.org, 1
 renezuo.com, 1
 renkenlaw.com, 1
 renlen.nl, 1
 rennfire.org, 1
 renrenche.com, 0
@@ -23428,16 +23420,17 @@ reporturl.io, 1
 reposaarenkuva.fi, 1
 reproduciblescience.org, 1
 reproductive-revolution.com, 1
 reproductiverevolution.com, 1
 reprogramming-predators.com, 1
 reprogrammingpredators.com, 1
 reprozip.org, 1
 repsomelt.com, 1
+reptrax.com, 1
 republic.gr, 1
 republique.org, 1
 repugnant-conclusion.com, 1
 repugnantconclusion.com, 1
 repustate.com, 1
 reputationweaver.com, 1
 reqognize.com, 1
 reqrut.net, 1
@@ -23470,17 +23463,16 @@ ressl.ch, 1
 restaurant-mangal.ch, 1
 restaurant-oregano.de, 1
 restaurant-rosengarten.at, 1
 restaurantesimonetti.com.br, 1
 restaurantmangal.ch, 1
 restauranttester.at, 1
 rester-a-domicile.ch, 1
 rester-autonome-chez-soi.ch, 1
-restioson.me, 1
 restoran-radovce.me, 1
 restoreresearchstudy.com, 1
 restoruns.com, 1
 restoruns.xyz, 1
 restrito.org, 1
 resursedigitale.ro, 1
 retcor.net, 1
 retetenoi.net, 1
@@ -24180,17 +24172,16 @@ saigonflowers.com, 1
 saigonstar.de, 1
 saikarra.com, 1
 saikou.moe, 1
 saikouji.tokushima.jp, 1
 sailormoonevents.org, 0
 saimoe.moe, 1
 saimoe.org, 1
 sainetworks.net, 1
-saint-astier-triathlon.com, 1
 saintaardvarkthecarpeted.com, 1
 saintanthonyscorner.com, 1
 sainth.de, 1
 saintsrobotics.com, 1
 saipariwar.com, 1
 saiputra.com, 1
 saitrance.com, 1
 saiyasu-search.com, 1
@@ -24785,17 +24776,16 @@ securitymap.wiki, 1
 securitypluspro.com, 1
 securityprimes.in, 1
 securitysnobs.com, 0
 securitysoapbox.com, 1
 securitystrata.com, 1
 securitystreak.com, 1
 securitytalk.pl, 1
 securitywatch.co.nz, 1
-securitywithnick.com, 1
 securitywithoutborders.org, 1
 securocloud.com, 1
 securon.io, 1
 securoswiss.ch, 1
 secutrans.com, 1
 secuvera.de, 1
 secwall.me, 1
 secwise.nl, 1
@@ -25534,17 +25524,16 @@ sj-leisure.com, 1
 sja-se-training.com, 1
 sjd.is, 1
 sjdaws.com, 1
 sjleisure.co.uk, 1
 sjoorm.com, 1
 sjsc.fr, 1
 sk-net.cz, 1
 skalender.ch, 0
-skandiabanken.no, 1
 skanvordoff.ru, 1
 skaraborgsassistans.com, 0
 skarox.com, 1
 skarox.ee, 1
 skarox.eu, 1
 skarox.net, 1
 skarox.ru, 1
 skatclub-beratzhausen.de, 1
@@ -25742,17 +25731,16 @@ smartrade.tech, 1
 smartshiftme.com, 1
 smartship.co.jp, 1
 smartshoppers.es, 1
 smartsparrow.com, 1
 smartvideo.io, 1
 smartviewing.com, 1
 smartwelve.com, 1
 smartwritingservice.com, 1
-smartwurk.nl, 1
 smash-gg.club, 1
 smatch.com, 1
 smb445.com, 1
 smdavis.us, 1
 smdcn.net, 1
 sme-gmbh.net, 1
 smeetsengraas.com, 1
 smeso.it, 1
@@ -25904,16 +25892,17 @@ sofa-rockers.org, 1
 sofabedshop.de, 1
 sofiavanmoorsel.com, 1
 sofort.com, 1
 sofortueberweisung.de, 1
 softandbouncy.co.uk, 1
 softanka.com, 1
 softballrampage.com, 1
 softclean.pt, 1
+softcreatr.de, 1
 softplay4hire.co.uk, 1
 softplaynation.co.uk, 1
 softprayog.in, 1
 softrobot.se, 1
 softtennis-zenei.com, 1
 softwarebetrieb.de, 1
 softwaredesign.foundation, 1
 softwarevoortherapeuten.nl, 1
@@ -26597,16 +26586,17 @@ stomt.com, 1
 stonedworms.de, 1
 stonefusion.org.uk, 1
 stonehammerhead.org, 1
 stonemain.eu, 1
 stonemanbrasil.com.br, 1
 stony.com, 1
 stonystratford.org, 1
 stopakwardhandshakes.org, 1
+stopbreakupnow.org, 1
 stopbullying.gov, 1
 stopfraud.gov, 1
 stopthethyroidmadness.com, 1
 stordbatlag.no, 1
 store-host.com, 1
 store10.de, 1
 storedsafe.com, 1
 storgom.ua, 0
@@ -26794,16 +26784,17 @@ summercampthailand.com, 1
 summitmasters.net, 1
 sumthing.com, 1
 sunbritetv.com, 1
 sundaycooks.com, 1
 sundayfundayjapan.com, 1
 suneilpatel.com, 1
 sunfeathers.net, 1
 sunfireshop.com.br, 1
+sunflyer.cn, 0
 sunfox.cz, 1
 sunfulong.me, 1
 sungo.wtf, 1
 sunjaydhama.com, 1
 sunn.ie, 1
 sunsetwx.com, 1
 sunshinesf.org, 1
 sunsmartresorts.com, 1
@@ -27090,16 +27081,17 @@ tabla-periodica.com, 1
 tablescraps.com, 1
 tablet.facebook.com, 0
 tablotv.com, 0
 taboragroup.com, 0
 taborsky.cz, 1
 tac-volley.com, 1
 tacklog.com, 1
 tacoma-games.com, 1
+tacomafia.net, 1
 tacotown.tk, 1
 tacticalsquare.com, 1
 tadata.me, 1
 tadcastercircuit.org.uk, 1
 tadtadya.com, 1
 tadu.de, 1
 tagdocumentary.com, 1
 tagesmutter-in-bilm.de, 1
@@ -27176,16 +27168,17 @@ tantei100.net, 1
 tanto259.name, 1
 tanz.info, 1
 tanzhijun.com, 1
 taoburee.com, 1
 tapestries.tk, 1
 taqsim.jp, 1
 taquilla.com, 1
 taqun.club, 1
+taranis.re, 1
 tarantul.org.ua, 1
 tarasecurity.co.uk, 1
 tarasecurity.com, 1
 tarasevich.by, 1
 tardis.io, 1
 tardybaker.com, 1
 tarek.link, 1
 targimieszkaniowe.net, 1
@@ -27667,16 +27660,17 @@ thediaryofadam.com, 1
 thedisc.nl, 1
 thediscovine.com, 1
 thedocumentrefinery.com, 1
 thedominatorsclan.com, 1
 thedreamtravelgroup.co.uk, 1
 thedrinks.co, 1
 thedronechart.com, 1
 thedrunkencabbage.com, 1
+thedutchmarketers.com, 1
 theeducationchannel.info, 1
 theeducationdirectory.org, 1
 theevergreen.me, 1
 theexpatriate.de, 1
 thefanimatrix.net, 1
 thefbstalker.com, 1
 theferrarista.com, 1
 theflyingbear.net, 1
@@ -28097,26 +28091,26 @@ titusetcompagnies.net, 1
 tivido.nl, 1
 tjandpals.com, 1
 tjenestetorvet.dk, 1
 tjkcastles.uk, 1
 tjl.rocks, 1
 tjp.ch, 1
 tjs.me, 1
 tjsbouncycastles.co.uk, 1
+tjullrich.de, 1
 tkacz.pro, 1
 tkat.ch, 1
 tkgpm.com, 1
 tkjg.fi, 1
 tkn.me, 1
 tkn.tokyo, 1
 tkts.cl, 1
 tkusano.jp, 1
 tkw01536.de, 1
-tlach.cz, 1
 tlca.org, 1
 tlcnet.info, 1
 tlehseasyads.com, 1
 tlo.xyz, 1
 tloxygen.com, 1
 tls.builders, 1
 tls.care, 1
 tls1914.org, 1
@@ -28227,17 +28221,16 @@ tokyovipper.com, 1
 tolboe.com, 1
 toleressea.fr, 1
 toles-sur-mesure.fr, 1
 tollfreeproxy.com, 1
 tollsjekk.no, 1
 tom-geiger.de, 1
 tom-kunze.de, 1
 tom-maxwell.com, 1
-tom.run, 1
 tomabrafix.de, 1
 tomandshirley.com, 1
 tomasjacik.cz, 1
 tomaskavalek.cz, 1
 tomaspialek.cz, 1
 tomatenaufdenaugen.de, 1
 tomatis-nantes.com, 1
 tomaw.net, 1
@@ -28424,16 +28417,17 @@ toursandtransfers.it, 1
 tourtransferitaly.it, 1
 tous-travaux.ch, 1
 toushi-exe.com, 1
 toushi-return.xyz, 1
 touslesdrivers.com, 1
 tousproducteurs.fr, 1
 tout-art.ch, 1
 toutart.ch, 1
+toutenmusic.fr, 1
 toutmonexam.fr, 1
 tovare.com, 1
 toverland-tickets.nl, 1
 towandalibrary.org, 1
 towaway.ru, 1
 townandcountryus.com, 1
 townhousedevelopments.com.au, 1
 townhouseregister.com.au, 1
@@ -29574,17 +29568,16 @@ vets.gov, 1
 veverusak.cz, 1
 vfdworld.com, 1
 vfn-nrw.de, 1
 vgatest.nl, 1
 vgerak.com, 1
 vgolos.zt.ua, 1
 vgropp.de, 1
 vhummel.nl, 1
-viabemestar.com.br, 1
 viacdn.org, 1
 viafinance.cz, 1
 viaggio-in-cina.it, 1
 viaje-a-china.com, 1
 vialibido.com.br, 1
 vialorran.com, 1
 viaprinto.de, 1
 vibrant-america.com, 1
@@ -29697,16 +29690,17 @@ vintagetrailerbuyers.com, 1
 vintazh.net, 1
 vinticom.ch, 1
 vintock.com, 1
 vinyculture.com, 1
 vinzite.com, 1
 violetraven.co.uk, 1
 violin4fun.nl, 1
 vionicbeach.com, 1
+viosey.com, 1
 vipi.es, 1
 viplentes.com.br, 1
 viptamin.eu, 1
 viptamol.com, 1
 vir-tec.eu, 1
 viralboombox.xyz, 1
 viralpop.it, 1
 virgopolymer.com, 1
@@ -30690,17 +30684,16 @@ wlci.gov, 1
 wlsme.org, 1
 wlt.ca, 1
 wltix.com, 1
 wm-talk.net, 1
 wmaccess.com, 1
 wmawri.com, 1
 wmfusercontent.org, 1
 wmkowa.de, 1
-wmoda.com.br, 1
 wmustore.com, 1
 wnu.com, 1
 wo-ist-elvira.net, 1
 wo2forum.nl, 0
 wobble.ninja, 1
 wobblywotnotz.co.uk, 1
 wochennummern.de, 1
 wod-stavby.cz, 1
@@ -31516,16 +31509,17 @@ youngdogs.org, 1
 youngfree.cn, 1
 youngsook.com, 1
 youngsook.org, 1
 youpark.no, 1
 youran.me, 1
 yourciso.com, 1
 yourcopywriter.it, 1
 yourdaddy.dk, 1
+yourforex.org, 1
 yourgame.co.il, 1
 yourgames.tv, 1
 yourhair.net, 1
 yoursbookstore.jp, 1
 yourself.today, 1
 yourticketbooking.com, 1
 youruseragent.info, 1
 yourznc.com, 1
@@ -31677,16 +31671,17 @@ zamocosmeticos.com.br, 1
 zamow.co, 1
 zandcell.com, 1
 zanthra.com, 1
 zaoext.com, 1
 zapier.com, 1
 zappbuildapps.com, 1
 zaratan.fr, 1
 zarpo.com.br, 1
+zary.me, 1
 zaufanatrzeciastrona.pl, 1
 zavec.com.ec, 1
 zavetaji.lv, 1
 zawo-electric.de, 1
 zbasenem.pl, 1
 zbchen.com, 1
 zberger.com, 1
 zbetcheck.in, 1
@@ -31844,17 +31839,16 @@ zodiacohouses.com, 1
 zoeller.me, 1
 zohar.shop, 1
 zohar.wang, 0
 zoigl.club, 1
 zojadravai.com, 1
 zoki.art, 1
 zokster.net, 1
 zolokar.xyz, 1
-zolotoy-standart.com.ua, 1
 zombiesecured.com, 1
 zomerschoen.nl, 1
 zone-produkte.de, 1
 zone39.com, 1
 zonecb.com, 1
 zonemaster.fr, 1
 zonemaster.net, 1
 zonesec.org, 1
--- a/taskcluster/ci/l10n/kind.yml
+++ b/taskcluster/ci/l10n/kind.yml
@@ -41,16 +41,20 @@ job-template:
          android-api-16-l10n: 18000
    docker-image:
       by-build-platform:
          default:
            in-tree: desktop-build
          android-api-16-l10n:
            in-tree: android-build
          win.*: null
+   secrets:
+      by-build-platform:
+         default: false
+         android-api-16-l10n: true
    toolchains:
       by-build-platform:
          default: []
          android-api-16-l10n:
             - android-gradle-dependencies
             - android-sdk-linux
             - proguard-jar
    tooltool:
@@ -105,17 +109,18 @@ job-template:
                - total-chunks=1
                - this-chunk=1
             default:
                - total-chunks=1
                - this-chunk=1
       actions:
          by-build-platform:
             default: [clone-locales list-locales setup repack summary]
-            android-api-16-l10n: [clone-locales list-locales setup repack
+            android-api-16-l10n: [get-secrets
+                                  clone-locales list-locales setup repack
                                   upload-repacks summary]
       script:
          by-build-platform:
             default: mozharness/scripts/desktop_l10n.py
             android-api-16-l10n: mozharness/scripts/mobile_l10n.py
    when:
       files-changed:
          - browser/locales/l10n-changesets.json
--- a/taskcluster/ci/nightly-l10n/kind.yml
+++ b/taskcluster/ci/nightly-l10n/kind.yml
@@ -44,16 +44,20 @@ job-template:
          android-api-16-nightly: 18000
    docker-image:
       by-build-platform:
          default:
            in-tree: desktop-build
          android-api-16-nightly:
            in-tree: android-build
          win.*: null
+   secrets:
+      by-build-platform:
+         default: false
+         android-api-16-nightly: true
    toolchains:
       by-build-platform:
          default: []
          android-api-16-nightly:
             - android-gradle-dependencies
             - android-sdk-linux
             - proguard-jar
    tooltool:
@@ -166,14 +170,15 @@ job-template:
                - config=single_locale/tc_win64.py
                - config=taskcluster_nightly.py
                - revision=$GECKO_HEAD_REV
             default: [ ]
       actions:
          by-build-platform:
             default: ['clone-locales', 'list-locales', 'setup', 'repack',
                       'submit-to-balrog', 'summary']
-            android-api-16-nightly: ['clone-locales', 'list-locales', 'setup', 'repack',
+            android-api-16-nightly: ['get-secrets',
+                                     'clone-locales', 'list-locales', 'setup', 'repack',
                                      'upload-repacks', 'submit-to-balrog', 'summary']
       script:
          by-build-platform:
             default: mozharness/scripts/desktop_l10n.py
             android-api-16-nightly: mozharness/scripts/mobile_l10n.py
--- a/taskcluster/taskgraph/transforms/l10n.py
+++ b/taskcluster/taskgraph/transforms/l10n.py
@@ -102,16 +102,23 @@ l10n_description_schema = Schema({
     Required('docker-image'): _by_platform(Any(
         # an in-tree generated docker image (from `taskcluster/docker/<name>`)
         {'in-tree': basestring},
         None,
     )),
 
     Optional('toolchains'): _by_platform([basestring]),
 
+    # The set of secret names to which the task has access; these are prefixed
+    # with `project/releng/gecko/{treeherder.kind}/level-{level}/`.  Setting
+    # this will enable any worker features required and set the task's scopes
+    # appropriately.  `true` here means ['*'], all secrets.  Not supported on
+    # Windows
+    Required('secrets', default=False): _by_platform(Any(bool, [basestring])),
+
     # Information for treeherder
     Required('treeherder'): {
         # Platform to display the task on in treeherder
         Required('platform'): _by_platform(basestring),
 
         # Symbol to use
         Required('symbol'): basestring,
 
@@ -246,16 +253,17 @@ def handle_keyed_by(config, jobs):
     """Resolve fields that can be keyed by platform, etc."""
     fields = [
         "locales-file",
         "locales-per-chunk",
         "worker-type",
         "description",
         "run-time",
         "docker-image",
+        "secrets",
         "toolchains",
         "tooltool",
         "env",
         "ignore-locales",
         "mozharness.config",
         "mozharness.options",
         "mozharness.actions",
         "mozharness.script",
@@ -380,16 +388,17 @@ def make_job_description(config, jobs):
             'description': job['description'],
             'run': {
                 'using': 'mozharness',
                 'job-script': 'taskcluster/scripts/builder/build-l10n.sh',
                 'config': job['mozharness']['config'],
                 'script': job['mozharness']['script'],
                 'actions': job['mozharness']['actions'],
                 'options': job['mozharness']['options'],
+                'secrets': job['secrets'],
             },
             'attributes': job['attributes'],
             'treeherder': {
                 'kind': 'build',
                 'tier': job['treeherder']['tier'],
                 'symbol': job['treeherder']['symbol'],
                 'platform': job['treeherder']['platform'],
             },
--- a/testing/mozharness/configs/single_locale/tc_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/tc_android-api-16.py
@@ -10,9 +10,42 @@ config = {
     "tooltool_servers": ['http://relengapi/tooltool/'],
 
     "upload_env": {
         'UPLOAD_HOST': 'localhost',
         'UPLOAD_PATH': '/builds/worker/artifacts/',
     },
     "mozilla_dir": "src/",
     "simple_name_move": True,
+    'secret_files': [
+        {'filename': '/builds/gapi.data',
+         'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/gapi.data',
+         'min_scm_level': 1},
+        {'filename': '/builds/mozilla-fennec-geoloc-api.key',
+         'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/mozilla-fennec-geoloc-api.key',
+         'min_scm_level': 2, 'default': 'try-build-has-no-secrets'},
+        {'filename': '/builds/adjust-sdk.token',
+         'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/adjust-sdk.token',
+         'min_scm_level': 2, 'default': 'try-build-has-no-secrets'},
+        {'filename': '/builds/adjust-sdk-beta.token',
+         'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/adjust-sdk-beta.token',
+         'min_scm_level': 2, 'default': 'try-build-has-no-secrets'},
+        {'filename': '/builds/leanplum-sdk-release.token',
+         'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/leanplum-sdk-release.token',
+         'min_scm_level': 2, 'default': 'try-build-has-no-secrets'},
+        {'filename': '/builds/leanplum-sdk-beta.token',
+         'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/leanplum-sdk-beta.token',
+         'min_scm_level': 2, 'default': 'try-build-has-no-secrets'},
+        {'filename': '/builds/leanplum-sdk-nightly.token',
+         'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/leanplum-sdk-nightly.token',
+         'min_scm_level': 2, 'default': 'try-build-has-no-secrets'},
+        {'filename': '/builds/pocket-api-release.token',
+         'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/pocket-api-release.token',
+         'min_scm_level': 2, 'default': 'try-build-has-no-secrets'},
+        {'filename': '/builds/pocket-api-beta.token',
+         'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/pocket-api-beta.token',
+         'min_scm_level': 2, 'default': 'try-build-has-no-secrets'},
+        {'filename': '/builds/pocket-api-nightly.token',
+         'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/pocket-api-nightly.token',
+         'min_scm_level': 2, 'default': 'try-build-has-no-secrets'},
+
+    ],
 }
--- a/testing/mozharness/scripts/mobile_l10n.py
+++ b/testing/mozharness/scripts/mobile_l10n.py
@@ -33,26 +33,27 @@ from mozharness.base.transfer import Tra
 from mozharness.mozilla.buildbot import BuildbotMixin
 from mozharness.mozilla.purge import PurgeMixin
 from mozharness.mozilla.release import ReleaseMixin
 from mozharness.mozilla.signing import MobileSigningMixin
 from mozharness.mozilla.tooltool import TooltoolMixin
 from mozharness.base.vcs.vcsbase import MercurialScript
 from mozharness.mozilla.l10n.locales import LocalesMixin
 from mozharness.mozilla.mock import MockMixin
+from mozharness.mozilla.secrets import SecretsMixin
 from mozharness.mozilla.updates.balrog import BalrogMixin
 from mozharness.base.python import VirtualenvMixin
 from mozharness.mozilla.taskcluster_helper import Taskcluster
 
 
 # MobileSingleLocale {{{1
 class MobileSingleLocale(MockMixin, LocalesMixin, ReleaseMixin,
                          MobileSigningMixin, TransferMixin, TooltoolMixin,
                          BuildbotMixin, PurgeMixin, MercurialScript, BalrogMixin,
-                         VirtualenvMixin):
+                         VirtualenvMixin, SecretsMixin):
     config_options = [[
         ['--locale', ],
         {"action": "extend",
          "dest": "locales",
          "type": "string",
          "help": "Specify the locale(s) to sign and update"
          }
     ], [
@@ -119,16 +120,17 @@ class MobileSingleLocale(MockMixin, Loca
          "type": "string",
          "help": "Override the gecko revision to use (otherwise use buildbot supplied"
                  " value, or en-US revision) "}
     ]]
 
     def __init__(self, require_config_file=True):
         buildscript_kwargs = {
             'all_actions': [
+                "get-secrets",
                 "clobber",
                 "pull",
                 "clone-locales",
                 "list-locales",
                 "setup",
                 "repack",
                 "validate-repacks-signed",
                 "upload-repacks",
@@ -180,16 +182,30 @@ class MobileSingleLocale(MockMixin, Loca
         repack_env = self.query_env(partial_env=c.get("repack_env"),
                                     replace_dict=replace_dict)
         if c.get('base_en_us_binary_url') and c.get('release_config_file'):
             rc = self.query_release_config()
             repack_env['EN_US_BINARY_URL'] = c['base_en_us_binary_url'] % replace_dict
         if 'MOZ_SIGNING_SERVERS' in os.environ:
             repack_env['MOZ_SIGN_CMD'] = \
                 subprocess.list2cmdline(self.query_moz_sign_cmd(formats=['jar']))
+
+        if self.query_is_nightly() or self.query_is_nightly_promotion():
+            if self.query_is_nightly():
+                # Nightly promotion needs to set update_channel but not do all
+                # the 'IS_NIGHTLY' automation parts, like uploading symbols
+                # (for now).
+                repack_env["IS_NIGHTLY"] = "yes"
+            # In branch_specifics.py we might set update_channel explicitly.
+            if c.get('update_channel'):
+                repack_env["MOZ_UPDATE_CHANNEL"] = c['update_channel']
+            else:  # Let's just give the generic channel based on branch.
+                repack_env["MOZ_UPDATE_CHANNEL"] = \
+                    "nightly-%s" % (c['branch'],)
+
         self.repack_env = repack_env
         return self.repack_env
 
     def query_l10n_env(self):
         return self.query_env()
 
     def query_upload_env(self):
         if self.upload_env:
--- a/third_party/aom/aom_dsp/x86/highbd_intrapred_avx2.c
+++ b/third_party/aom/aom_dsp/x86/highbd_intrapred_avx2.c
@@ -6,16 +6,17 @@
  * was not distributed with this source code in the LICENSE file, you can
  * obtain it at www.aomedia.org/license/software. If the Alliance for Open
  * Media Patent License 1.0 was not distributed with this source code in the
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 
 #include <immintrin.h>
 
+#include "aom_ports/msvc.h"
 #include "./aom_dsp_rtcd.h"
 
 // -----------------------------------------------------------------------------
 // D45E_PRED
 /*
 ; ------------------------------------------
 ; input: x, y, z, result
 ;
--- a/third_party/aom/aom_ports/msvc.h
+++ b/third_party/aom/aom_ports/msvc.h
@@ -38,10 +38,30 @@ static INLINE float roundf(float x) {
 static INLINE long lroundf(float x) {
   if (x < 0)
     return (long)(x - 0.5f);
   else
     return (long)(x + 0.5f);
 }
 #endif  // _MSC_VER < 1800
 
+#if HAVE_AVX
+#include <immintrin.h>
+// Note:
+// _mm256_insert_epi16 intrinsics is available from vs2017.
+// We define this macro for vs2015 and earlier. The
+// intrinsics used here are in vs2015 document:
+// https://msdn.microsoft.com/en-us/library/hh977022.aspx
+// Input parameters:
+// a: __m256i,
+// d: int16_t,
+// indx: imm8 (0 - 15)
+#if _MSC_VER <= 1900
+#define _mm256_insert_epi16(a, d, indx)                                      \
+  _mm256_insertf128_si256(                                                   \
+      a,                                                                     \
+      _mm_insert_epi16(_mm256_extractf128_si256(a, indx >> 3), d, indx % 8), \
+      indx >> 3)
+#endif  // _MSC_VER <= 1900
+#endif  // HAVE_AVX
+
 #endif  // _MSC_VER
 #endif  // AOM_PORTS_MSVC_H_
--- a/third_party/aom/av1/common/reconinter.c
+++ b/third_party/aom/av1/common/reconinter.c
@@ -1723,19 +1723,19 @@ void av1_build_inter_predictors_sbuv(con
 
 void av1_build_inter_predictors_sb(const AV1_COMMON *cm, MACROBLOCKD *xd,
                                    int mi_row, int mi_col, BUFFER_SET *ctx,
                                    BLOCK_SIZE bsize) {
   av1_build_inter_predictors_sby(cm, xd, mi_row, mi_col, ctx, bsize);
   av1_build_inter_predictors_sbuv(cm, xd, mi_row, mi_col, ctx, bsize);
 }
 
-void av1_setup_dst_planes(struct macroblockd_plane planes[MAX_MB_PLANE],
-                          BLOCK_SIZE bsize, const YV12_BUFFER_CONFIG *src,
-                          int mi_row, int mi_col) {
+void av1_setup_dst_planes(struct macroblockd_plane *planes, BLOCK_SIZE bsize,
+                          const YV12_BUFFER_CONFIG *src, int mi_row,
+                          int mi_col) {
   const int widths[MAX_MB_PLANE] = { src->y_crop_width, src->uv_crop_width,
                                      src->uv_crop_width };
   const int heights[MAX_MB_PLANE] = { src->y_crop_height, src->uv_crop_height,
                                       src->uv_crop_height };
   const int strides[MAX_MB_PLANE] = { src->y_stride, src->uv_stride,
                                       src->uv_stride };
   int i;
 
--- a/third_party/aom/av1/common/reconinter.h
+++ b/third_party/aom/av1/common/reconinter.h
@@ -441,19 +441,19 @@ static INLINE void setup_pred_plane(stru
   const int y = (MI_SIZE * mi_row) >> subsampling_y;
   dst->buf = src + scaled_buffer_offset(x, y, stride, scale);
   dst->buf0 = src;
   dst->width = width;
   dst->height = height;
   dst->stride = stride;
 }
 
-void av1_setup_dst_planes(struct macroblockd_plane planes[MAX_MB_PLANE],
-                          BLOCK_SIZE bsize, const YV12_BUFFER_CONFIG *src,
-                          int mi_row, int mi_col);
+void av1_setup_dst_planes(struct macroblockd_plane *planes, BLOCK_SIZE bsize,
+                          const YV12_BUFFER_CONFIG *src, int mi_row,
+                          int mi_col);
 
 void av1_setup_pre_planes(MACROBLOCKD *xd, int idx,
                           const YV12_BUFFER_CONFIG *src, int mi_row, int mi_col,
                           const struct scale_factors *sf);
 
 // Detect if the block have sub-pixel level motion vectors
 // per component.
 #define CHECK_SUBPEL 0
--- a/third_party/aom/av1/common/thread_common.c
+++ b/third_party/aom/av1/common/thread_common.c
@@ -81,29 +81,29 @@ static INLINE void sync_write(AV1LfSync 
   (void)r;
   (void)c;
   (void)sb_cols;
 #endif  // CONFIG_MULTITHREAD
 }
 
 #if !CONFIG_EXT_PARTITION_TYPES
 static INLINE enum lf_path get_loop_filter_path(
-    int y_only, struct macroblockd_plane planes[MAX_MB_PLANE]) {
+    int y_only, struct macroblockd_plane *planes) {
   if (y_only)
     return LF_PATH_444;
   else if (planes[1].subsampling_y == 1 && planes[1].subsampling_x == 1)
     return LF_PATH_420;
   else if (planes[1].subsampling_y == 0 && planes[1].subsampling_x == 0)
     return LF_PATH_444;
   else
     return LF_PATH_SLOW;
 }
 
 static INLINE void loop_filter_block_plane_ver(
-    AV1_COMMON *cm, struct macroblockd_plane planes[MAX_MB_PLANE], int plane,
+    AV1_COMMON *cm, struct macroblockd_plane *planes, int plane,
     MODE_INFO **mi, int mi_row, int mi_col, enum lf_path path,
     LOOP_FILTER_MASK *lfm) {
   if (plane == 0) {
     av1_filter_block_plane_ss00_ver(cm, &planes[0], mi_row, lfm);
   } else {
     switch (path) {
       case LF_PATH_420:
         av1_filter_block_plane_ss11_ver(cm, &planes[plane], mi_row, lfm);
@@ -115,17 +115,17 @@ static INLINE void loop_filter_block_pla
         av1_filter_block_plane_non420_ver(cm, &planes[plane], mi, mi_row,
                                           mi_col, plane);
         break;
     }
   }
 }
 
 static INLINE void loop_filter_block_plane_hor(
-    AV1_COMMON *cm, struct macroblockd_plane planes[MAX_MB_PLANE], int plane,
+    AV1_COMMON *cm, struct macroblockd_plane *planes, int plane,
     MODE_INFO **mi, int mi_row, int mi_col, enum lf_path path,
     LOOP_FILTER_MASK *lfm) {
   if (plane == 0) {
     av1_filter_block_plane_ss00_hor(cm, &planes[0], mi_row, lfm);
   } else {
     switch (path) {
       case LF_PATH_420:
         av1_filter_block_plane_ss11_hor(cm, &planes[plane], mi_row, lfm);
@@ -281,20 +281,19 @@ static int loop_filter_row_worker(AV1LfS
       sync_write(lf_sync, r, c, sb_cols);
     }
   }
   return 1;
 }
 #endif  //  CONFIG_PARALLEL_DEBLOCKING
 
 static void loop_filter_rows_mt(YV12_BUFFER_CONFIG *frame, AV1_COMMON *cm,
-                                struct macroblockd_plane planes[MAX_MB_PLANE],
-                                int start, int stop, int y_only,
-                                AVxWorker *workers, int nworkers,
-                                AV1LfSync *lf_sync) {
+                                struct macroblockd_plane *planes, int start,
+                                int stop, int y_only, AVxWorker *workers,
+                                int nworkers, AV1LfSync *lf_sync) {
 #if CONFIG_EXT_PARTITION
   printf(
       "STOPPING: This code has not been modified to work with the "
       "extended coding unit size experiment");
   exit(EXIT_FAILURE);
 #endif  // CONFIG_EXT_PARTITION
 
   const AVxWorkerInterface *const winterface = aom_get_worker_interface();
@@ -410,17 +409,17 @@ static void loop_filter_rows_mt(YV12_BUF
   // Wait till all rows are finished
   for (i = 0; i < num_workers; ++i) {
     winterface->sync(&workers[i]);
   }
 #endif  // CONFIG_PARALLEL_DEBLOCKING
 }
 
 void av1_loop_filter_frame_mt(YV12_BUFFER_CONFIG *frame, AV1_COMMON *cm,
-                              struct macroblockd_plane planes[MAX_MB_PLANE],
+                              struct macroblockd_plane *planes,
                               int frame_filter_level,
 #if CONFIG_LOOPFILTER_LEVEL
                               int frame_filter_level_r,
 #endif
                               int y_only, int partial_frame, AVxWorker *workers,
                               int num_workers, AV1LfSync *lf_sync) {
   int start_mi_row, end_mi_row, mi_rows_to_filter;
 
--- a/third_party/aom/av1/common/thread_common.h
+++ b/third_party/aom/av1/common/thread_common.h
@@ -44,17 +44,17 @@ typedef struct AV1LfSyncData {
 void av1_loop_filter_alloc(AV1LfSync *lf_sync, struct AV1Common *cm, int rows,
                            int width, int num_workers);
 
 // Deallocate loopfilter synchronization related mutex and data.
 void av1_loop_filter_dealloc(AV1LfSync *lf_sync);
 
 // Multi-threaded loopfilter that uses the tile threads.
 void av1_loop_filter_frame_mt(YV12_BUFFER_CONFIG *frame, struct AV1Common *cm,
-                              struct macroblockd_plane planes[MAX_MB_PLANE],
+                              struct macroblockd_plane *planes,
                               int frame_filter_level,
 #if CONFIG_LOOPFILTER_LEVEL
                               int frame_filter_level_r,
 #endif
                               int y_only, int partial_frame, AVxWorker *workers,
                               int num_workers, AV1LfSync *lf_sync);
 
 void av1_accumulate_frame_counts(struct FRAME_COUNTS *acc_counts,
--- a/third_party/aom/av1/common/x86/selfguided_sse4.c
+++ b/third_party/aom/av1/common/x86/selfguided_sse4.c
@@ -5,19 +5,21 @@
 #include "av1/common/restoration.h"
 #include "aom_dsp/x86/synonyms.h"
 
 /* Calculate four consecutive entries of the intermediate A and B arrays
    (corresponding to the first loop in the C version of
    av1_selfguided_restoration)
 */
 static void calc_block(__m128i sum, __m128i sum_sq, __m128i n,
-                       __m128i one_over_n, __m128i s, int bit_depth, int idx,
-                       int32_t *A, int32_t *B) {
+                       __m128i *one_over_n_, __m128i *s_, int bit_depth,
+                       int idx, int32_t *A, int32_t *B) {
   __m128i a, b, p;
+  __m128i one_over_n = *one_over_n_;
+  __m128i s = *s_;
 #if CONFIG_HIGHBITDEPTH
   if (bit_depth > 8) {
     __m128i rounding_a = _mm_set1_epi32((1 << (2 * (bit_depth - 8))) >> 1);
     __m128i rounding_b = _mm_set1_epi32((1 << (bit_depth - 8)) >> 1);
     __m128i shift_a = _mm_cvtsi32_si128(2 * (bit_depth - 8));
     __m128i shift_b = _mm_cvtsi32_si128(bit_depth - 8);
     a = _mm_srl_epi32(_mm_add_epi32(sum_sq, rounding_a), shift_a);
     b = _mm_srl_epi32(_mm_add_epi32(sum, rounding_b), shift_b);
@@ -142,17 +144,17 @@ static void selfguided_restoration_1_h(i
         _mm_slli_si128(a1, 4), _mm_add_epi32(a1, _mm_alignr_epi8(a2, a1, 4)));
     __m128i n = _mm_set_epi32(3 * h, 3 * h, 3 * h, 2 * h);
     __m128i one_over_n =
         _mm_set_epi32(one_by_x[3 * h - 1], one_by_x[3 * h - 1],
                       one_by_x[3 * h - 1], one_by_x[2 * h - 1]);
     __m128i s = _mm_set_epi32(
         sgrproj_mtable[eps - 1][3 * h - 1], sgrproj_mtable[eps - 1][3 * h - 1],
         sgrproj_mtable[eps - 1][3 * h - 1], sgrproj_mtable[eps - 1][2 * h - 1]);
-    calc_block(sum_, sum_sq_, n, one_over_n, s, bit_depth, i * buf_stride, A,
+    calc_block(sum_, sum_sq_, n, &one_over_n, &s, bit_depth, i * buf_stride, A,
                B);
 
     n = _mm_set1_epi32(3 * h);
     one_over_n = _mm_set1_epi32(one_by_x[3 * h - 1]);
     s = _mm_set1_epi32(sgrproj_mtable[eps - 1][3 * h - 1]);
 
     // Re-align a1 and b1 so that they start at index i * buf_stride + 3
     a2 = _mm_alignr_epi8(a2, a1, 12);
@@ -173,18 +175,18 @@ static void selfguided_restoration_1_h(i
          a1 = original A[i * buf_stride + j - 1 : i * buf_stride + j + 3]
          a2 = original A[i * buf_stride + j + 3 : i * buf_stride + j + 7]
          and similar for b1,b2 and B
       */
       sum_ = _mm_add_epi32(b1, _mm_add_epi32(_mm_alignr_epi8(b2, b1, 4),
                                              _mm_alignr_epi8(b2, b1, 8)));
       sum_sq_ = _mm_add_epi32(a1, _mm_add_epi32(_mm_alignr_epi8(a2, a1, 4),
                                                 _mm_alignr_epi8(a2, a1, 8)));
-      calc_block(sum_, sum_sq_, n, one_over_n, s, bit_depth, i * buf_stride + j,
-                 A, B);
+      calc_block(sum_, sum_sq_, n, &one_over_n, &s, bit_depth,
+                 i * buf_stride + j, A, B);
     }
     __m128i a3 = _mm_loadu_si128((__m128i *)&A[i * buf_stride + j + 3]);
     __m128i b3 = _mm_loadu_si128((__m128i *)&B[i * buf_stride + j + 3]);
 
     j = width - 4;
     switch (width % 4) {
       case 0:
         a1 = a2;
@@ -222,17 +224,17 @@ static void selfguided_restoration_1_h(i
     sum_sq_ = _mm_add_epi32(a1, _mm_add_epi32(_mm_alignr_epi8(a2, a1, 4),
                                               _mm_alignr_epi8(a2, a1, 8)));
     n = _mm_set_epi32(2 * h, 3 * h, 3 * h, 3 * h);
     one_over_n = _mm_set_epi32(one_by_x[2 * h - 1], one_by_x[3 * h - 1],
                                one_by_x[3 * h - 1], one_by_x[3 * h - 1]);
     s = _mm_set_epi32(
         sgrproj_mtable[eps - 1][2 * h - 1], sgrproj_mtable[eps - 1][3 * h - 1],
         sgrproj_mtable[eps - 1][3 * h - 1], sgrproj_mtable[eps - 1][3 * h - 1]);
-    calc_block(sum_, sum_sq_, n, one_over_n, s, bit_depth, i * buf_stride + j,
+    calc_block(sum_, sum_sq_, n, &one_over_n, &s, bit_depth, i * buf_stride + j,
                A, B);
   }
 }
 
 static void selfguided_restoration_2_v(uint8_t *src, int width, int height,
                                        int src_stride, int32_t *A, int32_t *B,
                                        int buf_stride) {
   int i, j;
@@ -337,17 +339,17 @@ static void selfguided_restoration_2_h(i
 
     __m128i n = _mm_set_epi32(5 * h, 5 * h, 4 * h, 3 * h);
     __m128i one_over_n =
         _mm_set_epi32(one_by_x[5 * h - 1], one_by_x[5 * h - 1],
                       one_by_x[4 * h - 1], one_by_x[3 * h - 1]);
     __m128i s = _mm_set_epi32(
         sgrproj_mtable[eps - 1][5 * h - 1], sgrproj_mtable[eps - 1][5 * h - 1],
         sgrproj_mtable[eps - 1][4 * h - 1], sgrproj_mtable[eps - 1][3 * h - 1]);
-    calc_block(sum_, sum_sq_, n, one_over_n, s, bit_depth, i * buf_stride, A,
+    calc_block(sum_, sum_sq_, n, &one_over_n, &s, bit_depth, i * buf_stride, A,
                B);
 
     // Re-align a1 and b1 so that they start at index i * buf_stride + 2
     a2 = _mm_alignr_epi8(a2, a1, 8);
     b2 = _mm_alignr_epi8(b2, b1, 8);
 
     n = _mm_set1_epi32(5 * h);
     one_over_n = _mm_set1_epi32(one_by_x[5 * h - 1]);
@@ -367,18 +369,18 @@ static void selfguided_restoration_2_h(i
           _mm_add_epi32(b1, _mm_add_epi32(_mm_alignr_epi8(b2, b1, 4),
                                           _mm_alignr_epi8(b2, b1, 8))),
           _mm_add_epi32(_mm_alignr_epi8(b2, b1, 12), b2));
       sum_sq_ = _mm_add_epi32(
           _mm_add_epi32(a1, _mm_add_epi32(_mm_alignr_epi8(a2, a1, 4),
                                           _mm_alignr_epi8(a2, a1, 8))),
           _mm_add_epi32(_mm_alignr_epi8(a2, a1, 12), a2));
 
-      calc_block(sum_, sum_sq_, n, one_over_n, s, bit_depth, i * buf_stride + j,
-                 A, B);
+      calc_block(sum_, sum_sq_, n, &one_over_n, &s, bit_depth,
+                 i * buf_stride + j, A, B);
     }
     // If the width is not a multiple of 4, we need to reset j to width - 4
     // and adjust a1, a2, b1, b2 so that the loop invariant above is maintained
     __m128i a3 = _mm_loadu_si128((__m128i *)&A[i * buf_stride + j + 2]);
     __m128i b3 = _mm_loadu_si128((__m128i *)&B[i * buf_stride + j + 2]);
 
     j = width - 4;
     switch (width % 4) {
@@ -423,17 +425,17 @@ static void selfguided_restoration_2_h(i
         _mm_add_epi32(_mm_alignr_epi8(a2, a1, 12), a2));
 
     n = _mm_set_epi32(3 * h, 4 * h, 5 * h, 5 * h);
     one_over_n = _mm_set_epi32(one_by_x[3 * h - 1], one_by_x[4 * h - 1],
                                one_by_x[5 * h - 1], one_by_x[5 * h - 1]);
     s = _mm_set_epi32(
         sgrproj_mtable[eps - 1][3 * h - 1], sgrproj_mtable[eps - 1][4 * h - 1],
         sgrproj_mtable[eps - 1][5 * h - 1], sgrproj_mtable[eps - 1][5 * h - 1]);
-    calc_block(sum_, sum_sq_, n, one_over_n, s, bit_depth, i * buf_stride + j,
+    calc_block(sum_, sum_sq_, n, &one_over_n, &s, bit_depth, i * buf_stride + j,
                A, B);
   }
 }
 
 static void selfguided_restoration_3_v(uint8_t *src, int width, int height,
                                        int src_stride, int32_t *A, int32_t *B,
                                        int buf_stride) {
   int i, j;
@@ -557,17 +559,17 @@ static void selfguided_restoration_3_h(i
 
     __m128i n = _mm_set_epi32(7 * h, 6 * h, 5 * h, 4 * h);
     __m128i one_over_n =
         _mm_set_epi32(one_by_x[7 * h - 1], one_by_x[6 * h - 1],
                       one_by_x[5 * h - 1], one_by_x[4 * h - 1]);
     __m128i s = _mm_set_epi32(
         sgrproj_mtable[eps - 1][7 * h - 1], sgrproj_mtable[eps - 1][6 * h - 1],
         sgrproj_mtable[eps - 1][5 * h - 1], sgrproj_mtable[eps - 1][4 * h - 1]);
-    calc_block(sum_, sum_sq_, n, one_over_n, s, bit_depth, i * buf_stride, A,
+    calc_block(sum_, sum_sq_, n, &one_over_n, &s, bit_depth, i * buf_stride, A,
                B);
 
     // Re-align a1 and b1 so that they start at index i * buf_stride + 1
     a2 = _mm_alignr_epi8(a2, a1, 4);
     b2 = _mm_alignr_epi8(b2, b1, 4);
 
     n = _mm_set1_epi32(7 * h);
     one_over_n = _mm_set1_epi32(one_by_x[7 * h - 1]);
@@ -594,18 +596,18 @@ static void selfguided_restoration_3_h(i
                         _mm_alignr_epi8(b3, b2, 8)));
       sum_sq_ = _mm_add_epi32(
           _mm_add_epi32(_mm_add_epi32(a1, _mm_alignr_epi8(a2, a1, 4)),
                         _mm_add_epi32(_mm_alignr_epi8(a2, a1, 8),
                                       _mm_alignr_epi8(a2, a1, 12))),
           _mm_add_epi32(_mm_add_epi32(a2, _mm_alignr_epi8(a3, a2, 4)),
                         _mm_alignr_epi8(a3, a2, 8)));
 
-      calc_block(sum_, sum_sq_, n, one_over_n, s, bit_depth, i * buf_stride + j,
-                 A, B);
+      calc_block(sum_, sum_sq_, n, &one_over_n, &s, bit_depth,
+                 i * buf_stride + j, A, B);
     }
     __m128i a3 = _mm_loadu_si128((__m128i *)&A[i * buf_stride + j + 1]);
     __m128i b3 = _mm_loadu_si128((__m128i *)&B[i * buf_stride + j + 1]);
 
     j = width - 4;
     switch (width % 4) {
       case 0:
         a1 = a2;
@@ -652,17 +654,17 @@ static void selfguided_restoration_3_h(i
                       _mm_alignr_epi8(zero, a2, 8)));
 
     n = _mm_set_epi32(4 * h, 5 * h, 6 * h, 7 * h);
     one_over_n = _mm_set_epi32(one_by_x[4 * h - 1], one_by_x[5 * h - 1],
                                one_by_x[6 * h - 1], one_by_x[7 * h - 1]);
     s = _mm_set_epi32(
         sgrproj_mtable[eps - 1][4 * h - 1], sgrproj_mtable[eps - 1][5 * h - 1],
         sgrproj_mtable[eps - 1][6 * h - 1], sgrproj_mtable[eps - 1][7 * h - 1]);
-    calc_block(sum_, sum_sq_, n, one_over_n, s, bit_depth, i * buf_stride + j,
+    calc_block(sum_, sum_sq_, n, &one_over_n, &s, bit_depth, i * buf_stride + j,
                A, B);
   }
 }
 
 void av1_selfguided_restoration_sse4_1(uint8_t *dgd, int width, int height,
                                        int dgd_stride, int32_t *dst,
                                        int dst_stride, int r, int eps) {
   const int width_ext = width + 2 * SGRPROJ_BORDER_HORZ;
deleted file mode 100644
--- a/toolkit/crashreporter/minidump-analyzer/MinidumpAnalyzerUtils.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef MinidumpAnalyzerUtils_h
-#define MinidumpAnalyzerUtils_h
-
-#ifdef XP_WIN
-#include <windows.h>
-#endif
-
-#include <vector>
-#include <map>
-#include <string>
-#include <algorithm>
-
-namespace CrashReporter {
-
-struct MinidumpAnalyzerOptions {
-  bool fullMinidump;
-  std::string forceUseModule;
-};
-
-extern MinidumpAnalyzerOptions gMinidumpAnalyzerOptions;
-
-#ifdef XP_WIN
-
-#if !defined(_MSC_VER)
-static inline std::string
-WideToMBCP(const std::wstring& wide, unsigned int cp, bool* success = nullptr)
-{
-  char* buffer = nullptr;
-  int buffer_size = WideCharToMultiByte(cp, 0, wide.c_str(),
-                                        -1, nullptr, 0, nullptr, nullptr);
-  if (buffer_size == 0) {
-    if (success) {
-      *success = false;
-    }
-
-    return "";
-  }
-
-  buffer = new char[buffer_size];
-  if (buffer == nullptr) {
-    if (success) {
-      *success = false;
-    }
-
-    return "";
-  }
-
-  WideCharToMultiByte(cp, 0, wide.c_str(),
-                      -1, buffer, buffer_size, nullptr, nullptr);
-  std::string mb = buffer;
-  delete [] buffer;
-
-  if (success) {
-    *success = true;
-  }
-
-  return mb;
-}
-#endif /* !defined(_MSC_VER) */
-
-static inline std::wstring
-UTF8ToWide(const std::string& aUtf8Str, bool *aSuccess = nullptr)
-{
-  wchar_t* buffer = nullptr;
-  int buffer_size = MultiByteToWideChar(CP_UTF8, 0, aUtf8Str.c_str(),
-                                        -1, nullptr, 0);
-  if (buffer_size == 0) {
-    if (aSuccess) {
-      *aSuccess = false;
-    }
-
-    return L"";
-  }
-
-  buffer = new wchar_t[buffer_size];
-
-  if (buffer == nullptr) {
-    if (aSuccess) {
-      *aSuccess = false;
-    }
-
-    return L"";
-  }
-
-  MultiByteToWideChar(CP_UTF8, 0, aUtf8Str.c_str(),
-                      -1, buffer, buffer_size);
-  std::wstring str = buffer;
-  delete [] buffer;
-
-  if (aSuccess) {
-    *aSuccess = true;
-  }
-
-  return str;
-}
-
-static inline std::string
-WideToMBCS(const std::wstring &inp) {
-  int buffer_size = WideCharToMultiByte(CP_ACP, 0, inp.c_str(), -1,
-                                        nullptr, 0, NULL, NULL);
-  if (buffer_size == 0) {
-    return "";
-  }
-
-  std::vector<char> buffer(buffer_size);
-  buffer[0] = 0;
-
-  WideCharToMultiByte(CP_ACP, 0, inp.c_str(), -1,
-                      buffer.data(), buffer_size, NULL, NULL);
-
-  return buffer.data();
-}
-
-static inline std::string
-UTF8toMBCS(const std::string &inp) {
-  std::wstring wide = UTF8ToWide(inp);
-  std::string ret = WideToMBCS(wide);
-  return ret;
-}
-
-#endif // XP_WIN
-
-// Check if a file exists at the specified path
-
-static inline bool
-FileExists(const std::string& aPath)
-{
-#if defined(XP_WIN)
-  DWORD attrs = GetFileAttributes(UTF8ToWide(aPath).c_str());
-  return (attrs != INVALID_FILE_ATTRIBUTES);
-#else // Non-Windows
-  struct stat sb;
-  int ret = stat(aPath.c_str(), &sb);
-  if (ret == -1 || !(sb.st_mode & S_IFREG)) {
-    return false;
-  }
-
-  return true;
-#endif // XP_WIN
-}
-
-} // namespace
-
-#endif // MinidumpAnalyzerUtils_h
deleted file mode 100644
--- a/toolkit/crashreporter/minidump-analyzer/MozStackFrameSymbolizer.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#if XP_WIN && HAVE_64BIT_BUILD
-
-#include "MozStackFrameSymbolizer.h"
-
-#include "MinidumpAnalyzerUtils.h"
-
-#include "processor/cfi_frame_info.h"
-
-#include <iostream>
-#include <sstream>
-#include <fstream>
-
-namespace CrashReporter {
-
-  extern MinidumpAnalyzerOptions gMinidumpAnalyzerOptions;
-
-  using google_breakpad::CFIFrameInfo;
-
-MozStackFrameSymbolizer::MozStackFrameSymbolizer() :
-  StackFrameSymbolizer(nullptr, nullptr)
-{
-}
-
-MozStackFrameSymbolizer::SymbolizerResult
-MozStackFrameSymbolizer::FillSourceLineInfo(const CodeModules* modules,
-                                            const SystemInfo* system_info,
-                                            StackFrame* stack_frame)
-{
-  SymbolizerResult ret = StackFrameSymbolizer::FillSourceLineInfo(
-    modules, system_info, stack_frame);
-
-  if (ret == kNoError && this->HasImplementation() &&
-    stack_frame->function_name.empty()) {
-    // Breakpad's Stackwalker::InstructionAddressSeemsValid only considers an
-    // address valid if it has associated symbols.
-    //
-    // This makes sense for complete & accurate symbols, but ours may be
-    // incomplete or wrong. Returning a function name tells Breakpad we
-    // recognize this address as code, so it's OK to use in stack scanning.
-    // This function is only called with addresses that land in this module.
-    //
-    // This allows us to fall back to stack scanning in the case where we were
-    // unable to provide CFI.
-    stack_frame->function_name = "<unknown code>";
-  }
-  return ret;
-}
-
-CFIFrameInfo*
-MozStackFrameSymbolizer::FindCFIFrameInfo(const StackFrame* frame)
-{
-  std::string modulePath;
-
-  // For unit testing, support loading a specified module instead of
-  // the real one.
-  bool moduleHasBeenReplaced = false;
-  if (gMinidumpAnalyzerOptions.forceUseModule.size() > 0) {
-    modulePath = gMinidumpAnalyzerOptions.forceUseModule;
-    moduleHasBeenReplaced = true;
-  } else {
-    if (!frame->module) {
-      return nullptr;
-    }
-    modulePath = frame->module->code_file();
-  }
-
-  // Get/create the unwind parser.
-  auto itMod = mModuleMap.find(modulePath);
-  std::shared_ptr<ModuleUnwindParser> unwindParser;
-  if (itMod != mModuleMap.end()) {
-    unwindParser = itMod->second;
-  } else {
-    unwindParser.reset(new ModuleUnwindParser(modulePath));
-    mModuleMap[modulePath] = unwindParser;
-  }
-
-  UnwindCFI cfi;
-  DWORD offsetAddr;
-
-  if (moduleHasBeenReplaced) {
-    // If we are replacing a module, addresses will never line up.
-    // So just act like the 1st entry is correct.
-    offsetAddr = unwindParser->GetAnyOffsetAddr();
-  } else {
-    offsetAddr = frame->instruction - frame->module->base_address();
-  }
-
-  if (!unwindParser->GetCFI(offsetAddr, cfi)) {
-    return nullptr;
-  }
-
-  std::unique_ptr<CFIFrameInfo> rules(new CFIFrameInfo());
-
-  static const size_t exprSize = 50;
-  char expr[exprSize];
-  if (cfi.stackSize == 0) {
-    snprintf(expr, exprSize, "$rsp");
-  } else {
-    snprintf(expr, exprSize, "$rsp %d +", cfi.stackSize);
-  }
-  rules->SetCFARule(expr);
-
-  if (cfi.ripOffset == 0) {
-    snprintf(expr, exprSize, ".cfa ^");
-  } else {
-    snprintf(expr, exprSize, ".cfa %d - ^", cfi.ripOffset);
-  }
-  rules->SetRARule(expr);
-
-  return rules.release();
-}
-
-} // namespace CrashReporter
-
-#endif // XP_WIN && HAVE_64BIT_BUILD
deleted file mode 100644
--- a/toolkit/crashreporter/minidump-analyzer/MozStackFrameSymbolizer.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef MozStackFrameSymbolizer_h
-#define MozStackFrameSymbolizer_h
-
-#if XP_WIN && HAVE_64BIT_BUILD
-
-#include "Win64ModuleUnwindMetadata.h"
-
-#include "google_breakpad/processor/stack_frame_symbolizer.h"
-#include "google_breakpad/processor/stack_frame.h"
-
-#include <memory>
-
-namespace CrashReporter {
-
-using google_breakpad::CodeModule;
-using google_breakpad::CodeModules;
-using google_breakpad::SourceLineResolverInterface;
-using google_breakpad::StackFrame;
-using google_breakpad::StackFrameSymbolizer;
-using google_breakpad::SymbolSupplier;
-using google_breakpad::SystemInfo;
-
-class MozStackFrameSymbolizer : public StackFrameSymbolizer {
-  using google_breakpad::StackFrameSymbolizer::SymbolizerResult;
-
-  std::map<std::string, std::shared_ptr<ModuleUnwindParser>> mModuleMap;
-
-public:
-  MozStackFrameSymbolizer();
-
-  virtual SymbolizerResult FillSourceLineInfo(const CodeModules* modules,
-    const SystemInfo* system_info,
-    StackFrame* stack_frame);
-
-  virtual class google_breakpad::CFIFrameInfo* FindCFIFrameInfo(
-    const StackFrame* frame);
-};
-
-} // namespace CrashReporter
-
-#endif // XP_WIN && HAVE_64BIT_BUILD
-
-#endif // MozStackFrameSymbolizer_h
deleted file mode 100644
--- a/toolkit/crashreporter/minidump-analyzer/Win64ModuleUnwindMetadata.cpp
+++ /dev/null
@@ -1,265 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#if XP_WIN && HAVE_64BIT_BUILD
-
-#include "Win64ModuleUnwindMetadata.h"
-
-#include "MinidumpAnalyzerUtils.h"
-
-#include <windows.h>
-#include <winnt.h>
-#include <ImageHlp.h>
-#include <iostream>
-#include <sstream>
-#include <string>
-
-namespace CrashReporter {
-
-union UnwindCode {
-  struct {
-    uint8_t offset_in_prolog;
-    uint8_t unwind_operation_code : 4;
-    uint8_t operation_info        : 4;
-  };
-  USHORT frame_offset;
-};
-
-enum UnwindOperationCodes {
-  UWOP_PUSH_NONVOL = 0,     // info == register number
-  UWOP_ALLOC_LARGE = 1,     // no info, alloc size in next 2 slots
-  UWOP_ALLOC_SMALL = 2,     // info == size of allocation / 8 - 1
-  UWOP_SET_FPREG = 3,       // no info, FP = RSP + UNWIND_INFO.FPRegOffset*16
-  UWOP_SAVE_NONVOL = 4,     // info == register number, offset in next slot
-  UWOP_SAVE_NONVOL_FAR = 5, // info == register number, offset in next 2 slots
-  UWOP_SAVE_XMM = 6,        // Version 1; undocumented
-  UWOP_EPILOG = 6,          // Version 2; undocumented
-  UWOP_SAVE_XMM_FAR = 7,    // Version 1; undocumented
-  UWOP_SPARE = 7,           // Version 2; undocumented
-  UWOP_SAVE_XMM128 = 8,     // info == XMM reg number, offset in next slot
-  UWOP_SAVE_XMM128_FAR = 9, // info == XMM reg number, offset in next 2 slots
-  UWOP_PUSH_MACHFRAME = 10  // info == 0: no error-code, 1: error-code
-};
-
-struct UnwindInfo {
-  uint8_t version       : 3;
-  uint8_t flags         : 5;
-  uint8_t size_of_prolog;
-  uint8_t count_of_codes;
-  uint8_t frame_register : 4;
-  uint8_t frame_offset   : 4;
-  UnwindCode unwind_code[1];
-};
-
-ModuleUnwindParser::~ModuleUnwindParser()
-{
-  if (mImg) {
-    ImageUnload(mImg);
-  }
-}
-
-void*
-ModuleUnwindParser::RvaToVa(ULONG aRva)
-{
-  return ImageRvaToVa(
-    mImg->FileHeader, mImg->MappedAddress, aRva, &mImg->LastRvaSection);
-}
-
-ModuleUnwindParser::ModuleUnwindParser(const std::string& aPath)
-  : mPath(aPath)
-{
-  // Convert wchar to native charset because ImageLoad only takes
-  // a PSTR as input.
-  std::string code_file = UTF8toMBCS(aPath);
-
-  mImg = ImageLoad((PSTR)code_file.c_str(), NULL);
-  if (!mImg || !mImg->FileHeader) {
-    return;
-  }
-
-  PIMAGE_OPTIONAL_HEADER64 optional_header = &mImg->FileHeader->OptionalHeader;
-  if (optional_header->Magic != IMAGE_NT_OPTIONAL_HDR64_MAGIC) {
-    return;
-  }
-
-  DWORD exception_rva = optional_header->
-    DataDirectory[IMAGE_DIRECTORY_ENTRY_EXCEPTION].VirtualAddress;
-
-  DWORD exception_size = optional_header->
-    DataDirectory[IMAGE_DIRECTORY_ENTRY_EXCEPTION].Size;
-
-  auto funcs = (PIMAGE_RUNTIME_FUNCTION_ENTRY)RvaToVa(exception_rva);
-  if (!funcs) {
-    return;
-  }
-
-  for (DWORD i = 0; i < exception_size / sizeof(*funcs); i++) {
-    mUnwindMap[funcs[i].BeginAddress] = &funcs[i];
-  }
-}
-
-bool
-ModuleUnwindParser::GenerateCFIForFunction(IMAGE_RUNTIME_FUNCTION_ENTRY& aFunc,
-                                           UnwindCFI& aRet)
-{
-  DWORD unwind_rva = aFunc.UnwindInfoAddress;
-  // Holds RVA to all visited IMAGE_RUNTIME_FUNCTION_ENTRY, to avoid
-  // circular references.
-  std::set<DWORD> visited;
-
-  // Follow chained function entries
-  while (unwind_rva & 0x1) {
-    unwind_rva ^= 0x1;
-
-    if (visited.end() != visited.find(unwind_rva)) {
-      return false;
-    }
-    visited.insert(unwind_rva);
-
-    auto chained_func = (PIMAGE_RUNTIME_FUNCTION_ENTRY)RvaToVa(unwind_rva);
-    if (!chained_func) {
-      return false;
-    }
-    unwind_rva = chained_func->UnwindInfoAddress;
-  }
-
-  visited.insert(unwind_rva);
-
-  auto unwind_info = (UnwindInfo*)RvaToVa(unwind_rva);
-  if (!unwind_info) {
-    return false;
-  }
-
-  DWORD stack_size = 8; // minimal stack size is 8 for RIP
-  DWORD rip_offset = 8;
-  do {
-    for (uint8_t c = 0; c < unwind_info->count_of_codes; c++) {
-      UnwindCode* unwind_code = &unwind_info->unwind_code[c];
-      switch (unwind_code->unwind_operation_code) {
-        case UWOP_PUSH_NONVOL: {
-          stack_size += 8;
-          break;
-        }
-        case UWOP_ALLOC_LARGE: {
-          if (unwind_code->operation_info == 0) {
-            c++;
-            if (c < unwind_info->count_of_codes) {
-              stack_size += (unwind_code + 1)->frame_offset * 8;
-            }
-          } else {
-            c += 2;
-            if (c < unwind_info->count_of_codes) {
-              stack_size += (unwind_code + 1)->frame_offset |
-                            ((unwind_code + 2)->frame_offset << 16);
-            }
-          }
-          break;
-        }
-        case UWOP_ALLOC_SMALL: {
-          stack_size += unwind_code->operation_info * 8 + 8;
-          break;
-        }
-        case UWOP_SET_FPREG:
-          // To correctly track RSP when it's been transferred to another
-          // register, we would need to emit CFI records for every unwind op.
-          // For simplicity, don't emit CFI records for this function as
-          // we know it will be incorrect after this point.
-          return false;
-        case UWOP_SAVE_NONVOL:
-        case UWOP_SAVE_XMM: // also v2 UWOP_EPILOG
-        case UWOP_SAVE_XMM128: {
-          c++; // skip slot with offset
-          break;
-        }
-        case UWOP_SAVE_NONVOL_FAR:
-        case UWOP_SAVE_XMM_FAR: // also v2 UWOP_SPARE
-        case UWOP_SAVE_XMM128_FAR: {
-          c += 2; // skip 2 slots with offset
-          break;
-        }
-        case UWOP_PUSH_MACHFRAME: {
-          if (unwind_code->operation_info) {
-            stack_size += 88;
-          } else {
-            stack_size += 80;
-          }
-          rip_offset += 80;
-          break;
-        }
-        default: {
-          return false;
-        }
-      }
-    }
-
-    if (unwind_info->flags & UNW_FLAG_CHAININFO) {
-      auto chained_func = (PIMAGE_RUNTIME_FUNCTION_ENTRY)(
-            (unwind_info->unwind_code +
-            ((unwind_info->count_of_codes + 1) & ~1)));
-
-      if (visited.end() != visited.find(chained_func->UnwindInfoAddress)) {
-        return false; // Circular reference
-      }
-
-      visited.insert(chained_func->UnwindInfoAddress);
-
-      unwind_info = (UnwindInfo*)RvaToVa(chained_func->UnwindInfoAddress);
-    } else {
-      unwind_info = nullptr;
-    }
-  } while (unwind_info);
-
-  aRet.beginAddress = aFunc.BeginAddress;
-  aRet.size = aFunc.EndAddress - aFunc.BeginAddress;
-  aRet.stackSize = stack_size;
-  aRet.ripOffset = rip_offset;
-  return true;
-}
-
-// For unit testing we sometimes need any address that's valid in this module.
-// Just return the first address we know of.
-DWORD
-ModuleUnwindParser::GetAnyOffsetAddr() const {
-  if (mUnwindMap.size() < 1) {
-    return 0;
-  }
-  return mUnwindMap.begin()->first;
-}
-
-bool
-ModuleUnwindParser::GetCFI(DWORD aAddress, UnwindCFI& aRet)
-{
-  // Figure out the begin address of the requested address.
-  auto itUW = mUnwindMap.lower_bound(aAddress + 1);
-  if (itUW == mUnwindMap.begin()) {
-   return false; // address before this module.
-  }
-  --itUW;
-
-  // Ensure that the function entry is big enough to contain this address.
-  IMAGE_RUNTIME_FUNCTION_ENTRY& func = *itUW->second;
-  if (aAddress > func.EndAddress) {
-    return false;
-  }
-
-  // Do we have CFI for this function already?
-  auto itCFI = mCFIMap.find(aAddress);
-  if (itCFI != mCFIMap.end()) {
-    aRet = itCFI->second;
-    return true;
-  }
-
-  // No, generate it.
-  if (!GenerateCFIForFunction(func, aRet)) {
-    return false;
-  }
-
-  mCFIMap[func.BeginAddress] = aRet;
-  return true;
-}
-
-} // namespace
-
-#endif // XP_WIN && HAVE_64BIT_BUILD
deleted file mode 100644
--- a/toolkit/crashreporter/minidump-analyzer/Win64ModuleUnwindMetadata.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef Win64ModuleUnwindMetadata_h
-#define Win64ModuleUnwindMetadata_h
-
-#if XP_WIN && HAVE_64BIT_BUILD
-
-#include <functional>
-#include <map>
-#include <string>
-
-#include <windows.h>
-#include <winnt.h>
-#include <ImageHlp.h>
-
-namespace CrashReporter {
-
-struct UnwindCFI
-{
-  uint32_t beginAddress;
-  uint32_t size;
-  uint32_t stackSize;
-  uint32_t ripOffset;
-};
-
-// Does lazy-parsing of unwind info.
-class ModuleUnwindParser {
-  PLOADED_IMAGE mImg;
-  std::string mPath;
-
-  // Maps begin address to exception record.
-  // Populated upon construction.
-  std::map<DWORD, PIMAGE_RUNTIME_FUNCTION_ENTRY> mUnwindMap;
-
-  // Maps begin address to CFI.
-  // Populated as needed.
-  std::map<DWORD, UnwindCFI> mCFIMap;
-
-  bool GenerateCFIForFunction(IMAGE_RUNTIME_FUNCTION_ENTRY& aFunc,
-                              UnwindCFI& aRet);
-  void* RvaToVa(ULONG aRva);
-
-public:
-  explicit ModuleUnwindParser(const std::string& aPath);
-  ~ModuleUnwindParser();
-  bool GetCFI(DWORD aAddress, UnwindCFI& aRet);
-  DWORD GetAnyOffsetAddr() const;
-};
-
-} // namespace
-
-#endif // XP_WIN && HAVE_64BIT_BUILD
-
-#endif // Win64ModuleUnwindMetadata_h
--- a/toolkit/crashreporter/minidump-analyzer/minidump-analyzer.cpp
+++ b/toolkit/crashreporter/minidump-analyzer/minidump-analyzer.cpp
@@ -27,21 +27,22 @@
 #elif defined(XP_UNIX) || defined(XP_MACOSX)
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
 #endif
 
-#include "MinidumpAnalyzerUtils.h"
+// Path of the minidump to be analyzed.
+static string gMinidumpPath;
 
-#if XP_WIN && HAVE_64BIT_BUILD
-#include "MozStackFrameSymbolizer.h"
-#endif
+// When set to true print out the full minidump analysis, otherwise only
+// include the crashing thread in the output.
+static bool gFullMinidump = false;
 
 namespace CrashReporter {
 
 using std::ios;
 using std::ios_base;
 using std::hex;
 using std::ofstream;
 using std::map;
@@ -56,20 +57,87 @@ using google_breakpad::CodeModule;
 using google_breakpad::CodeModules;
 using google_breakpad::Minidump;
 using google_breakpad::MinidumpProcessor;
 using google_breakpad::PathnameStripper;
 using google_breakpad::ProcessResult;
 using google_breakpad::ProcessState;
 using google_breakpad::StackFrame;
 
-MinidumpAnalyzerOptions gMinidumpAnalyzerOptions;
+#ifdef XP_WIN
+
+#if !defined(_MSC_VER)
+static string WideToMBCP(const wstring& wide,
+                         unsigned int cp,
+                         bool* success = nullptr)
+{
+  char* buffer = nullptr;
+  int buffer_size = WideCharToMultiByte(cp, 0, wide.c_str(),
+                                        -1, nullptr, 0, nullptr, nullptr);
+  if(buffer_size == 0) {
+    if (success)
+      *success = false;
+    return "";
+  }
+
+  buffer = new char[buffer_size];
+  if(buffer == nullptr) {
+    if (success)
+      *success = false;
+    return "";
+  }
+
+  WideCharToMultiByte(cp, 0, wide.c_str(),
+                      -1, buffer, buffer_size, nullptr, nullptr);
+  string mb = buffer;
+  delete [] buffer;
+
+  if (success)
+    *success = true;
+
+  return mb;
+}
+#endif /* !defined(_MSC_VER) */
 
-// Path of the minidump to be analyzed.
-static string gMinidumpPath;
+static wstring UTF8ToWide(const string& aUtf8Str, bool *aSuccess = nullptr)
+{
+  wchar_t* buffer = nullptr;
+  int buffer_size = MultiByteToWideChar(CP_UTF8, 0, aUtf8Str.c_str(),
+                                        -1, nullptr, 0);
+  if (buffer_size == 0) {
+    if (aSuccess) {
+      *aSuccess = false;
+    }
+
+    return L"";
+  }
+
+  buffer = new wchar_t[buffer_size];
+
+  if (buffer == nullptr) {
+    if (aSuccess) {
+      *aSuccess = false;
+    }
+
+    return L"";
+  }
+
+  MultiByteToWideChar(CP_UTF8, 0, aUtf8Str.c_str(),
+                      -1, buffer, buffer_size);
+  wstring str = buffer;
+  delete [] buffer;
+
+  if (aSuccess) {
+    *aSuccess = true;
+  }
+
+  return str;
+}
+
+#endif
 
 struct ModuleCompare {
   bool operator() (const CodeModule* aLhs, const CodeModule* aRhs) const {
     return aLhs->base_address() < aRhs->base_address();
   }
 };
 
 typedef map<const CodeModule*, unsigned int, ModuleCompare> OrderedModulesMap;
@@ -244,18 +312,17 @@ ConvertProcessStateToJSON(const ProcessS
   if (aProcessState.crashed()) {
     crashInfo["type"] = aProcessState.crash_reason();
     crashInfo["address"] = ToHex(aProcessState.crash_address());
 
     if (requestingThread != -1) {
       // Record the crashing thread index only if this is a full minidump
       // and all threads' stacks are present, otherwise only the crashing
       // thread stack is written out and this field is set to 0.
-      crashInfo["crashing_thread"] =
-        gMinidumpAnalyzerOptions.fullMinidump ? requestingThread : 0;
+      crashInfo["crashing_thread"] = gFullMinidump ? requestingThread : 0;
     }
   } else {
     crashInfo["type"] = Json::Value(Json::nullValue);
     // Add assertion info, if available
     string assertion = aProcessState.assertion();
 
     if (!assertion.empty()) {
       crashInfo["assertion"] = assertion;
@@ -273,17 +340,17 @@ ConvertProcessStateToJSON(const ProcessS
   }
 
   aRoot["modules"] = modules;
 
   // Threads
   Json::Value threads(Json::arrayValue);
   int threadCount = aProcessState.threads()->size();
 
-  if (!gMinidumpAnalyzerOptions.fullMinidump && (requestingThread != -1)) {
+  if (!gFullMinidump && (requestingThread != -1)) {
     // Only add the crashing thread
     Json::Value thread;
     Json::Value stack(Json::arrayValue);
     const CallStack* rawStack = aProcessState.threads()->at(requestingThread);
 
     ConvertStackToJSON(aProcessState, orderedModules, rawStack, stack);
     thread["frames"] = stack;
     threads.append(thread);
@@ -302,24 +369,19 @@ ConvertProcessStateToJSON(const ProcessS
   aRoot["threads"] = threads;
 }
 
 // Process the minidump file and append the JSON-formatted stack traces to
 // the node specified in |aRoot|
 
 static bool
 ProcessMinidump(Json::Value& aRoot, const string& aDumpFile) {
-#if XP_WIN && HAVE_64BIT_BUILD
-  MozStackFrameSymbolizer symbolizer;
-  MinidumpProcessor minidumpProcessor(&symbolizer, false);
-#else
   BasicSourceLineResolver resolver;
   // We don't have a valid symbol resolver so we pass nullptr instead.
   MinidumpProcessor minidumpProcessor(nullptr, &resolver);
-#endif
 
   // Process the minidump.
   Minidump dump(aDumpFile);
   if (!dump.Read()) {
     return false;
   }
 
   ProcessResult rv;
@@ -348,16 +410,35 @@ OpenAppend(const string& aFilename)
     new ofstream(WideToMBCP(UTF8ToWide(aFilename), CP_ACP).c_str(), mode);
 #endif  // _MSC_VER
 #else // Non-Windows
   ofstream* file = new ofstream(aFilename.c_str(), mode);
 #endif // XP_WIN
   return file;
 }
 
+// Check if a file exists at the specified path
+
+static bool
+FileExists(const string& aPath)
+{
+#if defined(XP_WIN)
+  DWORD attrs = GetFileAttributes(UTF8ToWide(aPath).c_str());
+  return (attrs != INVALID_FILE_ATTRIBUTES);
+#else // Non-Windows
+  struct stat sb;
+  int ret = stat(aPath.c_str(), &sb);
+  if (ret == -1 || !(sb.st_mode & S_IFREG)) {
+    return false;
+  }
+
+  return true;
+#endif // XP_WIN
+}
+
 // Update the extra data file by adding the StackTraces field holding the
 // JSON output of this program.
 
 static void
 UpdateExtraDataFile(const string &aDumpPath, const Json::Value& aRoot)
 {
   string extraDataPath(aDumpPath);
   int dot = extraDataPath.rfind('.');
@@ -387,20 +468,17 @@ using namespace CrashReporter;
 static void
 ParseArguments(int argc, char** argv) {
   if (argc <= 1) {
     exit(EXIT_FAILURE);
   }
 
   for (int i = 1; i < argc - 1; i++) {
     if (strcmp(argv[i], "--full") == 0) {
-      gMinidumpAnalyzerOptions.fullMinidump = true;
-    } else if ((strcmp(argv[i], "--force-use-module") == 0) && (i < argc - 2)) {
-      gMinidumpAnalyzerOptions.forceUseModule = argv[i + 1];
-      ++i;
+      gFullMinidump = true;
     } else {
       exit(EXIT_FAILURE);
     }
   }
 
   gMinidumpPath = argv[argc - 1];
 }
 
--- a/toolkit/crashreporter/minidump-analyzer/moz.build
+++ b/toolkit/crashreporter/minidump-analyzer/moz.build
@@ -22,25 +22,13 @@ if CONFIG['OS_TARGET'] != 'Android':
     LOCAL_INCLUDES += [
         '/toolkit/components/jsoncpp/include',
     ]
 
 
     if CONFIG['OS_TARGET'] == 'Darwin':
         DIST_SUBDIR = 'crashreporter.app/Contents/MacOS'
 
-if CONFIG['OS_TARGET'] == 'WINNT' and CONFIG['CPU_ARCH'] == 'x86_64':
-    UNIFIED_SOURCES += [
-        'MozStackFrameSymbolizer.cpp',
-        'Win64ModuleUnwindMetadata.cpp',
-    ]
-
-    OS_LIBS += [
-        'Dbghelp',
-        'Imagehlp'
-    ]
-
-
 # Don't use the STL wrappers in the crashreporter clients; they don't
 # link with -lmozalloc, and it really doesn't matter here anyway.
 DisableStlWrapping()
 
 include('/toolkit/crashreporter/crashreporter.mozbuild')
--- a/toolkit/crashreporter/test/CrashTestUtils.jsm
+++ b/toolkit/crashreporter/test/CrashTestUtils.jsm
@@ -3,39 +3,26 @@
 
 this.EXPORTED_SYMBOLS = ["CrashTestUtils"];
 
 this.CrashTestUtils = {
   // These will be defined using ctypes APIs below.
   crash: null,
   dumpHasStream: null,
   dumpHasInstructionPointerMemory: null,
-  dumpWin64CFITestSymbols: null,
 
   // Constants for crash()
   // Keep these in sync with nsTestCrasher.cpp!
   CRASH_INVALID_POINTER_DEREF: 0,
   CRASH_PURE_VIRTUAL_CALL:     1,
   CRASH_RUNTIMEABORT:          2,
   CRASH_OOM:                   3,
   CRASH_MOZ_CRASH:             4,
   CRASH_ABORT:                 5,
   CRASH_UNCAUGHT_EXCEPTION:    6,
-  CRASH_X64CFI_NO_MANS_LAND:   7,
-  CRASH_X64CFI_LAUNCHER:       8,
-  CRASH_X64CFI_UNKNOWN_OPCODE: 9,
-  CRASH_X64CFI_PUSH_NONVOL:    10,
-  CRASH_X64CFI_ALLOC_SMALL:    11,
-  CRASH_X64CFI_ALLOC_LARGE:    12,
-  CRASH_X64CFI_SAVE_NONVOL:    15,
-  CRASH_X64CFI_SAVE_NONVOL_FAR: 16,
-  CRASH_X64CFI_SAVE_XMM128:    17,
-  CRASH_X64CFI_SAVE_XMM128_FAR: 18,
-  CRASH_X64CFI_EPILOG:         19,
-  CRASH_X64CFI_EOF:            20,
 
   // Constants for dumpHasStream()
   // From google_breakpad/common/minidump_format.h
   MD_THREAD_LIST_STREAM:       3,
   MD_MEMORY_INFO_LIST_STREAM:  16
 };
 
 // Grab APIs from the testcrasher shared library
@@ -71,14 +58,8 @@ CrashTestUtils.dumpHasInstructionPointer
               ctypes.default_abi,
               ctypes.bool,
               ctypes.char.ptr);
 
 CrashTestUtils.dumpCheckMemory = lib.declare("DumpCheckMemory",
                                              ctypes.default_abi,
                                              ctypes.bool,
                                              ctypes.char.ptr);
-
-CrashTestUtils.getWin64CFITestFnAddrOffset =
-  lib.declare("GetWin64CFITestFnAddrOffset",
-    ctypes.default_abi,
-    ctypes.int32_t,
-    ctypes.int16_t);
--- a/toolkit/crashreporter/test/moz.build
+++ b/toolkit/crashreporter/test/moz.build
@@ -19,21 +19,16 @@ UNIFIED_SOURCES += [
     'dumputils.cpp',
     'nsTestCrasher.cpp',
 ]
 
 SOURCES += [
   'ExceptionThrower.cpp',
 ]
 
-if CONFIG['OS_TARGET'] == 'WINNT' and CONFIG['CPU_ARCH'] == 'x86_64':
-    SOURCES += [
-        'win64UnwindInfoTests.asm',
-    ]
-
 if CONFIG['CLANG_CL']:
     SOURCES['ExceptionThrower.cpp'].flags += [
         '-Xclang',
         '-fcxx-exceptions',
     ]
 elif not CONFIG['_MSC_VER']:
     SOURCES['ExceptionThrower.cpp'].flags += [
         '-fexceptions',
--- a/toolkit/crashreporter/test/nsTestCrasher.cpp
+++ b/toolkit/crashreporter/test/nsTestCrasher.cpp
@@ -2,17 +2,16 @@
 
 #include <stdio.h>
 
 #include "nscore.h"
 #include "mozilla/Unused.h"
 #include "ExceptionThrower.h"
 
 #ifdef XP_WIN
-#include <malloc.h>
 #include <windows.h>
 #endif
 
 /*
  * This pure virtual call example is from MSDN
  */
 class A;
 
@@ -39,90 +38,23 @@ void fcn( A* p )
 
 void PureVirtualCall()
 {
   // generates a pure virtual function call
   B b;
   b.use(); // make sure b's actually used
 }
 
-extern "C" {
-#if XP_WIN && HAVE_64BIT_BUILD
-  // Implementation in win64unwindInfoTests.asm
-  uint64_t x64CrashCFITest_NO_MANS_LAND(uint64_t returnpfn, void*);
-  uint64_t x64CrashCFITest_Launcher(uint64_t returnpfn, void* testProc);
-  uint64_t x64CrashCFITest_UnknownOpcode(uint64_t returnpfn, void*);
-  uint64_t x64CrashCFITest_PUSH_NONVOL(uint64_t returnpfn, void*);
-  uint64_t x64CrashCFITest_ALLOC_SMALL(uint64_t returnpfn, void*);
-  uint64_t x64CrashCFITest_ALLOC_LARGE(uint64_t returnpfn, void*);
-  uint64_t x64CrashCFITest_SAVE_NONVOL(uint64_t returnpfn, void*);
-  uint64_t x64CrashCFITest_SAVE_NONVOL_FAR(uint64_t returnpfn, void*);
-  uint64_t x64CrashCFITest_SAVE_XMM128(uint64_t returnpfn, void*);
-  uint64_t x64CrashCFITest_SAVE_XMM128_FAR(uint64_t returnpfn, void*);
-  uint64_t x64CrashCFITest_EPILOG(uint64_t returnpfn, void*);
-  uint64_t x64CrashCFITest_EOF(uint64_t returnpfn, void*);
-#endif // XP_WIN && HAVE_64BIT_BUILD
-}
-
 // Keep these in sync with CrashTestUtils.jsm!
 const int16_t CRASH_INVALID_POINTER_DEREF = 0;
 const int16_t CRASH_PURE_VIRTUAL_CALL     = 1;
 const int16_t CRASH_OOM                   = 3;
 const int16_t CRASH_MOZ_CRASH             = 4;
 const int16_t CRASH_ABORT                 = 5;
 const int16_t CRASH_UNCAUGHT_EXCEPTION    = 6;
-const int16_t CRASH_X64CFI_NO_MANS_LAND   = 7;
-const int16_t CRASH_X64CFI_LAUNCHER       = 8;
-const int16_t CRASH_X64CFI_UNKNOWN_OPCODE = 9;
-const int16_t CRASH_X64CFI_PUSH_NONVOL    = 10;
-const int16_t CRASH_X64CFI_ALLOC_SMALL    = 11;
-const int16_t CRASH_X64CFI_ALLOC_LARGE    = 12;
-const int16_t CRASH_X64CFI_SAVE_NONVOL    = 15;
-const int16_t CRASH_X64CFI_SAVE_NONVOL_FAR = 16;
-const int16_t CRASH_X64CFI_SAVE_XMM128    = 17;
-const int16_t CRASH_X64CFI_SAVE_XMM128_FAR = 18;
-const int16_t CRASH_X64CFI_EPILOG         = 19;
-const int16_t CRASH_X64CFI_EOF            = 20;
-
-#if XP_WIN && HAVE_64BIT_BUILD
-
-typedef decltype(&x64CrashCFITest_UnknownOpcode) win64CFITestFnPtr_t;
-
-static std::map<int16_t, win64CFITestFnPtr_t>
-GetWin64CFITestMap() {
-  std::map<int16_t, win64CFITestFnPtr_t> ret = {
-    { CRASH_X64CFI_NO_MANS_LAND, x64CrashCFITest_NO_MANS_LAND},
-    { CRASH_X64CFI_LAUNCHER, x64CrashCFITest_Launcher},
-    { CRASH_X64CFI_UNKNOWN_OPCODE, x64CrashCFITest_UnknownOpcode},
-    { CRASH_X64CFI_PUSH_NONVOL, x64CrashCFITest_PUSH_NONVOL},
-    { CRASH_X64CFI_ALLOC_SMALL, x64CrashCFITest_ALLOC_SMALL },
-    { CRASH_X64CFI_ALLOC_LARGE, x64CrashCFITest_ALLOC_LARGE },
-    { CRASH_X64CFI_SAVE_NONVOL, x64CrashCFITest_SAVE_NONVOL },
-    { CRASH_X64CFI_SAVE_NONVOL_FAR, x64CrashCFITest_SAVE_NONVOL_FAR },
-    { CRASH_X64CFI_SAVE_XMM128, x64CrashCFITest_SAVE_XMM128 },
-    { CRASH_X64CFI_SAVE_XMM128_FAR, x64CrashCFITest_SAVE_XMM128_FAR },
-    { CRASH_X64CFI_EPILOG, x64CrashCFITest_EPILOG },
-    { CRASH_X64CFI_EOF, x64CrashCFITest_EOF }
-  };
-  // ret values point to jump table entries, not the actual function bodies.
-  // Get the correct pointer by calling the function with returnpfn=1
-  for (auto it = ret.begin(); it != ret.end(); ++ it) {
-    it->second = (win64CFITestFnPtr_t)it->second(1, nullptr);
-  }
-  return ret;
-}
-
-void ReserveStack() {
-  // This ensures our tests have enough reserved stack space.
-  uint8_t* p = (uint8_t*)alloca(1024000);
-  // This ensures we don't optimized away this meaningless code at build time.
-  mozilla::Unused << (int)(uint64_t)p;
-}
-
-#endif // XP_WIN && HAVE_64BIT_BUILD
 
 extern "C" NS_EXPORT
 void Crash(int16_t how)
 {
   switch (how) {
   case CRASH_INVALID_POINTER_DEREF: {
     volatile int* foo = (int*)0x42;
     *foo = 0;
@@ -147,37 +79,16 @@ void Crash(int16_t how)
   case CRASH_ABORT: {
     abort();
     break;
   }
   case CRASH_UNCAUGHT_EXCEPTION: {
     ThrowException();
     break;
   }
-#if XP_WIN && HAVE_64BIT_BUILD
-  case CRASH_X64CFI_UNKNOWN_OPCODE:
-  case CRASH_X64CFI_PUSH_NONVOL:
-  case CRASH_X64CFI_ALLOC_SMALL:
-  case CRASH_X64CFI_ALLOC_LARGE:
-  case CRASH_X64CFI_SAVE_NONVOL:
-  case CRASH_X64CFI_SAVE_NONVOL_FAR:
-  case CRASH_X64CFI_SAVE_XMM128:
-  case CRASH_X64CFI_SAVE_XMM128_FAR:
-  case CRASH_X64CFI_EPILOG: {
-    ReserveStack();
-    auto m = GetWin64CFITestMap();
-    if (m.find(how) == m.end()) {
-      break;
-    }
-    auto pfnTest = m[how];
-    auto pfnLauncher = m[CRASH_X64CFI_LAUNCHER];
-    pfnLauncher(0, pfnTest);
-    break;
-  }
-#endif // XP_WIN && HAVE_64BIT_BUILD
   default:
     break;
   }
 }
 
 char testData[32];
 
 extern "C" NS_EXPORT
@@ -203,25 +114,8 @@ static LONG WINAPI HandleException(EXCEP
 }
 
 extern "C" NS_EXPORT
 void TryOverrideExceptionHandler()
 {
   SetUnhandledExceptionFilter(HandleException);
 }
 #endif
-
-extern "C" NS_EXPORT uint32_t
-GetWin64CFITestFnAddrOffset(int16_t fnid) {
-#if XP_WIN && HAVE_64BIT_BUILD
-  // fnid uses the same constants as Crash().
-  // Returns the RVA of the requested function.
-  // Returns 0 on failure.
-  auto m = GetWin64CFITestMap();
-  if (m.find(fnid) == m.end()) {
-    return 0;
-  }
-  uint64_t moduleBase = (uint64_t)GetModuleHandleW(L"testcrasher.dll");
-  return ((uint64_t)m[fnid]) - moduleBase;
-#else
-  return 0;
-#endif // XP_WIN && HAVE_64BIT_BUILD
-}
--- a/toolkit/crashreporter/test/unit/head_crashreporter.js
+++ b/toolkit/crashreporter/test/unit/head_crashreporter.js
@@ -1,14 +1,13 @@
-var {utils: Cu, classes: Cc, interfaces: Ci} = Components;
+var {utils: Cu} = Components;
 
 Cu.import("resource://gre/modules/osfile.jsm");
 Cu.import("resource://gre/modules/Services.jsm", this);
 Cu.import("resource://testing-common/AppData.jsm", this);
-Cu.import("resource://gre/modules/AppConstants.jsm");
 
 function getEventDir() {
   return OS.Path.join(do_get_tempdir().path, "crash-events");
 }
 
 /*
  * Run an xpcshell subprocess and crash it.
  *
@@ -20,27 +19,25 @@ function getEventDir() {
  *        This code will be evaluted between crasher_subprocess_head.js
  *        and crasher_subprocess_tail.js, so it will have access
  *        to everything defined in crasher_subprocess_head.js,
  *        which includes "crashReporter", a variable holding
  *        the crash reporter service.
  *
  * @param callback
  *        A JavaScript function to be called after the subprocess
- *        crashes. It will be passed (minidump, extra, extrafile), where
- *         - minidump is an nsIFile of the minidump file produced,
- *         - extra is an object containing the key,value pairs from
- *           the .extra file.
- *         - extrafile is an nsIFile of the extra file
+ *        crashes. It will be passed (minidump, extra), where
+ *         minidump is an nsIFile of the minidump file produced,
+ *         and extra is an object containing the key,value pairs from
+ *         the .extra file.
  *
  * @param canReturnZero
  *       If true, the subprocess may return with a zero exit code.
  *       Certain types of crashes may not cause the process to
  *       exit with an error.
- *
  */
 function do_crash(setup, callback, canReturnZero) {
   // get current process filename (xpcshell)
   let ds = Components.classes["@mozilla.org/file/directory_service;1"]
     .getService(Components.interfaces.nsIProperties);
   let bin = ds.get("XREExeF", Components.interfaces.nsIFile);
   if (!bin.exists()) {
     // weird, can't find xpcshell binary?
@@ -98,42 +95,16 @@ function getMinidump() {
     if (f.leafName.substr(-4) == ".dmp") {
       return f;
     }
   }
 
   return null;
 }
 
-function runMinidumpAnalyzer(dumpFile, additionalArgs) {
-  if (AppConstants.platform !== "win") {
-    return;
-  }
-
-  // find minidump-analyzer executable.
-  let ds = Cc["@mozilla.org/file/directory_service;1"]
-             .getService(Ci.nsIProperties);
-  let bin = ds.get("XREExeF", Ci.nsIFile);
-  ok(bin && bin.exists());
-  bin = bin.parent;
-  ok(bin && bin.exists());
-  bin.append("minidump-analyzer.exe");
-  ok(bin.exists());
-
-  let process = Cc["@mozilla.org/process/util;1"]
-                  .createInstance(Ci.nsIProcess);
-  process.init(bin);
-  let args = [];
-  if (additionalArgs) {
-    args = args.concat(additionalArgs);
-  }
-  args.push(dumpFile.path);
-  process.run(true /* blocking */, args, args.length);
-}
-
 function handleMinidump(callback) {
   // find minidump
   let minidump = getMinidump();
 
   if (minidump == null) {
     do_throw("No minidump found!");
   }
 
@@ -155,17 +126,17 @@ function handleMinidump(callback) {
       memoryfile.remove(false);
     }
   });
 
   do_check_true(extrafile.exists());
   let extra = parseKeyValuePairsFromFile(extrafile);
 
   if (callback) {
-    callback(minidump, extra, extrafile);
+    callback(minidump, extra);
   }
 
   if (minidump.exists()) {
     minidump.remove(false);
   }
   if (extrafile.exists()) {
     extrafile.remove(false);
   }
deleted file mode 100644
--- a/toolkit/crashreporter/test/unit/head_win64cfi.js
+++ /dev/null
@@ -1,193 +0,0 @@
-/* import-globals-from head_crashreporter.js */
-
-let gTestCrasherSyms = null;
-let gModules = null;
-
-// Returns the offset (int) of an IP with a given base address.
-// This is effectively (ip - base), except a bit more complication due to
-// Javascript's shaky handling of 64-bit integers.
-// base & ip are passed as hex strings.
-function getModuleOffset(base, ip) {
-  let i = 0;
-  // Find where the two addresses diverge, which enables us to perform a 32-bit
-  // subtraction.
-  // e.g.    "0x1111111111112222"
-  //       - "0x1111111111111111"
-  // becomes 2222 - 1111
-  for (; i < base.length; ++i) {
-    if (base[i] != ip[i]) {
-      break;
-    }
-  }
-  if (i == base.length) {
-    return 0;
-  }
-  let lhs2 = "0x" + base.substring(i);
-  let rhs2 = "0x" + ip.substring(i);
-  return parseInt(rhs2) - parseInt(lhs2);
-}
-
-// Uses gTestCrasherSyms to convert an address to a symbol.
-function findNearestTestCrasherSymbol(addr) {
-  addr += 1; // Breakpad sometimes offsets addresses; correct for this.
-  let closestDistance = null;
-  let closestSym = null;
-  for (let sym in gTestCrasherSyms) {
-    if (addr >= gTestCrasherSyms[sym]) {
-      let thisDistance = addr - gTestCrasherSyms[sym];
-      if (closestDistance === null || thisDistance < closestDistance) {
-        closestDistance = thisDistance;
-        closestSym = sym;
-      }
-    }
-  }
-  if (closestSym === null) {
-    return null;
-  }
-  return { symbol: closestSym, offset: closestDistance }
-}
-
-// Populate known symbols for testcrasher.dll.
-// Use the same prop names as from CrashTestUtils to avoid the need for mapping.
-function initTestCrasherSymbols() {
-  gTestCrasherSyms = { };
-  for (let k in CrashTestUtils) {
-    // Not all keys here are valid symbol names. getWin64CFITestFnAddrOffset
-    // will return 0 in those cases, no need to filter here.
-    if (Number.isInteger(CrashTestUtils[k])) {
-      let t = CrashTestUtils.getWin64CFITestFnAddrOffset(CrashTestUtils[k]);
-      if (t > 0) {
-        gTestCrasherSyms[k] = t;
-      }
-    }
-  }
-}
-
-function stackFrameToString(frameIndex, frame) {
-  // Calculate the module offset.
-  let ip = frame.ip;
-  let symbol = "";
-  let moduleOffset = "unknown_offset";
-  let filename = "unknown_module";
-
-  if (typeof frame.module_index !== "undefined" && (frame.module_index >= 0)
-    && (frame.module_index < gModules.length)) {
-
-    let base = gModules[frame.module_index].base_addr;
-    moduleOffset = getModuleOffset(base, ip);
-    filename = gModules[frame.module_index].filename;
-
-    if (filename === "testcrasher.dll") {
-      let nearestSym = findNearestTestCrasherSymbol(moduleOffset);
-      if (nearestSym !== null) {
-        symbol = nearestSym.symbol + "+" + nearestSym.offset.toString(16);
-      }
-    }
-  }
-
-  let ret = "frames[" + frameIndex + "] ip=" + ip +
-    " " + symbol +
-    ", module:" + filename +
-    ", trust:" + frame.trust +
-    ", moduleOffset:" + moduleOffset.toString(16);
-  return ret;
-}
-
-function dumpStackFrames(frames, maxFrames) {
-  for (let i = 0; i < Math.min(maxFrames, frames.length); ++i) {
-    do_print(stackFrameToString(i, frames[i]));
-  }
-}
-
-// Test that the top of the given stack (from extra data) matches the given
-// expected frames.
-//
-// expected is { symbol: "", trust: "" }
-function assertStack(stack, expected) {
-  for (let i = 0; i < stack.length; ++i) {
-    if (i >= expected.length) {
-      ok("Top stack frames were expected");
-      return;
-    }
-    let frame = stack[i];
-    let expectedFrame = expected[i];
-    let dumpThisFrame = function() {
-      do_print("  Actual frame: " + stackFrameToString(i, frame));
-      do_print("Expected { symbol: " + expectedFrame.symbol + ", trust: " + expectedFrame.trust + "}");
-    };
-
-    if (expectedFrame.trust) {
-      if (frame.trust !== expectedFrame.trust) {
-        dumpThisFrame();
-        do_print("Expected frame trust did not match.");
-        ok(false);
-      }
-    }
-
-    if (expectedFrame.symbol) {
-      if (typeof frame.module_index === "undefined") {
-        // Without a module_index, it happened in an unknown module. Currently
-        // you can't specify an expected "unknown" module.
-        do_print("Unknown symbol in unknown module.");
-        ok(false);
-      }
-      if (frame.module_index < 0 || frame.module_index >= gModules.length) {
-        dumpThisFrame();
-        do_print("Unknown module.");
-        ok(false);
-        return;
-      }
-      let base = gModules[frame.module_index].base_addr;
-      let moduleOffset = getModuleOffset(base, frame.ip);
-      let filename = gModules[frame.module_index].filename;
-      if (filename == "testcrasher.dll") {
-        let nearestSym = findNearestTestCrasherSymbol(moduleOffset);
-        if (nearestSym === null) {
-          dumpThisFrame();
-          do_print("Unknown symbol.");
-          ok(false);
-          return;
-        }
-
-        if (nearestSym.symbol !== expectedFrame.symbol) {
-          dumpThisFrame();
-          do_print("Mismatching symbol.");
-          ok(false);
-        }
-      }
-    }
-  }
-}
-
-// Performs a crash, runs minidump-analyzer, and checks expected stack analysis.
-//
-// how: The crash to perform. Constants defined in both CrashTestUtils.jsm
-//   and nsTestCrasher.cpp (i.e. CRASH_X64CFI_PUSH_NONVOL)
-// expectedStack: An array of {"symbol", "trust"} where trust is "cfi",
-//   "context", "scan", et al. May be null if you don't need to check the stack.
-// minidumpAnalyzerArgs: An array of additional arguments to pass to
-//   minidump-analyzer.exe.
-function do_x64CFITest(how, expectedStack, minidumpAnalyzerArgs) {
-
-  // Setup is run in the subprocess so we cannot use any closures.
-  let setupFn = "crashType = CrashTestUtils." + how + ";";
-
-  let callbackFn = function(minidumpFile, extra, extraFile) {
-    runMinidumpAnalyzer(minidumpFile, minidumpAnalyzerArgs);
-
-    // Refresh updated extra data
-    extra = parseKeyValuePairsFromFile(extraFile);
-
-    initTestCrasherSymbols();
-    let stackTraces = JSON.parse(extra.StackTraces);
-    let crashingThreadIndex = stackTraces.crash_info.crashing_thread;
-    gModules = stackTraces.modules;
-    let crashingFrames = stackTraces.threads[crashingThreadIndex].frames;
-
-    dumpStackFrames(crashingFrames, 10);
-
-    assertStack(crashingFrames, expectedStack);
-  };
-
-  do_crash(setupFn, callbackFn, true, true);
-}
deleted file mode 100644
--- a/toolkit/crashreporter/test/unit/test_crash_win64cfi_alloc_large.js
+++ /dev/null
@@ -1,7 +0,0 @@
-
-function run_test() {
-  do_x64CFITest("CRASH_X64CFI_ALLOC_LARGE", [
-      { symbol: "CRASH_X64CFI_ALLOC_LARGE", trust: "context" },
-      { symbol: "CRASH_X64CFI_LAUNCHER", trust: "cfi" }
-    ]);
-}
deleted file mode 100644
--- a/toolkit/crashreporter/test/unit/test_crash_win64cfi_alloc_small.js
+++ /dev/null
@@ -1,7 +0,0 @@
-
-function run_test() {
-  do_x64CFITest("CRASH_X64CFI_ALLOC_SMALL", [
-      { symbol: "CRASH_X64CFI_ALLOC_SMALL", trust: "context" },
-      { symbol: "CRASH_X64CFI_LAUNCHER", trust: "cfi" }
-    ]);
-}
deleted file mode 100644
--- a/toolkit/crashreporter/test/unit/test_crash_win64cfi_epilog.js
+++ /dev/null
@@ -1,7 +0,0 @@
-
-function run_test() {
-  do_x64CFITest("CRASH_X64CFI_EPILOG", [
-      { symbol: "CRASH_X64CFI_EPILOG", trust: "context" },
-      { symbol: "CRASH_X64CFI_LAUNCHER", trust: "cfi" }
-    ]);
-}
deleted file mode 100644
index 5283cc5df7e0a7abb20dd540cc203c4266702fff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/toolkit/crashreporter/test/unit/test_crash_win64cfi_infinite_code_chain.js
+++ /dev/null
@@ -1,17 +0,0 @@
-
-function run_test() {
-  // Test that minidump-analyzer gracefully handles chained
-  // unwind code entries that form a circular reference
-  // (infinite loop).
-  let exe = do_get_file("test_crash_win64cfi_infinite_code_chain.exe");
-  ok(exe);
-
-  // Perform a crash. We won't get unwind info, but make sure the stack scan
-  // still works.
-  do_x64CFITest("CRASH_X64CFI_ALLOC_SMALL",
-    [
-      { symbol: "CRASH_X64CFI_ALLOC_SMALL", trust: "context" },
-      { symbol: "CRASH_X64CFI_NO_MANS_LAND", trust: null }
-    ],
-    ["--force-use-module", exe.path]);
-}
deleted file mode 100644
index de48576f6536cc6895f23297752690da1a694a10..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/toolkit/crashreporter/test/unit/test_crash_win64cfi_infinite_entry_chain.js
+++ /dev/null
@@ -1,17 +0,0 @@
-
-function run_test() {
-  // Test that minidump-analyzer gracefully handles chained
-  // IMAGE_RUNTIME_FUNCTION_ENTRY items that form a circular reference
-  // (infinite loop).
-  let exe = do_get_file("test_crash_win64cfi_infinite_entry_chain.exe");
-  ok(exe);
-
-  // Perform a crash. We won't get unwind info, but make sure the stack scan
-  // still works.
-  do_x64CFITest("CRASH_X64CFI_ALLOC_SMALL",
-    [
-      { symbol: "CRASH_X64CFI_ALLOC_SMALL", trust: "context" },
-      { symbol: "CRASH_X64CFI_NO_MANS_LAND", trust: null }
-    ],
-    ["--force-use-module", exe.path]);
-}
deleted file mode 100644
index ab4ce326bdf34b9e417107d2d22adb3d01b006ee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/toolkit/crashreporter/test/unit/test_crash_win64cfi_invalid_exception_rva.js
+++ /dev/null
@@ -1,16 +0,0 @@
-
-function run_test() {
-  // Test that minidump-analyzer gracefully handles an invalid pointer to the
-  // exception unwind information.
-  let exe = do_get_file("test_crash_win64cfi_invalid_exception_rva.exe");
-  ok(exe);
-
-  // Perform a crash. We won't get unwind info, but make sure the stack scan
-  // still works.
-  do_x64CFITest("CRASH_X64CFI_ALLOC_SMALL",
-    [
-      { symbol: "CRASH_X64CFI_ALLOC_SMALL", trust: "context" },
-      { symbol: "CRASH_X64CFI_NO_MANS_LAND", trust: null }
-    ],
-    ["--force-use-module", exe.path]);
-}
deleted file mode 100644
--- a/toolkit/crashreporter/test/unit/test_crash_win64cfi_not_a_pe.exe
+++ /dev/null
@@ -1,1 +0,0 @@
-this is not a valid PE file.
\ No newline at end of file
deleted file mode 100644
--- a/toolkit/crashreporter/test/unit/test_crash_win64cfi_not_a_pe.js
+++ /dev/null
@@ -1,15 +0,0 @@
-
-function run_test() {
-  // Test that minidump-analyzer gracefully handles corrupt PE files.
-  let exe = do_get_file("test_crash_win64cfi_not_a_pe.exe");
-  ok(exe);
-
-  // Perform a crash. We won't get unwind info, but make sure the stack scan
-  // still works.
-  do_x64CFITest("CRASH_X64CFI_ALLOC_SMALL",
-    [
-      { symbol: "CRASH_X64CFI_ALLOC_SMALL", trust: "context" },
-      { symbol: "CRASH_X64CFI_NO_MANS_LAND", trust: null }
-    ],
-    ["--force-use-module", exe.path]);
-}
deleted file mode 100644
--- a/toolkit/crashreporter/test/unit/test_crash_win64cfi_push_nonvol.js
+++ /dev/null
@@ -1,7 +0,0 @@
-
-function run_test() {
-  do_x64CFITest("CRASH_X64CFI_PUSH_NONVOL", [
-      { symbol: "CRASH_X64CFI_PUSH_NONVOL", trust: "context" },
-      { symbol: "CRASH_X64CFI_LAUNCHER", trust: "cfi" }
-    ]);
-}
deleted file mode 100644
--- a/toolkit/crashreporter/test/unit/test_crash_win64cfi_save_nonvol.js
+++ /dev/null
@@ -1,7 +0,0 @@
-
-function run_test() {
-  do_x64CFITest("CRASH_X64CFI_SAVE_NONVOL", [
-      { symbol: "CRASH_X64CFI_SAVE_NONVOL", trust: "context" },
-      { symbol: "CRASH_X64CFI_LAUNCHER", trust: "cfi" }
-    ]);
-}
deleted file mode 100644
--- a/toolkit/crashreporter/test/unit/test_crash_win64cfi_save_nonvol_far.js
+++ /dev/null
@@ -1,7 +0,0 @@
-
-function run_test() {
-  do_x64CFITest("CRASH_X64CFI_SAVE_NONVOL_FAR", [
-      { symbol: "CRASH_X64CFI_SAVE_NONVOL_FAR", trust: "context" },
-      { symbol: "CRASH_X64CFI_LAUNCHER", trust: "cfi" }
-    ]);
-}
deleted file mode 100644
--- a/toolkit/crashreporter/test/unit/test_crash_win64cfi_save_xmm128.js
+++ /dev/null
@@ -1,7 +0,0 @@
-
-function run_test() {
-  do_x64CFITest("CRASH_X64CFI_SAVE_XMM128", [
-      { symbol: "CRASH_X64CFI_SAVE_XMM128", trust: "context" },
-      { symbol: "CRASH_X64CFI_LAUNCHER", trust: "cfi" }
-    ]);
-}
deleted file mode 100644
--- a/toolkit/crashreporter/test/unit/test_crash_win64cfi_save_xmm128_far.js
+++ /dev/null
@@ -1,7 +0,0 @@
-
-function run_test() {
-  do_x64CFITest("CRASH_X64CFI_SAVE_XMM128_FAR", [
-      { symbol: "CRASH_X64CFI_SAVE_XMM128_FAR", trust: "context" },
-      { symbol: "CRASH_X64CFI_LAUNCHER", trust: "cfi" }
-    ]);
-}
deleted file mode 100644
--- a/toolkit/crashreporter/test/unit/test_crash_win64cfi_unknown_op.js
+++ /dev/null
@@ -1,13 +0,0 @@
-
-function run_test() {
-  // In the case of an unknown unwind code or missing CFI,
-  // make certain we can still walk the stack via stack scan. The crashing
-  // function places NO_MANS_LAND on the stack so it will get picked up via
-  // stack scan.
-  do_x64CFITest("CRASH_X64CFI_UNKNOWN_OPCODE", [
-      { symbol: "CRASH_X64CFI_UNKNOWN_OPCODE", trust: "context" },
-      // Trust may either be scan or frame_pointer; we don't really care as
-      // long as the address is expected.
-      { symbol: "CRASH_X64CFI_NO_MANS_LAND", trust: null }
-    ]);
-}
--- a/toolkit/crashreporter/test/unit/xpcshell.ini
+++ b/toolkit/crashreporter/test/unit/xpcshell.ini
@@ -32,70 +32,8 @@ skip-if = os != 'win'
 
 [test_crashreporter_appmem.js]
 # we need to skip this due to bug 838613
 skip-if = (os != 'win' && os != 'linux') || (os=='linux' && bits==32)
 
 [test_crash_AsyncShutdown.js]
 [test_event_files.js]
 [test_crash_terminator.js]
-
-[test_crash_win64cfi_unknown_op.js]
-head = head_crashreporter.js head_win64cfi.js
-skip-if = os != 'win' || bits != 64
-
-[test_crash_win64cfi_push_nonvol.js]
-head = head_crashreporter.js head_win64cfi.js
-skip-if = os != 'win' || bits != 64
-
-[test_crash_win64cfi_alloc_small.js]
-head = head_crashreporter.js head_win64cfi.js
-skip-if = os != 'win' || bits != 64
-
-[test_crash_win64cfi_alloc_large.js]
-head = head_crashreporter.js head_win64cfi.js
-skip-if = os != 'win' || bits != 64
-
-[test_crash_win64cfi_save_nonvol.js]
-head = head_crashreporter.js head_win64cfi.js
-skip-if = os != 'win' || bits != 64
-
-[test_crash_win64cfi_save_nonvol_far.js]
-head = head_crashreporter.js head_win64cfi.js
-skip-if = os != 'win' || bits != 64
-
-[test_crash_win64cfi_save_xmm128.js]
-head = head_crashreporter.js head_win64cfi.js
-skip-if = os != 'win' || bits != 64
-
-[test_crash_win64cfi_save_xmm128_far.js]
-head = head_crashreporter.js head_win64cfi.js
-skip-if = os != 'win' || bits != 64
-
-[test_crash_win64cfi_epilog.js]
-head = head_crashreporter.js head_win64cfi.js
-skip-if = os != 'win' || bits != 64
-
-[test_crash_win64cfi_infinite_entry_chain.js]
-head = head_crashreporter.js head_win64cfi.js
-skip-if = os != 'win' || bits != 64
-support-files = test_crash_win64cfi_infinite_entry_chain.exe
-
-[test_crash_win64cfi_infinite_code_chain.js]
-head = head_crashreporter.js head_win64cfi.js
-skip-if = os != 'win' || bits != 64
-support-files = test_crash_win64cfi_infinite_code_chain.exe
-
-[test_crash_win64cfi_invalid_exception_rva.js]
-head = head_crashreporter.js head_win64cfi.js
-skip-if = os != 'win' || bits != 64
-support-files = test_crash_win64cfi_invalid_exception_rva.exe
-
-[test_crash_win64cfi_not_a_pe.js]
-head = head_crashreporter.js head_win64cfi.js
-skip-if = os != 'win' || bits != 64
-support-files = test_crash_win64cfi_not_a_pe.exe
-
-
-
-
-
-
deleted file mode 100644
--- a/toolkit/crashreporter/test/win64UnwindInfoTests.asm
+++ /dev/null
@@ -1,382 +0,0 @@
-; This Source Code Form is subject to the terms of the Mozilla Public
-; License, v. 2.0. If a copy of the MPL was not distributed with this
-; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-; Comments indicate stack memory layout during execution.
-; For example at the top of a function, where RIP just points to the return
-; address, the stack looks like
-; rip = [ra]
-; And after pushing rax to the stack,
-; rip = [rax][ra]
-; And then, after allocating 20h bytes on the stack,
-; rip = [..20..][rax][ra]
-; And then, after pushing a function pointer,
-; rip = [pfn][..20..][rax][ra]
-
-include ksamd64.inc
-
-.code
-
-; It helps to add padding between functions so they're not right up against
-; each other. Adds clarity to debugging, and gives a bit of leeway when
-; searching for symbols (e.g. a function whose last instruction is CALL
-; would push a return address that's in the next function.)
-PaddingBetweenFunctions macro
-  repeat 10h
-     int 3
-  endm
-endm
-
-DoCrash macro
-  mov rax, 7
-  mov byte ptr [rax], 9
-endm
-
-PaddingBetweenFunctions
-
-; There is no rip addressing mode in x64. The only way to get the value
-; of rip is to call a function, and pop it from the stack.
-WhoCalledMe proc
-  pop rax ; rax is now ra
-  push rax ; Restore ra so this function can return.
-  sub rax, 5 ; Correct for the size of the call instruction
-  ret
-WhoCalledMe endp
-
-PaddingBetweenFunctions
-
-; Any function that we expect to test against on the stack, we'll need its
-; real address. If we use function pointers in C, we'll get the address to jump
-; table entries. This bit of code at the beginning of each function will
-; return the real address we'd expect to see in stack traces.
-;
-; rcx (1st arg) = mode
-; rax (return)  = address of either NO_MANS_LAND or this function.
-;
-; When mode is 0, we place the address of NO_MANS_LAND in RAX, for the function
-; to use as it wants. This is just for convenience because almost all functions
-; here need this address at some point.
-;
-; When mode is 1, the address of this function is returned.
-TestHeader macro
-  call WhoCalledMe
-  test rcx, rcx
-  je continue_test
-  ret
-continue_test:
-  inc rcx
-  call x64CrashCFITest_NO_MANS_LAND
-  xor rcx, rcx
-endm
-
-; The point of this is to add a stack frame to test against.
-; void* x64CrashCFITest_Launcher(int getAddress, void* pTestFn)
-x64CrashCFITest_Launcher proc frame
-  TestHeader
-
-  .endprolog
-  call rdx
-  ret
-x64CrashCFITest_Launcher endp
-
-PaddingBetweenFunctions
-
-; void* x64CrashCFITest_NO_MANS_LAND(uint64_t mode);
-; Not meant to be called. Only when mode = 1 in order to return its address.
-; Place this function's address on the stack so the stack scanning algorithm
-; thinks this is a return address, and places it on the stack trace.
-x64CrashCFITest_NO_MANS_LAND proc frame
-  TestHeader
-  .endprolog
-  ret
-x64CrashCFITest_NO_MANS_LAND endp
-
-PaddingBetweenFunctions
-
-; Test that we:
-; - handle unknown opcodes gracefully
-; - fall back to other stack unwind strategies if CFI doesn't work
-;
-; In order to properly unwind this frame, we'd need to fully support
-; SET_FPREG with offsets, plus restoring registers via PUSH_NONVOL.
-; To do this, sprinkle the stack with bad return addresses
-; and stack pointers.
-x64CrashCFITest_UnknownOpcode proc frame
-  TestHeader
-
-  push rax
-  .allocstack 8
-
-  push rbp
-  .pushreg rbp
-
-  push rax
-  push rsp
-  push rax
-  push rsp
-  .allocstack 20h
-  ; rsp = [rsp][pfn][rsp][pfn][rbp][pfn][ra]
-
-  lea rbp, [rsp+10h]
-  .setframe rbp, 10h
-  ; rsp = [rsp][pfn] [rsp][pfn][rbp][pfn][ra]
-  ; rbp =           ^
-
-  .endprolog
-
-  ; Now modify RSP so measuring stack size from unwind ops will not help
-  ; finding the return address.
-  push rax
-  push rsp
-  ; rsp = [rsp][pfn][rsp][pfn] [rsp][pfn][rbp][pfn][ra]
-
-  DoCrash
-
-x64CrashCFITest_UnknownOpcode endp
-
-PaddingBetweenFunctions
-
-; void* x64CrashCFITest_PUSH_NONVOL(uint64_t mode);
-;
-; Test correct handling of PUSH_NONVOL unwind code.
-;
-x64CrashCFITest_PUSH_NONVOL proc frame
-  TestHeader
-
-  push r10
-  .pushreg r10
-  push r15
-  .pushreg r15
-  push rbx
-  .pushreg rbx
-  push rsi
-  .pushreg rsi
-  push rbp
-  .pushreg rbp
-  ; rsp = [rbp][rsi][rbx][r15][r10][ra]
-
-  push rax
-  .allocstack 8
-  ; rsp = [pfn][rbp][rsi][rbx][r15][r10][ra]
-
-  .endprolog
-
-  DoCrash
-
-x64CrashCFITest_PUSH_NONVOL endp
-
-PaddingBetweenFunctions
-
-; void* x64CrashCFITest_ALLOC_SMALL(uint64_t mode);
-;
-; Small allocations are between 8bytes and 512kb-8bytes
-;
-x64CrashCFITest_ALLOC_SMALL proc frame
-  TestHeader
-
-  ; Trash rbp to force stack scan. This will force
-  ; correct behavior for test_crash_win64cfi_not_a_pe, et al.
-  xor rbp, rbp
-
-  push rax
-  push rax
-  push rax
-  push rax
-  .allocstack 20h
-  ; rsp = [pfn][pfn][pfn][pfn][ra]
-
-  .endprolog
-
-  DoCrash
-
-x64CrashCFITest_ALLOC_SMALL endp
-
-PaddingBetweenFunctions
-
-; void* x64CrashCFITest_ALLOC_LARGE(uint64_t mode);
-;
-; Allocations between 512kb and 4gb
-; Note: ReserveStackSpace() in nsTestCrasher.cpp pre-allocates stack
-; space for this.
-x64CrashCFITest_ALLOC_LARGE proc frame
-  TestHeader
-
-  sub rsp, 0a000h
-  .allocstack 0a000h
-  ; rsp = [..640kb..][ra]
-
-  mov qword ptr [rsp], rax
-  ; rsp = [pfn][..640kb-8..][ra]
-
-  .endprolog
-
-  DoCrash
-
-x64CrashCFITest_ALLOC_LARGE endp
-
-PaddingBetweenFunctions
-
-; void* x64CrashCFITest_SAVE_NONVOL(uint64_t mode);
-;
-; Test correct handling of SAVE_NONVOL unwind code.
-;
-x64CrashCFITest_SAVE_NONVOL proc frame
-  TestHeader
-
-  sub rsp, 30h
-  .allocstack 30h
-  ; rsp = [..30..][ra]
-
-  mov qword ptr [rsp+28h], r10
-  .savereg r10, 28h
-  mov qword ptr [rsp+20h], rbp
-  .savereg rbp, 20h
-  mov qword ptr [rsp+18h], rsi
-  .savereg rsi, 18h
-  mov qword ptr [rsp+10h], rbx
-  .savereg rbx, 10h
-  mov qword ptr [rsp+8], r15
-  .savereg r15, 8
-  ; rsp = [r15][rbx][rsi][rbp][r10][ra]
-
-  mov qword ptr [rsp], rax
-
-  ; rsp = [pfn][r15][rbx][rsi][rbp][r10][ra]
-
-  .endprolog
-
-  DoCrash
-
-x64CrashCFITest_SAVE_NONVOL endp
-
-PaddingBetweenFunctions
-
-; void* x64CrashCFITest_SAVE_NONVOL_FAR(uint64_t mode);
-;
-; Similar to the test above but adding 640kb to most offsets.
-; Note: ReserveStackSpace() in nsTestCrasher.cpp pre-allocates stack
-; space for this.
-x64CrashCFITest_SAVE_NONVOL_FAR proc frame
-  TestHeader
-
-  sub rsp, 0a0030h
-  .allocstack 0a0030h
-  ; rsp = [..640k..][..30..][ra]
-
-  mov qword ptr [rsp+28h+0a0000h], r10
-  .savereg r10, 28h+0a0000h
-  mov qword ptr [rsp+20h+0a0000h], rbp
-  .savereg rbp, 20h+0a0000h
-  mov qword ptr [rsp+18h+0a0000h], rsi
-  .savereg rsi, 18h+0a0000h
-  mov qword ptr [rsp+10h+0a0000h], rbx
-  .savereg rbx, 10h+0a0000h
-  mov qword ptr [rsp+8+0a0000h], r15
-  .savereg r15, 8+0a0000h
-  ; rsp = [..640k..][..8..][r15][rbx][rsi][rbp][r10][ra]
-
-  mov qword ptr [rsp], rax
-
-  ; rsp = [pfn][..640k..][r15][rbx][rsi][rbp][r10][ra]
-
-  .endprolog
-
-  DoCrash
-
-x64CrashCFITest_SAVE_NONVOL_FAR endp
-
-PaddingBetweenFunctions
-
-; void* x64CrashCFITest_SAVE_XMM128(uint64_t mode);
-;
-; Test correct handling of SAVE_XMM128 unwind code.
-x64CrashCFITest_SAVE_XMM128 proc frame
-  TestHeader
-
-  sub rsp, 30h
-  .allocstack 30h
-  ; rsp = [..30..][ra]
-
-  movdqu [rsp+20h], xmm6
-  .savexmm128 xmm6, 20h
-  ; rsp = [..20..][xmm6][ra]
-
-  movdqu [rsp+10h], xmm15
-  .savexmm128 xmm15, 10h
-  ; rsp = [..10..][xmm15][xmm6][ra]
-
-  mov qword ptr [rsp], rax
-  ; rsp = [pfn][..8..][xmm15][xmm6][ra]
-
-  .endprolog
-
-  DoCrash
-
-x64CrashCFITest_SAVE_XMM128 endp
-
-PaddingBetweenFunctions
-
-; void* x64CrashCFITest_SAVE_XMM128(uint64_t mode);
-;
-; Similar to the test above but adding 640kb to most offsets.
-; Note: ReserveStackSpace() in nsTestCrasher.cpp pre-allocates stack
-; space for this.
-x64CrashCFITest_SAVE_XMM128_FAR proc frame
-  TestHeader
-
-  sub rsp, 0a0030h
-  .allocstack 0a0030h
-  ; rsp = [..640kb..][..30..][ra]
-
-  movdqu [rsp+20h+0a0000h], xmm6
-  .savexmm128 xmm6, 20h+0a0000h
-  ; rsp = [..640kb..][..20..][xmm6][ra]
-
-  movdqu [rsp+10h+0a0000h], xmm6
-  .savexmm128 xmm15, 10h+0a0000h
-  ; rsp = [..640kb..][..10..][xmm15][xmm6][ra]
-
-  mov qword ptr [rsp], rax
-  ; rsp = [pfn][..640kb..][..8..][xmm15][xmm6][ra]
-
-  .endprolog
-
-  DoCrash
-
-x64CrashCFITest_SAVE_XMM128_FAR endp
-
-PaddingBetweenFunctions
-
-; void* x64CrashCFITest_EPILOG(uint64_t mode);
-;
-; The epilog unwind op will also set the unwind version to 2.
-; Test that we don't choke on UWOP_EPILOG or version 2 unwind info.
-x64CrashCFITest_EPILOG proc frame
-  TestHeader
-
-  push rax
-  .allocstack 8
-  ; rsp = [pfn][ra]
-
-  .endprolog
-
-  DoCrash
-
-  .beginepilog
-
-  ret
-
-x64CrashCFITest_EPILOG endp
-
-PaddingBetweenFunctions
-
-; Having an EOF symbol at the end of this file contains symbolication to this
-; file. So addresses beyond this file don't get mistakenly symbolicated as a
-; meaningful function name.
-x64CrashCFITest_EOF proc frame
-  TestHeader
-  .endprolog
-  ret
-x64CrashCFITest_EOF endp
-
-end
--- a/toolkit/mozapps/installer/upload-files-APK.mk
+++ b/toolkit/mozapps/installer/upload-files-APK.mk
@@ -89,16 +89,17 @@ package_fennec = \
 repackage_fennec = \
   $(MAKE) -C $(GECKO_APP_AP_PATH) gecko-nodeps.ap_ && \
   $(PYTHON) -m mozbuild.action.package_fennec_apk \
     --verbose \
     --inputs \
       $(UNPACKAGE) \
       $(GECKO_APP_AP_PATH)/gecko-nodeps.ap_ \
     --omnijar $(MOZ_PKG_DIR)/$(OMNIJAR_NAME) \
+    --classes-dex $(GECKO_APP_AP_PATH)/classes.dex \
     --output $(PACKAGE:.apk=-unsigned-unaligned.apk) && \
   $(call RELEASE_SIGN_ANDROID_APK,$(PACKAGE:.apk=-unsigned-unaligned.apk),$(PACKAGE))
 
 INNER_MAKE_PACKAGE = $(if $(UNPACKAGE),$(repackage_fennec),$(package_fennec))
 
 # Language repacks root the resources contained in assets/omni.ja
 # under assets/, but the repacks expect them to be rooted at /.
 # Therefore, we we move the omnijar back to / so the resources are