[Dell] mixed content; also linux.dell.com redirects to http

https://trac.torproject.org/projects/tor/ticket/8569

Conflicts:
	src/chrome/content/rules/Dell.xml
Merge remote-tracking branch 'upstream/master'