Merge branch 'master' of https://github.com/blocklistproject/Lists

diff --cc abuse.txt
Simple merge

diff --cc ads.txt
Simple merge

diff --cc crypto.txt
Simple merge

diff --cc fraud.txt
Simple merge

diff --cc malware.txt
Simple merge

diff --cc phishing.txt
Simple merge

diff --cc porn.txt
Simple merge

diff --cc redirect.txt
Simple merge

diff --cc torrent.txt
Simple merge

diff --cc tracking.txt
Simple merge