Steven Black 9cadcae174 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

2014-05-31 00:38:11 -04:00

..

hosts-file.net

Added hpHosts (hosts-file.net) as a source

2014-05-14 21:56:50 -04:00

malwaredomainlist.com

Addeed mackeeperapp.zeobit.com to my set of bad domains.

2014-05-31 00:12:55 -04:00

mvps.org

Addeed mackeeperapp.zeobit.com to my set of bad domains.

2014-05-31 00:12:55 -04:00

someonewhocares.org

Addeed mackeeperapp.zeobit.com to my set of bad domains.

2014-05-31 00:12:55 -04:00

StevenBlack

livepassdl.conviva.com is required for streaming CBC Sports in Canada.

2014-05-31 00:06:24 -04:00

yoyo.org

Removing vim swap file

2014-05-14 14:45:09 -04:00