implements #131 and fixes conflicts

disposable_email_blacklist.conf

@@ -1,4 +1,6 @@
+0-00.usa.cc
 0-mail.com
+001.igg.biz
 027168.com
 0815.ru
 0815.ry
@@ -48,6 +50,7 @@
 140unichars.com
 147.cl
 14n.co.uk
+15qm.com
 1ce.us
 1chuan.com
 1clck2.com
@@ -56,7 +59,9 @@
 1pad.de
 1st-forms.com
 1to1mail.org
+1usemail.com
 1zhuan.com
+2.0-00.usa.cc
 20email.eu
 20email.it
 20mail.in
@@ -70,10 +75,13 @@
 2anom.com
 2fdgdfgdfgdf.tk
 2prong.com
+2wc.info
+300book.info
 30mail.ir
 30minutemail.com
 30wave.com
 3202.com
+333.igg.biz
 33mail.com
 36ru.com
 3d-painting.com
@@ -99,6 +107,7 @@
 5mail.ga
 5oz.ru
 5x25.com
+5ymail.com
 60minutemail.com
 672643.net
 675hosting.com
@@ -133,10 +142,12 @@ a-bc.net
 a45.in
 a7996.com
 aa5zy64.com
+ab0.igg.biz
 abacuswe.us
 abakiss.com
 abcmail.email
 abilitywe.us
+abnamro.usa.cc
 abovewe.us
 absolutewe.us
 abundantwe.us
@@ -173,6 +184,7 @@ adobeccepdm.com
 adoniswe.us
 adpugh.org
 adsd.org
+adubiz.info
 advantagewe.us
 advantimo.com
 adventurewe.us
@@ -185,7 +197,9 @@ aegiscorp.net
 aegiswe.us
 aelo.es
 aeonpsi.com
+affiliate-nebenjob.info
 affiliatedwe.us
+affilikingz.de
 affinitywe.us
 affluentwe.us
 affordablewe.us
@@ -207,6 +221,7 @@ akgq701.com
 al-qaeda.us
 albionwe.us
 alchemywe.us
+alfaromeo.igg.biz
 aliaswe.us
 alienware13.com
 aligamel.com
@@ -300,6 +315,7 @@ ariaz.jetzt
 armyspy.com
 aron.us
 arroisijewellery.com
+art-en-ligne.pro
 artman-conception.com
 arurgitu.gq
 arvato-community.de
@@ -307,22 +323,29 @@ aschenbrandt.net
 asdasd.nl
 asdasd.ru
 ashleyandrew.com
+asiarap.usa.cc
+asorent.com
 ass.pp.ua
 astonut.tk
 astroempires.info
 asu.mx
 asu.su
 at0mik.org
+audi.igg.biz
 augmentationtechnology.com
+ausgefallen.info
 auti.st
 autorobotica.com
 autotwollow.com
 aver.com
+averdov.com
+avia-tonic.fr
 avls.pt
 awatum.de
 awiki.org
 axiz.org
 axon7zte.com
+axsup.net
 azcomputerworks.com
 azmeil.tk
 b1of96u.com
@@ -339,6 +362,7 @@ basscode.org
 bauwerke-online.com
 baxomale.ht.cx
 bazaaboom.com
+bbbbyyzz.info
 bbhost.us
 bcast.ws
 bcb.ro
@@ -373,6 +397,7 @@ blip.ch
 blnkt.net
 blogmyway.org
 blogspam.ro
+blow-job.nut.cc
 bluedumpling.info
 bluewerks.com
 boatmail.us
@@ -404,6 +429,7 @@ bspooky.com
 bst-72.com
 btb-notes.com
 btc.email
+btcmail.pw
 btizet.pl
 buffemail.com
 bugmenever.com
@@ -432,6 +458,7 @@ c51vsgq.com
 cachedot.net
 californiafitnessdeals.com
 cam4you.cc
+camping-grill.info
 candymail.de
 cane.pw
 car101.pro
@@ -441,6 +468,7 @@ caseedu.tk
 casualdx.com
 cavi.mx
 cbair.com
