[redisable] Science Direct still causes mixed content

https://trac.torproject.org/projects/tor/ticket/9784

Not clear why it was reenabled, other perhaps that confusion between
branches...
Merge branch '3.5' of ssh://github.com/EFForg/https-everywhere into 3.5
Fix redirect detection for HTTPS -> HTTPS redirect loops

Fixes http://cdt.org & closes issue #289

Signed-off-by: Nick Semenkovich <semenko@alum.mit.edu>