[ArXiv] default off per site operator request
Merge branch 'master' of git://git.torproject.org/git/https-everywhere
Fixed bug in ruleset tests
Merge branch 'master' of git://gitweb.torproject.org/https-everywhere
Bump version to 4.0development.14
Rm excess verbosity
[DO NOT MERGE INTO 3.0] Remove nsIContentPolicy paths

These are obsolete as of Firefox 20, which ships the channel.redirectTo API.  This should fix:

https://bugzilla.mozilla.org/show_bug.cgi?id=939180
Do not modify the channel.URI, ever, just in case