[Microsoft] Moved www.microsoft.com to [Microsoft-mixedcontent] rule
https://trac.torproject.org/projects/tor/ticket/9305

Conflicts:
	src/chrome/content/rules/Microsoft.xml
Merge remote-tracking branch 'upstream/3.0' into 3.0