Merge NoScript 2.3.7 with HTTPS-Everywhere
We thought this fixed bug #5477 (moved), but it did not. It still took two days though, so I'm adding it in for the historical record so I can remove the tag from #5477 (moved).
We thought this fixed bug #5477 (moved), but it did not. It still took two days though, so I'm adding it in for the historical record so I can remove the tag from #5477 (moved).