EFForg/https-everywhere — pull request #818 by jsha (2014-12-13 02:26:03+00:00)
Title: Fix bad merge of ssl-observatory.

cc @cooperq for code review.