Don't need to set use_tor_proxy twice
Translate merge-rulesets into python: 5x speedup
Put a newline at the end of each ruleset in the library

There by making default.rulesets somewhat human-readable

https://trac.torproject.org/projects/tor/ticket/5733
Actually, this is a much more readable merge-rulesets implementation

Though it is slower.  Python is probably the long-term way forward
Merge remote-tracking branch 'negres/master'
Fix the implementation of safeToSecureCookie

Get https://trac.torproject.org/projects/tor/ticket/7491 right(er)
Fix https://trac.torproject.org/projects/tor/ticket/7855
Remove relic case
[Coursera] problems are reportedly persisting, disable

https://trac.torproject.org/projects/tor/ticket/7336
[Amazon Web Services] Add s3-external-[123]
Bitcoin.de
[BitInstant] Cosmetics
Catlin Sea Survey
Crossrider
DaWanda
EvoTronix
Green PolkaDot Box
[nVidia] Add nvidianews
OFFLINE.ee
PC Booster
SourceFed