Internet Archive
[Internet Archive] Glob missing target

For cross-domain cookie.
[Internet Archive] Add exclusion for s3.us.archive.org

Server gives "connection refused" on port 443
Internet Archive asked to exclude wayback machine
Unbreak the Internet Archives stats pages

The graphite images are not available over HTTPS
[Internet Archive] Add comment
[Internet Archive] Cosmetics
default off per webmaster request
[Applicom] default off by webmaster request
Making it so changes to a ruleset state works even when a ruleset
preference is previously present.
https://trac.torproject.org/projects/tor/ticket/8776

Conflicts:
	src/chrome/content/toolbar_button.js
Mostly working code to show a notificationBox only when upgrading from
an earlier HTTPS Everywhere version that doesn't have a prefs_version.
https://trac.torproject.org/projects/tor/ticket/8776

Conflicts:
	src/chrome/content/toolbar_button.js
Added un-translated string https-everywhere.migration.notification0 to
all the locales.
https://trac.torproject.org/projects/tor/ticket/8776

Conflicts:
	src/chrome/locale/ar/https-everywhere.properties
	src/chrome/locale/fa/https-everywhere.properties
	src/chrome/locale/hr/https-everywhere.properties
	src/chrome/locale/ja/https-everywhere.properties
	src/chrome/locale/si/https-everywhere.properties
	src/chrome/locale/sl/https-everywhere.properties
	src/chrome/locale/tr/https-everywhere.properties
	src/chrome/locale/zh-CN/https-everywhere.properties
Fix migratePreferences notification display
Change tooltip notification behavior

Show the notification in the top window, then open a FAQ
tab and switch to it when the user closes the notification.
Remove tooltip event listener
Upgrading prefs_version again after first prefsMigration
The first batch of rules getting marked platform="mixedcontent".
https://trac.torproject.org/projects/tor/ticket/9196

Conflicts:
	src/chrome/content/rules/33Across.xml
	src/chrome/content/rules/AccessNow.xml
	src/chrome/content/rules/Aftenposten.xml
	src/chrome/content/rules/Amnesty-International-mismatches.xml
	src/chrome/content/rules/Antispam.de.xml
	src/chrome/content/rules/Arizona_State_University-problematic.xml
	src/chrome/content/rules/BareMetal.xml
	src/chrome/content/rules/Bing.xml
	src/chrome/content/rules/BitInstant.xml
	src/chrome/content/rules/Booking.com.xml
	src/chrome/content/rules/Brainshark.xml
	src/chrome/content/rules/BurstNET.xml
	src/chrome/content/rules/CDON.COM.xml
	src/chrome/content/rules/CIO.com.au.xml
	src/chrome/content/rules/CPSC.xml
	src/chrome/content/rules/CRN.xml
	src/chrome/content/rules/CanalDigital.xml
	src/chrome/content/rules/Check_Point-problematic.xml
	src/chrome/content/rules/Cheezburger.xml
	src/chrome/content/rules/Chemical_Abstracts_Service.xml
	src/chrome/content/rules/Commission_Junction.xml
	src/chrome/content/rules/CompareTheMarket.xml
	src/chrome/content/rules/DataCell.xml
	src/chrome/content/rules/DealExtreme.xml
	src/chrome/content/rules/Delicious.xml
	src/chrome/content/rules/Demand-Base.xml
	src/chrome/content/rules/Demand-Media.xml
	src/chrome/content/rules/Demandware-mismatches.xml
	src/chrome/content/rules/DomainSponsor.xml
	src/chrome/content/rules/DomainTools.xml
	src/chrome/content/rules/E621.net.xml
	src/chrome/content/rules/EW-Scripps-Company-mismatches.xml
	src/chrome/content/rules/FitBit.xml
	src/chrome/content/rules/Florida_Today.xml
	src/chrome/content/rules/GMX.xml
	src/chrome/content/rules/George-Mason-University.xml
	src/chrome/content/rules/Georgetown_University.xml
	src/chrome/content/rules/GetFirebug.xml
	src/chrome/content/rules/GetPersonas.xml
	src/chrome/content/rules/IDG.com.au.xml
	src/chrome/content/rules/IDG.se.xml
	src/chrome/content/rules/Live-Nation.xml
	src/chrome/content/rules/MODX.xml
	src/chrome/content/rules/Microsoft_Store.xml
	src/chrome/content/rules/Parcelforce.xml
	src/chrome/content/rules/S2-Games-mismatches.xml
	src/chrome/content/rules/UCSD.edu.xml
	src/chrome/content/rules/University-of-Alaska.xml
	src/chrome/content/rules/University-of-Applied-Sciences-Rapperswil-mismatches.xml
	src/chrome/content/rules/VehBidz.xml
	src/chrome/content/rules/Wikimedia.xml
	src/chrome/content/rules/Zendesk.com.xml