+cc-cc.usa.cc
 cc.liamria
 cdpa.cc
 ceed.se
@@ -528,12 +556,15 @@ curryworld.de
 cust.in
 cutout.club
 cuvox.de
+cyber-innovation.club
+cyber-phone.eu
 cylab.org
 d1yun.com
 d3p.dk
 dab.ro
 dacoolest.com
 daemsteam.com
+daibond.info
 daintly.com
 damai.webcam
 dammexe.net
@@ -545,6 +576,7 @@ dash-pads.com
 dataarca.com
 datarca.com
 datazo.ca
+datum2.com
 davidkoh.net
 davidlcreative.com
 dawin.com
@@ -578,6 +610,10 @@ derkombi.de
 derluxuswagen.de
 despam.it
 despammed.com
+dev-null.cf
+dev-null.ga
+dev-null.gq
+dev-null.ml
 devnullmail.com
 deyom.com
 dharmatel.net
@@ -585,6 +621,7 @@ dhm.ro
 dhy.cc
 dialogus.com
 diapaulpainting.com
+digitalesbusiness.info
 digitalmariachis.com
 digitalsanctuary.com
 dildosfromspace.com
@@ -599,6 +636,8 @@ discard.ml
 discard.tk
 discardmail.com
 discardmail.de
+disign-concept.eu
+disign-revelation.com
 dispo.in
 dispomail.eu
 disposable-email.ml
@@ -683,15 +722,18 @@ dwse.edu.pl
 dyceroprojects.com
 dz17.net
 e-mail.com
+e-mail.igg.biz
 e-mail.org
 e-tomarigi.com
 e3z.de
 e4ward.com
 easy-trash-mail.com
+easynetwork.info
 easytrashmail.com
 eatmea2z.club
 ebeschlussbuch.de
 ecallheandi.com
+ecolo-online.fr
 edgex.ru
 edinburgh-airporthotels.com
 edv.to
@@ -707,6 +749,7 @@ elearningjournal.org
 electro.mn
 elitevipatlantamodels.com
 email-fake.cf
+email-fake.com
 email-fake.ga
 email-fake.gq
 email-fake.ml
@@ -787,7 +830,10 @@ escapehatchapp.com
 esemay.com
 esgeneri.com
 esprity.com
+estate-invest.fr
+ether123.net
 ethereum1.top
+ethersports.org
 etranquil.com
 etranquil.net
 etranquil.org
@@ -837,6 +883,7 @@ fangoh.com
 fansworldwide.de
 fantasymail.de
 farrse.co.uk
+fast-mail.fr
 fastacura.com
 fastchevy.com
 fastchrysler.com
@@ -873,6 +920,8 @@ fizmail.com
 fleckens.hu
 flemail.ru
 flowu.com
+flu-cc.flu.cc
+flucc.flu.cc
 fluidsoft.us
 flurred.com
 fly-ts.de
@@ -900,8 +949,10 @@ free-email.ga
 freebabysittercam.com
 freeblackbootytube.com
 freecat.net
+freedom4you.info
 freedompop.us
 freefattymovies.com
+freelance-france.eu
 freeletter.me
 freemail.ms
 freemail.tweakly.net
@@ -965,6 +1016,7 @@ geldwaschmaschine.de
 gelitik.in
 gen.uu.gl
 genderfuck.net
+geronra.com
 geschent.biz
 get-mail.cf
 get-mail.ga
@@ -980,6 +1032,7 @@ getairmail.gq
 getairmail.ml
 getairmail.tk
 geteit.com
+getfun.men
 getmails.eu
 getnada.com
 getnowtoday.cf
@@ -999,6 +1052,7 @@ girlmail.win
 girlsindetention.com
 girlsundertheinfluence.com
 gishpuppy.com
+giveh2o.info
 givmail.com
 glitch.sx
 globaltouron.com
@@ -1018,6 +1072,7 @@ goemailgo.com
 golemico.com
 gomail.in
 gorillaswithdirtyarmpits.com
+goround.info
 gothere.biz
 gotmail.com
 gotmail.net
