--- a/security/manager/ssl/IntolerantFallbackList.inc
+++ b/security/manager/ssl/IntolerantFallbackList.inc
@@ -4,27 +4,24 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 // This is an automatically generated file. If you're not
 // nsNSSIOLayer.cpp, you shouldn't be #including it.
 ///////////////////////////////////////////////////////////////////////////////
 
 static const char* const kIntolerantFallbackList[] =
 {
-  "a127-jobs.nyc.gov", // bug 1134709
   "aa.com", // bug 1141604
   "aa.com.br", // bug 1141604
   "aa.com.do", // bug 1141604
   "aa.com.pe", // bug 1141604
   "aa.com.ve", // bug 1141604
   "aacoprod.aacounty.org",
   "aavacations.com", // bug 1141604
-  "accesd.desjardins.com", // bug 1148465
   "access.boekhuis.nl", // bug 1151580
-  "access.uwstout.edu",
   "account.61.com.tw",
   "acs.sia.eu", // RC4
   "actiononline.stpete.org",
   "adman.you.gr",
   "adminweb.uthscsa.edu",
   "airportwifi.com", // bug 1116891
   "allbankonline.in", // bug 1156441
   "allyours.virginmedia.com", // bug 1129887
@@ -43,321 +40,272 @@ static const char* const kIntolerantFall
   "americanairlines.es", // bug 1141604
   "americanairlines.fr", // bug 1141604
   "americanairlines.hu", // bug 1141604
   "americanairlines.ie", // bug 1141604
   "americanairlines.in", // bug 1141604
   "americanairlines.jp", // bug 1141604
   "amss.mobilicity.ca",
   "ap.meitetsuunyu.co.jp",
-  "appgraffiti.com",
   "apply.hkbn.net", // bug 1138451
   "apps.amerch.com",
   "apps.fpcu.org",
   "apps.sasken.com",
   "apps.state.or.us", // bug 1130472
   "appsrv.restat.com",
   "ascii.jp",
-  "asiointi.hel.fi",
   "asko.fi", // bug 1158584
   "b2b.feib.com.tw",
+  "baybloorradio.com", // bug 1173661
   "beehive.miit.ru",
   "bettertrades.com",
   "bgw.wangyin.com", // bug 1145521
   "bianmin.chinapay.com", // bug 1137983
   "bigflix.com",
   "blackboard.tru.ca",
   "blastam.com",
   "blogwatcher.co.jp",
   "bonds.euronext.com", // bug 1136091
   "books.wwnorton.com", // bug 1116891
   "bredbandsbolaget.se", // bug 1158755
   "bursar.ou.edu",
   "buttons.verticalresponse.com",
   "c2g.jupiter.fl.us",
-  "cache.bankleumi.co.il", // bug 1138142
   "canadaca.geotrust.com", // bug 1137677
-  "card-data.com", // bug 1154285
-  "cas.rutgers.edu", // bug 1152465
   "cbsfnotes1.blood.org.tw",
   "central.acadiau.ca", // bug 1152377
-  "cgdonline.cgd.fr", // bug 1154716
   "cherry.de", // bug 1141521
   "civilization.com", // bug 1156004
   "click2gov.sanangelotexas.us",
   "clientes.chilectra.cl",
   "club.guosen.com.cn",
   "coagov.aurora-il.org",
   "codem.codemasters.com",
-  "compteasso.service-public.fr", // bug 1144058
-  "comptepro.service-public.fr", // bug 1144058
+  "commerce.cashnet.com", // bug 1164009
   "comune.milano.it",
-  "connexion.mon.service-public.fr", // bug 1144058
-  "consumer-prod.prescriptionsolutions.com", // bug 1141933
   "corporbank.nbcb.com.cn",
-  "create.skyword.com", // bug 1141580
   "crm.et2008.com",
   "crossroads.schneider.com",
-  "crypticstudios.com",
   "cs.tokai-tv.com",
   "cualerts.dupaco.com", // bug 1116892
   "customers.logistafrance.fr", // bug 1153951
   "cwu.edu",
   "dbank.hxb.com.cn",
   "dealer.autobytel.com",
   "dealer.autoc-one.jp",
-  "desjardins.com", // bug 1148465
-  "developer.fsmoffice.net",
   "dheb.delavska-hranilnica.si",
   "digibet.com",
   "digitalsecurity.intel.com", // bug 1148744
-  "dinsmore.fsmoffice.net",
   "dream-prize.com",
   "dwwsyw.bjgjj.gov.cn",
   "eatm.scsb.com.tw",
   "eb.bankcomm.com.hk", // bug 1141742
   "ebank-public.hzbank.com.cn",
-  "ebank.db-pbc.pl", // bug 1146281
   "ebank.hxb.com.cn",
   "ebank.hzbank.com.cn",
   "ebank.rcbcy.com", // bug 1146755
   "ebanking.ocbcwhhk.com", // bug 1141746
   "ebill2.virginmedia.com", // bug 1129887
   "ebpp.airtel.lk",
   "ebspay.boc.cn", // bug 1155567
   "ec-line.cn",
+  "ecams.geico.com", // bug 1138613
   "echo.com",
   "echotrak.com",
   "ecom.morethangourmet.com",
   "ecourses.uthscsa.edu",
   "egov.leaguecity.com",
   "egov.town-menasha.com", // bug 1157536
   "emaildvla.direct.gov.uk", // bug 1116891
   "embroiderydesignsplus.com",
   "epicreg.com",
   "eremit.sbising.com",
   "escrowrefills.com",
   "eservices.palomar.edu",
   "essentialsupplies.com",
-  "etimebanker.bankofthewest.com", // bug 1127204
   "event.kasite.net",
   "extranet.eurocontrol.int",
   "ez.cityofchesapeake.net",
   "ezpay.com.tw",
   "fallback.test", // Used by gtest
+  "fastcheck.sita.aero", // bug 1174974
   "fastlane.echo.com",
   "fhsaa.org",
+  "fibi-online.co.il", // bug 1165580
   "finance.car.com",
-  "followupfactory.fsmoffice.net",
   "friends.freshandeasy.com",
-  "fsmoffice.net",
-  "ftisystem.fsmoffice.net",
   "fubar.com",
   "gateway.halton.gov.uk",
   "gbe-bund.de",
   "geico.com", // bug 1138613
   "gestionesytramites.madrid.org",
   "giftcertificates.com",
-  "hb.posted.co.rs",
-  "hb2.bankleumi.co.il", // bug 1138142
+  "hbk.bb.com.br", // bug 1135966
   "hercle.com",
   "hpshop.gr",
   "ibusiness.shacombank.com.hk", // bug 1141989
   "identity.virginmedia.com", // bug 1129887
-  "ifueltech.fsmoffice.net",
   "ifund.allianzglobalinvestors.com.tw",
+  "ig1.i-grasp.com", // bug 1167894
+  "ig4.i-grasp.com", // bug 1167894
   "ihr.suburbanpropane.com",
   "images.bankofthewest.com", // bug 1127204
   "inside.i-med.ac.at",
   "its.bocmacau.com",
-  "ividmail.fsmoffice.net",
   "jbclick.jaxbchfl.net", // bug 1158465
   "jifenpay.com",
-  "jodunning.com",
   "jst.doded.mil", // bug 1152627
   "juror.fairfaxcounty.gov",
   "keirin.jp",
   "kjp.keinet.ne.jp",
   "kjp.oo.kawai-juku.ac.jp",
-  "kmis.brookes.ac.uk",
   "learn.ou.edu",
   "learn.swosu.edu",
-  "leatherfads.com",
   "lewisham.gov.uk",
-  "liaison.mon.service-public.fr", // bug 1144058
   "lm-order.de",
   "login.chicagopolice.org",
   "login.ermis.gov.gr",
-  "m.cacu.com",
   "m.e-hon.ne.jp",
-  "m.optumrx.com", // bug 1141933
-  "m.prescriptionsolutions.com", // bug 1141933
-  "maakoalifestyle.fsmoffice.net",
+  "macif.fr", // bug 1167893
   "mail.izhnet.ru",
   "map.infonavit.org.mx",
   "marketday.com", // bug 1092998
+  "matkahuolto.fi", // bug 1174957
   "mchrono.com",
   "mecsumai.com",
   "member.edenredticket.com",
   "mercernet.fr", // bug 1147649
   "merchant.edenredticket.com",
   "meta-ehealth.com",
   "mobile.aa.com", // bug 1141604
   "mobile.dream-prize.com",
   "mon-ulb.ulb.ac.be",
-  "mon.service-public.fr", // bug 1144058
   "my-csprd.ea.cwu.edu", // bug 1143035
   "my-csrenprd.ea.cwu.edu", // bug 1143035
   "my-fsprd.ea.cwu.edu", // bug 1143035
   "my-fsrenprd.ea.cwu.edu", // bug 1143035
   "my-fsrpt.ea.cwu.edu", // bug 1143035
   "my-hrprd.ea.cwu.edu", // bug 1143035
   "my-hrrenprd.ea.cwu.edu", // bug 1143035
   "my.cwu.edu", // bug 1143035
+  "my.if.com", // bug 1173592
   "my.kyivstar.ua",
   "my.miit.ru",
-  "my.officef5.com",
-  "my.rutgers.edu", // bug 1139065
   "myaccount.allstate.com", // bug 1143031
-  "myaccount.teksavvy.com", // bug 1144646
   "myaccount3.westnet.com.au", // bug 1157139
   "mybank.nbcb.com.cn",
   "myhancock.hancockcollege.edu",
   "myntc.ntc.edu",
-  "mysprint.sprint.com", // bug 1138211
   "myuws.uws.edu.au",
   "mywebreservations.com",
   "na.aiononline.com", // bug 1139782
   "national.virginmedia.com", // bug 1129887
   "nbank.hxb.com.cn",
   "netbanking.yesbank.co.in", // bug 1146090
   "niche.endsleigh.co.uk",
   "nmsmp.alsok.co.jp",
   "no1.nipponrentacar.co.jp",
   "obos1.obos.no",
-  "officevp.fsmoffice.net",
   "officials.fhsaa.org",
   "online.newindia.co.in",
   "online.sainsburysbank.co.uk",
   "openwebosproject.org", // bug 1151990
   "opi.emersonclimate.com",
-  "optumrx.com", // bug 1141933
   "opus.pinellascounty.org",
-  "ow2.orderwave.com",
   "owa.byui.edu",
   "ozone.ou.edu",
   "parents.ou.edu",
   "partnerweb.vmware.com", // bug 1142187
   "paslists.com", // for port 9211, bug 1155712
   "payment.condor.com", // bug 1152347
   "payment.safepass.cn",
   "payments.virginmedia.com", // bug 1129887
-  "paymentshq.achfederal.com",
-  "paypros.com",
   "poezd.rw.by",
   "portal.eztec.com.br",
   "portal.questonline.gr",
   "portal.uem.es",
-  "prescriptionsolutions.com", // bug 1141933
   "profiles.uthscsa.edu",
-  "pryor.com",
-  "ps9-web1.cna.nl.ca", // bug 1159224
-  "psweb.ferrellgasathome.com", // bug 1152990
   "publicacionesoficiales.boe.es",
   "publicjobs.ie",
   "publicrecords.com",
-  "quickbuy.qualitynet.net",
-  "rakuraku-market.com",
+  "racenet.codemasters.com", // bug 1163716
   "recoup.com",
   "registration.o2.co.uk",
   "regonline.com", // bug 1139783
   "renewals.cipd.co.uk",
   "repair.kuroneko-kadendr.jp", // bug 1128366
   "repairmb.kuroneko-kadendr.jp", // bug 1128366
   "reputation.com",
   "research-report.uws.edu.au",
+  "reservations.usairways.com", // bug 1165400
   "rezstream.net",
   "rietumu.lv",
   "rotr.com",
   "roxyaffiliates.com",
   "sales.newchinalife.com",
   "sbank.hxb.com.cn",
   "sboseweb.mcpsweb.org",
   "school.keystoneschoolonline.com",
-  "seaeagle.com",
   "secure-checkout.t-mobile.com", // bug 1133648
   "secure.bg-mania.jp",
+  "secure.crbonline.gov.uk", // bug 1166644
   "secure.fortisbc.com",
-  "secure.medexpressrx.com",
-  "secure.missouristate.edu",
   "secure.ncsoft.com", // bug 1139782
   "secure.smartcart.com",
   "secure2.i-doxs.net", // bug 1140876
   "secure3.i-doxs.net", // bug 1140876
   "secure4.i-doxs.net", // bug 1140876
   "secure6.i-doxs.net", // bug 1140876
   "secure7.i-doxs.net", // bug 1140876
   "secure8.i-doxs.net", // bug 1140876
   "secureonline.dwp.gov.uk",
   "sems.hrd.ccsd.net",
   "service.autoc-one.jp",
   "services.apvma.gov.au",
   "services.geotrust.com", // bug 1137677
   "servizionline.infogroup.it",
   "shop.autoc-one.jp",
   "shop.kagome.co.jp",
-  "shop.maxim-ic.com",
   "shop.nanairo.coop", // bug 1128318
   "shop.wildstar-online.com", // bug 1139782
-  "sirius.ws.ryukoku.ac.jp",
   "sisweb.ucd.ie",
   "slovanet.sk",
   "smartcart.com",
   "smarticon.geotrust.com", // bug 1137677
   "socialclub.rockstargames.com", // bug 1138673
   "soeasy.sodexo.be", // bug 1117157
   "ss2.sfcollege.edu",
   "ss5.sfcollege.edu",
   "ssb.okbu.edu", // for port 8910, bug 1153749
-  "ssl.safaribooksonline.com", // bug 1133940
   "sso.acadiau.ca", // bug 1152377
-  "sso.optumrx.com", // bug 1141933
+  "starbucks.com", // bug 1167190
   "stenhouse.com",
-  "store.closetmaid.com",
   "store.moxa.com",
-  "sucf.suny.edu",
-  "support.crypticstudios.com",
   "svrch13.sugarlandtx.gov",
   "syzygy.co.uk",
   "tarjetacencosud.cl",
   "tele2.hr",
-  "texashealth.org",
-  "tianet.org",
   "tienda.boe.es",
   "tiendas.mediamarkt.es",
-  "trade.hsfund.com",
   "trueblue.jetblue.com",
   "uralsg.megafon.ru", // bug 1153168
+  "usacycling.org", // bug 1163791
   "userdoor.com",
   "uslugi.beeline.am",
   "utradehub.or.kr",
-  "vitalchoice.com",
   "vod.skyperfectv.co.jp",
   "watch.sportsnet.ca", // bug 1144769
   "web.asta.org",
   "webapps.ou.edu",
   "webatm.landbank.com.tw",
   "webmail.iyte.edu.tr",
-  "websecurityguard.com",
   "websiti.cnbv.gob.mx",
   "webtv.tv2.no",
   "weddings.realresorts.com",
-  "whataburger.com",
   "wis.ntu.edu.sg",
-  "write.skyword.com", // bug 1141580
   "wszg.nbcs.gov.cn",
   "www.aa.co.uk", // bug 1141604
   "www.aa.com", // bug 1141604
   "www.aa.com.br", // bug 1141604
   "www.aa.com.do", // bug 1141604
   "www.aa.com.pe", // bug 1141604
   "www.aa.com.ve", // bug 1141604
   "www.aavacations.com", // bug 1141604
@@ -387,232 +335,197 @@ static const char* const kIntolerantFall
   "www.americanairlines.ie", // bug 1141604
   "www.americanairlines.in", // bug 1141604
   "www.americanairlines.it", // bug 1141604
   "www.americanairlines.jp", // bug 1141604
   "www.amica.com", // bug 1139563
   "www.ancelutil.com.uy",
   "www.animate-onlineshop.jp", // bug 1126652
   "www.apeasternpower.com",
-  "www.appgraffiti.com",
   "www.asko.fi", // bug 1158584
   "www.auroragov.org",
   "www.bancocredichile.cl",
   "www.bankcomm.com.hk", // bug 1141742
   "www.bankhapoalim.co.il", // bug 1138231
-  "www.bankofthewest.com", // bug 1127204
   "www.bauschonline.com",
+  "www.baybloorradio.com", // bug 1173661
   "www.bbsfonline.com",
   "www.bettertrades.com",
   "www.bigflix.com",
   "www.blastam.com",
   "www.blogwatcher.co.jp",
   "www.blueprintonline.co.za",
-  "www.bmfsfj.de",
   "www.boe.es",
   "www.boostmobilesales.com", // bug 1112178
   "www.borsaitaliana.it",
   "www.bottegaverde.es",
   "www.bottegaverde.it",
   "www.bottegaverde.pt",
   "www.bredbandsbolaget.se", // bug 1158755
-  "www.bundespruefstelle.de",
   "www.businessdirect.bt.com",
   "www.cafedumonde.jp",
-  "www.card-data.com", // bug 1154285
   "www.careers.asio.gov.au",
   "www.cherry.de", // bug 1141521
   "www.chinapay.com", // bug 1137983
   "www.cihi.ca",
   "www.cipd.co.uk",
   "www.civilization.com", // bug 1156004
   "www.club-animate.jp",
-  "www.cngcorp.com",
   "www.codan.dk",
   "www.contraloria.cl",
   "www.credem.it",
   "www.crediscotia.com.mx",
   "www.creditagricole.info",
-  "www.crocs.com.tw",
-  "www.crypticstudios.com",
   "www.css-club.net",
   "www.ctfeshop.com.cn",
   "www.cwu.edu",
   "www.dabs.com",
   "www.dabs.ie",
   "www.dabs4work.ie",
-  "www.dakotacollectibles.com",
   "www.derayah.com",
-  "www.desjardins.com", // bug 1148465
   "www.digibet.com",
   "www.drcsurveys.com",
   "www.dream-prize.com",
   "www.duskin.co.jp",
   "www.duskin.jp",
   "www.ec-line.cn",
   "www.echo.com",
   "www.echotrak.com",
   "www.embroiderydesignsplus.com",
-  "www.emihub.com",
   "www.epicreg.com",
   "www.ermis.gov.gr",
   "www.esadealumni.net",
   "www.esavingsaccount.co.uk",
   "www.escrowrefills.com",
   "www.essentialsupplies.com",
   "www.euronext.com", // bug 1136091
   "www.everyd.com",
-  "www.expogrupo.com",
   "www.ezpay.com.tw",
-  "www.familien-wegweiser.de",
-  "www.fdms.gov", // bug 1137981
   "www.fhsaa.org",
+  "www.fibi-online.co.il", // bug 1165580
   "www.fj96336.com",
   "www.fontainebleau.com",
   "www.foundersc.com",
-  "www.fsmoffice.net",
   "www.fubar.com",
   "www.fundsupermart.co.in",
   "www.gamers-onlineshop.jp", // bug 1126654
   "www.gbe-bund.de",
   "www.giftcertificates.com",
   "www.golfersland.net",
   "www.gtja.com",
   "www.hankyu-club.com",
   "www.haynes.co.uk",
-  "www.hctmall.com.tw",
   "www.hercle.com",
   "www.hn.10086.cn",
   "www.hotel-story.ne.jp",
   "www.hpshop.gr",
   "www.hsbank.cc",
   "www.hx168.com.cn",
-  "www.icle.org",
   "www.ingramentertainment.com",
   "www.interpark.com",
+  "www.isracard.co.il", // bug 1165582
   "www.jaf.or.jp",
   "www.jifenpay.com",
-  "www.jodunning.com",
   "www.kasite.net",
   "www.khan.co.kr",
   "www.komatsu-kenki.co.jp",
   "www.komatsu.co.jp",
   "www.komatsu.com",
   "www.kredodirect.com.ua", // bug 1095507
   "www.law888.com.tw",
-  "www.leatherfads.com",
   "www.lewisham.gov.uk",
   "www.lib.cwu.edu",
   "www.libraryvideo.com",
   "www.lm-order.de",
   "www.londonstockexchange.com",
+  "www.macif.fr", // bug 1167893
   "www.marketday.com", // bug 1092998
+  "www.matkahuolto.fi", // bug 1174957
   "www.matkahuolto.info",
   "www.matrics.or.jp",
   "www.mchrono.com",
   "www.mecsumai.com",
   "www.mercatoneuno.com",
   "www.mercernet.fr", // bug 1147649
   "www.meta-ehealth.com",
-  "www.miracle-ear.com",
   "www.misterdonut.jp",
   "www.mizuno.jp",
   "www.monclick.it",
   "www.mp2.aeroport.fr",
   "www.mpay.co.th",
   "www.mtsindia.in", // RC4
   "www.my.airdo.jp", // bug 1129773
   "www.myagent.gov.ab.ca", // bug 1152827
   "www.mynpcdata.net",
   "www.mywebreservations.com",
   "www.ncsoft.com", // bug 1139782
   "www.nec-nexs.com",
   "www.newchinalife.com",
   "www.nishi.or.jp",
   "www.ocbcwhhk.com", // bug 1141746
   "www.openwebosproject.org", // bug 1151990
-  "www.optumrx.com", // bug 1141933
-  "www.optumrx.org", // bug 1141933
-  "www.outlet01.com.tw",
   "www.paslists.com", // for port 9211, bug 1155712
-  "www.paypros.com",
   "www.pen-kanagawa.ed.jp",
   "www.polla.cl",
-  "www.prescriptionsolutions.com", // bug 1141933
-  "www.pryor.com",
   "www.publicjobs.ie",
   "www.publicrecords.com",
   "www.pwcrecruiting.com",
   "www.razorgator.com",
   "www.recoup.com",
   "www.regonline.com", // bug 1139783
   "www.renaultcredit.com.ar",
   "www.reputation.com",
   "www.rezstream.net",
   "www.rietumu.lv",
   "www.rimac.com.pe",
   "www.riversendtrading.com",
   "www.rotr.com",
   "www.roxyaffiliates.com",
   "www.s-book.net",
   "www.safepass.cn",
-  "www.seaeagle.com",
-  "www.secure.missouristate.edu",
   "www.session.ne.jp",
   "www.shacombank.com.hk", // bug 1141989
   "www.shacomsecurities.com.hk", // bug 1141989
-  "www.shanghaigm.com",
   "www.shop.bt.com",
-  "www.sihd-bk.jp",
   "www.slovanet.sk",
   "www.smartcart.com",
   "www.smartoffice.jp",
-  "www.soconngas.com",
-  "www.sogehomebank.com",
   "www.sokamocka.com",
   "www.sports-nakama.com",
-  "www.sprint.com", // bug 1138211
+  "www.starbucks.com", // bug 1167190
   "www.stenhouse.com",
-  "www.sucf.suny.edu",
   "www.sunderland.gov.uk",
   "www.syzygy.co.uk",
   "www.tarjetacencosud.cl",
   "www.tealife.co.jp",
   "www.tele2.hr",
-  "www.tennisuk.net",
   "www.tetsudo.com",
-  "www.texashealth.org",
-  "www.thecopia.com",
-  "www.tianet.org",
+  "www.trkd.thomsonreuters.com", // bug 1172793
   "www.u-gakugei.ac.jp",
   "www.uccard.co.jp",
-  "www.uinet.com",
   "www.ur-net.go.jp",
+  "www.usacycling.org", // bug 1163791
   "www.usairways.com", // bug 1142703
   "www.userdoor.com",
   "www.utradehub.or.kr",
   "www.virgin.net",
-  "www.vitalchoice.com",
   "www.wavecable.com",
-  "www.websecurityguard.com",
-  "www.whataburger.com",
   "www.wingarc.com",
-  "www.xm-l-tax.gov.cn",
   "www.yakult.co.kr",
   "www.zenfolio.com",
   "www.zoominfo.com",
   "www1.aeroplan.com", // bug 1137543
+  "www1.isracard.co.il", // bug 1165582
   "www2.aeroplan.com", // bug 1137543
   "www2.bancobrasil.com.br", // bug 1135966
-  "www2.sysadm.suny.edu",
   "www2.wou.edu",
   "www28.bb.com.br", // bug 1135966
   "www3.aeroplan.com", // bug 1137543
   "www3.ibac.co.jp",
   "www3.taiheiyo-ferry.co.jp",
   "www4.aeroplan.com", // bug 1137543
   "www41.bb.com.br", // bug 1135966
+  "www73.bb.com.br", // bug 1135966
   "wwws.kadokawa.co.jp",
   "xyk.cebbank.com", // bug 1145524
-  "yeswellnesspro.fsmoffice.net",
   "zenfolio.com",
   "zoominfo.com",
 };