Accidentally marked rules platform="mixedcontent" multiple times.
Undoing that.
https://trac.torproject.org/projects/tor/ticket/9196

Conflicts:
	src/chrome/content/rules/Amnesty-International-mismatches.xml
	src/chrome/content/rules/EW-Scripps-Company-mismatches.xml
Another batch of rules marked platform="mixedcontent"
https://trac.torproject.org/projects/tor/ticket/9196

Conflicts:
	src/chrome/content/rules/Benefitsweb.com.xml
	src/chrome/content/rules/Directgov-mismatches.xml
	src/chrome/content/rules/Ecommerce.xml
	src/chrome/content/rules/Fandango.xml
	src/chrome/content/rules/Fineproxy.org-problematic.xml
	src/chrome/content/rules/ICANN.xml
	src/chrome/content/rules/IEEE-mismatches.xml
	src/chrome/content/rules/Infoworld.com.xml
	src/chrome/content/rules/IsoHunt.xml
	src/chrome/content/rules/Jinx.com.xml
	src/chrome/content/rules/KAU.se-problematic.xml
	src/chrome/content/rules/Khronos.xml
	src/chrome/content/rules/KrebsOnSecurity.com.xml
	src/chrome/content/rules/Legacy.com.xml
	src/chrome/content/rules/Linux.com.xml
	src/chrome/content/rules/Local.ch.xml
	src/chrome/content/rules/MandS.xml
	src/chrome/content/rules/MediaTemple.xml
	src/chrome/content/rules/MyBuys.xml
	src/chrome/content/rules/NTVB-Media.xml
	src/chrome/content/rules/NYDailyNews.xml
	src/chrome/content/rules/NetIQ.xml
	src/chrome/content/rules/NetworkWorld-mismatches.xml
	src/chrome/content/rules/NordicHardware-mismatches.xml
	src/chrome/content/rules/NordicHardware.xml
	src/chrome/content/rules/Norton.xml
	src/chrome/content/rules/ON24-mismatches.xml
	src/chrome/content/rules/Ooyala-mismatches.xml
	src/chrome/content/rules/OpenID.xml
	src/chrome/content/rules/Opensource.com.xml
	src/chrome/content/rules/Pardot-mismatches.xml
	src/chrome/content/rules/Pearson.xml
	src/chrome/content/rules/Postini.xml
	src/chrome/content/rules/PriceGrabber.xml
	src/chrome/content/rules/PriceRunner.xml
	src/chrome/content/rules/Prolexic.xml
	src/chrome/content/rules/PublicIntelligence.net.xml
	src/chrome/content/rules/Quantcast.xml
	src/chrome/content/rules/RSPCA.xml
	src/chrome/content/rules/Rapid7.xml
	src/chrome/content/rules/RedIRIS.es.xml
	src/chrome/content/rules/Reddit.xml
	src/chrome/content/rules/Ripe.net.xml
	src/chrome/content/rules/RottenTomatoes.xml
	src/chrome/content/rules/Rutgers_University.xml
	src/chrome/content/rules/Sciencemag.org.xml
	src/chrome/content/rules/ShopLocal.xml
	src/chrome/content/rules/Shopify.xml
	src/chrome/content/rules/Sixxs.net.xml
	src/chrome/content/rules/SodaHead.com.xml
	src/chrome/content/rules/Sony-europe.com.xml
	src/chrome/content/rules/T-Mobile.xml
	src/chrome/content/rules/Techdirt.xml
	src/chrome/content/rules/TorrentFreak.com.xml
	src/chrome/content/rules/TrialPay.xml
	src/chrome/content/rules/Tucows-mismatches.xml
	src/chrome/content/rules/UBM-mismatches.xml
	src/chrome/content/rules/UN.org.xml
	src/chrome/content/rules/University-of-Southern-California-mismatches.xml
	src/chrome/content/rules/Verified-Voting.xml
	src/chrome/content/rules/Webkit.org.xml
	src/chrome/content/rules/turku.fi.xml
Marking more rules as platform="mixedcontent"
https://trac.torproject.org/projects/tor/ticket/9196