@@ -1086,6 +1141,7 @@ hackthatbit.ch
 hahawrong.com
 haida-edu.cn
 haltospam.com
+hangxomcuatoilatotoro.ml
 harakirimail.com
 haribu.com
 hartbot.de
@@ -1151,6 +1207,7 @@ hushmail.cf
 huskion.net
 hvastudiesucces.nl
 hwsye.net
+i-phone.nut.cc
 iaoss.com
 ibnuh.bz
 icantbelieveineedtoexplainthisshit.com
@@ -1171,6 +1228,7 @@ imails.info
 imgof.com
 imgv.de
 imstations.com
+imul.info
 inbax.tk
 inbound.plus
 inbox.si
@@ -1208,6 +1266,7 @@ insorg-mail.info
 instant-mail.de
 instantblingmail.info
 instantemailaddress.com
+instantmail.fr
 internetoftags.com
 interstats.org
 intersteller.com
@@ -1233,16 +1292,24 @@ isukrainestillacountry.com
 it7.ovh
 italy-mail.com
 itunesgiftcodegenerator.com
+iuemail.men
 iwi.net
 ixx.io
 j-p.us
+j8k2.usa.cc
 jafps.com
 jajxz.com
+jamesbond.flu.cc
+jamesbond.igg.biz
+jamesbond.nut.cc
+jamesbond.usa.cc
 janproz.com
 jdmadventures.com
 jdz.ro
+jeie.igg.biz
 jellow.ml
 jellyrolls.com
+jet-renovation.fr
 jetable.com
 jetable.fr.nf
 jetable.net
@@ -1257,6 +1324,7 @@ jobs-to-be-done.net
 joelpet.com
 joetestalot.com
 jopho.com
+joseihorumon.info
 josse.ltd
 jourrapide.com
 jpco.org
@@ -1279,6 +1347,7 @@ kakadua.net
 kalapi.org
 kamsg.com
 kaovo.com
+kappala.info
 karatraman.ml
 kariplan.com
 kartvelo.com
@@ -1300,16 +1369,19 @@ kimsdisk.com
 kingsq.ga
 kiois.com
 kir.ch.tc
+kiryubox.cu.cc
 kismail.ru
 kisstwink.com
 kitnastar.com
 klassmaster.com
 klassmaster.net
+klick-tipp.us
 klipschx12.com
 kloap.com
 kludgemush.com
 klzlk.com
 kmhow.com
+knol-power.nl
 kommunity.biz
 kon42.com
 kook.ml
@@ -1321,6 +1393,9 @@ koszmail.pl
 krd.ag
 krsw.tk
 krypton.tk
+ks87.igg.biz
+ks87.usa.cc
+ksmtrck.tk
 kuhrap.com
 kulturbetrieb.info
 kurzepost.de
@@ -1334,12 +1409,14 @@ labetteraverouge.at
 lacedmail.com
 lackmail.net
 lackmail.ru
+lacto.info
 lags.us
 lain.ch
 lak.pp.ua
 lakelivingstonrealestate.com
 landmail.co
 laoeq.com
+last-chance.pro
 lastmail.co
 lastmail.com
 lawlita.com
@@ -1358,6 +1435,7 @@ lgxscreen.com
 lhsdv.com
 liamcyrus.com
 lifebyfood.com
+lifetimefriends.info
 lifetotech.com
 ligsb.com
 lillemap.net
@@ -1391,6 +1469,7 @@ lopl.co.cc
 lordsofts.com
 lortemail.dk
 losemymail.com
+lovemeet.faith
 lovemeleaveme.com
 lpfmgmtltd.com
 lr7.us
@@ -1407,16 +1486,19 @@ m21.cc
 m4ilweb.info
 maboard.com
 macromaid.com
+macromice.info
 magamail.com
 maggotymeat.ga
 magicbox.ro
 maidlow.info
+mail-easy.fr
 mail-filter.com
 mail-owl.com
 mail-temporaire.com
 mail-temporaire.fr
 mail.by
 mail.wtf
+mail0.ga
 mail114.net
 mail1a.de
 mail21.cc
