[NewsBlur] Secure the domain cookie
[xkcd] Combine two attempts at the same rule
updated flavors.me rules

user profiles live on subdomains and shouldn't be redirected to https
[HM.com] Mark as mixedcontent

Closes https://trac.torproject.org/projects/tor/ticket/9903
Add the SFConservancy lists server.
Merge branch 'flavors-rulset' of https://github.com/antych/https-everywhere into antych-flavors-rulset
Merge pull request #180 from jmorahan/rule-newsblur-2

[NewsBlur] Secure the domain cookie
Merge pull request #181 from jmorahan/rule-xkcd

[xkcd] Combine two attempts at the same rule
Merge remote-tracking branch 'origin/master'
[The Boston Globe] Point to www for boston.com
[Boston.com] Rewrite deals to finds

Conflicts:
	src/chrome/content/rules/Boston.com.xml