mirror of
https://github.com/StevenBlack/hosts.git
synced 2026-10-05 14:21:03 +01:00
Merge branch 'master' of https://github.com/linuxlefty/hosts into linuxlefty-master
# By Peter Naudus # Via Peter Naudus * 'master' of https://github.com/linuxlefty/hosts: Normalizing hosts and better duplicate detction added Added hpHosts (hosts-file.net) as a source Added support for ZIP compressed files Removing vim swap file Added yoyo.org adserver lists as data source Refreshed hosts from malwaredomainlist.com, mvps.org, and someonewhocares.org Conflicts: data/malwaredomainlist.com/hosts data/mvps.org/hosts data/someonewhocares.org/hosts hosts readme.md
This commit is contained in:
Reference in New Issue
Block a user