@@ -1479,6 +1561,7 @@ mailinator.info
 mailinator.net
 mailinator.org
 mailinator.us
+mailinator.usa.cc
 mailinator0.com
 mailinator1.com
 mailinator2.com
@@ -1543,6 +1626,7 @@ mailzi.ru
 mailzilla.com
 mailzilla.org
 mailzilla.orgmbx.cc
+mainerfolg.info
 makemenaughty.club
 makemetheking.com
 malahov.de
@@ -1552,12 +1636,15 @@ manifestgenerator.com
 mansiondev.com
 manybrain.com
 markmurfin.com
+masonline.info
 maswae.world
+matamuasu.ga
 matchpol.net
 mbx.cc
 mcache.net
 mciek.com
 mdhc.tk
+mebelnu.info
 mechanicalresumes.com
 meepsheep.eu
 mega.zik.dj
@@ -1606,6 +1693,7 @@ mohmal.im
 mohmal.in
 mohmal.tech
 momentics.ru
+monachat.tk
 monadi.ml
 moncourrier.fr.nf
 monemail.fr.nf
@@ -1623,6 +1711,9 @@ mountainregionallibrary.net
 mox.pp.ua
 moza.pl
 mozej.com
+mp-j.ga
+mp-j.igg.biz
+mp.igg.biz
 mr24.co
 msgos.com
 mspeciosa.com
@@ -1680,6 +1771,7 @@ nada.ltd
 nakedtruth.biz
 nanonym.ch
 nationalgardeningclub.com
+nawmin.info
 nbox.notif.me
 negated.com
 neomailbox.com
@@ -1694,8 +1786,10 @@ netviewer-france.com
 netzidiot.de
 nevermail.de
 newbpotato.tk
+newideasfornewpeople.info
 next.ovh
 nextstopvalhalla.com
+nezdiro.org
 nezzart.com
 nfast.net
 nguyenusedcars.com
@@ -1721,6 +1815,9 @@ nodezine.com
 nogmailspam.info
 noicd.com
 nokiamail.com
+nolemail.ga
+nomail.cf
+nomail.ga
 nomail.pw
 nomail.xl.cx
 nomail2me.com
@@ -1746,6 +1843,8 @@ nubescontrol.com
 nullbox.info
 nurfuerspam.de
 nus.edu.sg
+nut-cc.nut.cc
+nutcc.nut.cc
 nutpa.net
 nuts2trade.com
 nwldx.com
@@ -1818,6 +1917,7 @@ pepbot.com
 peterdethier.com
 petrzilka.net
 pfui.ru
+photo-impact.eu
 photomark.net
 pi.vu
 piaa.me
@@ -1857,6 +1957,7 @@ predatorrat.ga
 predatorrat.gq
 predatorrat.ml
 predatorrat.tk
+premium-mail.fr
 primabananen.net
 privacy.net
 privatdemail.net
@@ -1919,6 +2020,7 @@ rcasd.com
 rcpt.at
 rdklcrv.xyz
 re-gister.com
+reality-concept.club
 reallymymail.com
 realtyalerts.ca
 rebates.stream
@@ -1929,6 +2031,7 @@ reconmail.com
 recyclemail.dk
 reddit.usa.cc
 redfeathercrow.com
+reftoken.net
 regbypass.com
 rejectmail.com
 rejo.technology
@@ -1940,6 +2043,7 @@ remote.li
 reptilegenetics.com
 revolvingdoorhoax.org
 rhyta.com
+richfinances.pw
 riddermark.de
 risingsuntouch.com
 riski.cf
@@ -2001,6 +2105,10 @@ secure-mail.biz
 secure-mail.cc
 secured-link.net
 securehost.com.es
+securemail.flu.cc
+securemail.igg.biz
+securemail.nut.cc
+securemail.usa.cc
 seekapps.com
 seekjobs4u.com
 sejaa.lv
@@ -2069,6 +2177,7 @@ smapfree24.de
 smapfree24.eu
 smapfree24.info
 smapfree24.org
+smarttalent.pw
 smashmail.de
 smellfear.com
 smellrear.com
