Merge remote-tracking branch 'yan/master'
[Microsoft] Moved www.microsoft.com to [Microsoft-mixedcontent] rule
https://trac.torproject.org/projects/tor/ticket/9305
Merge remote-tracking branch 'upstream/master'