[HTTPS-Everywhere] Big merge coming

[Jacob Hoffman-Andrews]

Hi all,

The 4.0 and master branches are highly diverged. In order to make sure 
all of the code from 4.0 is in master (including Yan's Android port!), 
I've done a big merge of 4.0 and master, following the procedure below. 
Right now this merge is on a branch. Early tomorrow I'll plan on merging 
that branch into master. If you see any issues with the merge or the 
procedure, please speak up. Thanks!

https://github.com/jsha/https-everywhere/tree/merge-4.0b

This is a big merge of 4.0 into master. I've merged the JS and related files
manually. For the rules, I followed this procedure:

git checkout -b merge-4.0b master
git merge 4.0
rm src/chrome/content/rules/*
cp ~/https-everywhere2/src/chrome/content/rules/* src/chrome/content/rules/
git add .
git commit

(where ~/https-everywhere2/ is checked out to master). In other words, this
brings the merge history of master up to date with 4.0, but keeps the 
rules in
master exactly the same. I've checked all the relevant divergences to see if
there are any ruleset fixes in 4.0 that aren't yet cherry-picked into 
master. It
appears there are not.

In future all ruleset fixes should be made in 4.0 then merged into 
master, rather
than made in master and cherry-picked into 4.0. This will make mergin much
easier.