@@ -2084,9 +2193,11 @@ sofort-mail.de
 sofortmail.de
 softpls.asia
 sogetthis.com
+sohai.ml
 sohu.com
 sohus.cn
 soisz.com
+solar-impact.pro
 solvemail.info
 solventtrap.wiki
 sonshi.cf
@@ -2158,6 +2269,10 @@ spamthisplease.com
 spamtrail.com
 spamtrap.ro
 spamtroll.net
+spamwc.cf
+spamwc.ga
+spamwc.gq
+spamwc.ml
 speed.1s.fr
 speedgaus.net
 spikio.com
@@ -2292,6 +2407,7 @@ theaviors.com
 thebearshark.com
 thecloudindex.com
 thediamants.org
+thedirhq.info
 thelightningmail.net
 thelimestones.com
 thembones.com.au
@@ -2321,6 +2437,7 @@ tic.ec
 tilien.com
 timgiarevn.com
 timkassouf.com
+tinoza.org
 tinyurl24.com
 tipsb.com
 tittbit.in
@@ -2355,6 +2472,7 @@ toss.pw
 tosunkaya.com
 totalvista.com
 totesmail.com
+totoan.info
 tp-qa-mail.com
 tqoai.com
 tqosi.com
@@ -2377,10 +2495,12 @@ trashcanmail.com
 trashdevil.com
 trashdevil.de
 trashemail.de
+trashemails.de
 trashinbox.com
 trashmail.at
 trashmail.com
 trashmail.de
+trashmail.gq
 trashmail.io
 trashmail.me
 trashmail.net
@@ -2395,6 +2515,7 @@ trayna.com
 trbvm.com
 trbvn.com
 trbvo.com
+trgovinanaveliko.info
 trialmail.de
 trickmail.net
 trillianpro.com
@@ -2435,10 +2556,13 @@ unmail.ru
 upliftnow.com
 uplipht.com
 uploadnolimit.com
+upozowac.info
 urfunktion.se
 uroid.com
 us.af
 us.to
+usa-cc.usa.cc
+used-product.fr
 ushijima1129.cf
 ushijima1129.ga
 ushijima1129.gq
@@ -2456,6 +2580,7 @@ vankin.de
 vctel.com
 vda.ro
 vdig.com
+vemomail.win
 venompen.com
 verdejo.com
 veryday.ch
@@ -2516,8 +2641,11 @@ watch-harry-potter.com
 watchever.biz
 watchfull.net
 watchironman3onlinefreefullmovie.com
+wazabi.club
 wbml.net
+web-ideal.fr
 web-mail.pp.ua
+webcontact-france.eu
 webemail.me
 webm4il.info
 webmail.igg.biz
@@ -2529,6 +2657,7 @@ wefjo.grn.cc
 weg-werf-email.de
 wegwerf-email-addressen.de
 wegwerf-email-adressen.de
+wegwerf-email.at
 wegwerf-email.de
 wegwerf-email.net
 wegwerf-emails.de
@@ -2602,6 +2731,7 @@ xl.cx
 xmail.com
 xmaily.com
 xn--9kq967o.com
+xn--d-bga.net
 xost.us
 xoxox.cc
 xperiae5.com
@@ -2614,6 +2744,7 @@ xxhamsterxx.ga
 xxi2.com
 xxlocanto.us
 xxolocanto.us
+xxqx3802.com
 xyzfree.net
 xzsok.com
 yabai-oppai.tk
@@ -2639,6 +2770,7 @@ yopmail.fr
 yopmail.gq
 yopmail.net
 yopmail.pp.ua
+yopmail.usa.cc
 yordanmail.cf
 you-spam.com
 yougotgoated.com
@@ -2663,6 +2795,7 @@ z1p.biz
 z86.ru
 zain.site
 zainmax.net
+zaktouni.fr
 zasod.com
 zebins.com
 zebins.eu
@@ -2674,6 +2807,7 @@ zfymail.com
 zhaoyuanedu.cn
 zhcne.com
 zhewei88.com
+zhorachu.com
 zik.dj
 zipcad.com
 zippymail.info