Merge branch 'master' into lintPreventCommentedDomainsFromReappearing

# Conflicts:
#	everything.txt
#	porn.txt

diff --cc ads.txt
Simple merge

diff --cc everything.txt
index a5d610e779c83160bfb8757902b9facc7b754274,995cf6b388f9a7e98368a3988d187e459cd79855..ec182f7caeae41ee53f2df8f7cbad7de80ffabdd
--- 1/everything.txt
--- 2/everything.txt
+++ b/everything.txt
@@@ -4,8 -4,8 +4,8 @@@
  # Homepage: https://blocklist.site
  # Help: https://github.com/blocklistproject/lists/wiki/
  # License: https://unlicense.org
- # Total number of network filters: 3064001
+ # Total number of network filters: 3064006
 -#------------------------------------[SUPPORT]-------------------------------------
 +# ------------------------------------[SUPPORT]-------------------------------------
  # You can support by:
  # - reporting false positives
  # - making a donation: https://paypal.me/blocklistproject

diff --cc porn.txt
index ddf5883dc6992c1f6669171bd81a3979cdd56539,a0412f4c1a9e395721c049158888bdf50ce47e5f..c809ec21301d222f4a4204233ebe82cfe9af0a71
--- 1/porn.txt
--- 2/porn.txt
+++ b/porn.txt
@@@ -4,8 -4,8 +4,8 @@@
  # Homepage: https://blocklist.site
  # Help: https://github.com/blocklistproject/lists/wiki/
  # License: https://unlicense.org
- # Total number of network filters: 1907389
+ # Total number of network filters: 1907393
 -#------------------------------------[SUPPORT]-------------------------------------
 +# ------------------------------------[SUPPORT]-------------------------------------
  # You can support by:
  # - reporting false positives
  # - making a donation: https://paypal.me/blocklistproject
@@@ -1907406,3 -1907406,7 +1907406,7 @@@
  0.0.0.0 www.menofuk.com
  0.0.0.0 www.boyfriendtv.com
  0.0.0.0 tgp.blackmaleme.com
 -0.0.0.0 www.54647.io
+ 0.0.0.0 www.54647.website
+ 0.0.0.0 54647.website
+ 0.0.0.0 54647.io
++0.0.0.0 www.54647.io