# 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
# By Ben Limmer
# Via Ben Limmer
* 'master' of https://github.com/l1m5/hosts:
Source update.
Added query to user for moving the hosts file into place.
Source update.
Correcting syntax error with elif.
Added back instructions for Windows users on where to move their hosts file to. Resolves#5. I'm opening a new issue for adding this for Windows.
Added support for automatically moving the hosts file into place and flushing the DNS Cache for Mac and Linux. This addresses part of Issue #5, but I still need to do Windows.
Updated sources.
Write out how many unique entries were generated in the readme.md file. Resolves#3.
Print out copy locations on success. Now it's easy to copy/paste where the host file needs to go.
Updating sources
Source update.
Update sources.
Updated from sources.
Updated sources.
Updated hosts files.
Update sources.
Updated sources and hosts file.
Source update.
Conflicts:
data/malwaredomainlist.com/hosts
data/mvps.org/hosts
data/someonewhocares.org/hosts
hosts
readme.md
This commit is the first merged hosts file to utilize the updateHostsFile.py script.
The only working difference is that it pulled in a new someonewhocares.org hosts file.
updateHostsFile.py can handle either simply combining local hosts files you have checked in, or it can
go out to the Internet to update your source files. It also handles automatically generating a header
and removing duplicates from the list.
