[Xhamster] disable
Merge branch 'master' of https://git.torproject.org/https-everywhere
Clarify licensing
Merged remote-tracking branch 'upstream/master'.