Merge branch 'master' into lint

# Conflicts:
#	malware.txt
#	scam.txt

diff --cc abuse.txt
Simple merge

diff --cc malware.txt
index d79ba3b7eefaf0dc3c336dd9e67dcbb01b77aa4b,45a04ac6b84d91f755b0a8ca340ece7f03e86b9b..3f145a0b1167a98dbf4ab97f146cf9892594ceb4
--- 1/malware.txt
--- 2/malware.txt
+++ b/malware.txt
@@@ -456346,4 -456346,4 +456346,4 @@@
  0.0.0.0 zzzyzs.net
  0.0.0.0 avsvmcloud.com
  0.0.0.0 my-sweet-sexfinder.com
- 0.0.0.0 whynotwin11.com
 -#0.0.0.0 whynotwin11.com Issue 375
++#0.0.0.0 whynotwin11.com Issue 375

diff --cc scam.txt
index 7f52b9a06ac011fbc5a374878c0ed4298e07f188,590d8d9dfbe9dbc6f235df11ff32d4fd82dc858e..87a48c00233ca6d236de9b1321e1bd21552197df
--- 1/scam.txt
--- 2/scam.txt
+++ b/scam.txt
@@@ -1193,4 -1193,4 +1193,4 @@@
  0.0.0.0 citasyencuentros.com
  0.0.0.0 ammjaflk.ru
  0.0.0.0 hovrecording.com
- 0.0.0.0 whynotwin11.com
 -#0.0.0.0 whynotwin11.com Issue 375
++#0.0.0.0 whynotwin11.com Issue 375