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:
Steven Black
2014-05-31 00:38:11 -04:00
7 changed files with 449311 additions and 6 deletions

View File

@@ -10,6 +10,9 @@ Currently the `hosts` files from the following locations are amalgamated:
* MVPs.org Hosts file at [http://winhelp2002.mvps.org/hosts.htm](http://winhelp2002.mvps.org/hosts.htm), updated monthly, or thereabouts.
* Dan Pollock at [http://someonewhocares.org/hosts/](http://someonewhocares.org/hosts/) updated regularly.
* Malware Domain List at [http://www.malwaredomainlist.com/](http://www.malwaredomainlist.com/), updated regularly.
* Peter Lowe at [http://pgl.yoyo.org/adservers/](http://pgl.yoyo.org/adservers/), updated regularly.
* hpHosts at [http://hosts-file.net/](http://hosts-file.net/), updated regularly
* My own small list in raw form [here](https://raw.github.com/StevenBlack/hosts/master/data/StevenBlack/hosts).
You can add any additional sources you'd like under the data/ directory. Provide a copy of the current `hosts` file and a file called