Merge remote-tracking branch 'upstream/master'
[Cloudfront] Exclusion for Amazon mp3s

https://trac.torproject.org/projects/tor/ticket/9367
[UKLocalGov] Add havering.gov.uk
[UKLocalGov] Remove reading rule, see #8783
Merge remote-tracking branch 'upstream/master'
Prepare for switching accidental dev users to stable

The 3.3.2 release had a bug that accidentally put some
percentage of stable users in the develoment branch. They
then updated to 4.0development.10. We need to push a
4.0development.11 release that detects which users used
to be on the stable branch and gives them a popup asking
them if they would like to go back to stable.
Open dev downgrade prompt in tab instead of window
Add features to downgrade-to-stable popup
UI improvements to popup
Uncomment popup shown pref change
Add initial ruleset for Nimsoft Cloud Monitor

Project of http://www.ca.com/
Improving UI for dev popup
Don't download .xpi in new tab
Merge remote-tracking branch 'negres/master'
Merge branch 'master' of git://gitweb.torproject.org/https-everywhere
Made the dev popup open a new https://www.eff.org/https-everywhere
window before installing stable, to improve the UX
https://trac.torproject.org/projects/tor/ticket/9600
Merge branch 'fix-stable'
[CA Technologies] fixed broken rule: Rule omits forward slash after host name.
Stubbed English into all the locales for the dev popup
https://trac.torproject.org/projects/tor/ticket/9600
Version bump to 4.0development11