Skip to content

Commit f9bc985

Browse files
flyingstar16flyingstar16
committed
Merge branch 'master' of git://git.torproject.org/https-everywhere
2 parents 6f56e58 + 3ee1011 commit f9bc985

File tree

98 files changed

+1720
-594
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+1720
-594
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ pkg/crx
55
pkg/*.crx
66
pkg/*.xpi
77
src/chrome/content/rules/default.rulesets
8+
src/defaults/rulesets.sqlite
89
*.swp
910
tokenkeys.py*
1011
.idea

‎makexpi.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ fi
5353

5454
if [ "$1" != "--fast" ] ; then
5555
if [ -f utils/trivial-validate.py ]; then
56-
VALIDATE="./utils/trivial-validate.py --ignoredups google --ignoredups facebook"
56+
VALIDATE="python2.7 ./utils/trivial-validate.py --ignoredups google --ignoredups facebook"
5757
elif [ -f trivial-validate.py ] ; then
58-
VALIDATE="python trivial-validate.py --ignoredups google --ignoredups facebook"
58+
VALIDATE="python2.7 trivial-validate.py --ignoredups google --ignoredups facebook"
5959
elif [ -x utils/trivial-validate ] ; then
6060
# This case probably never happens
6161
VALIDATE=./utils/trivial-validate
@@ -100,7 +100,7 @@ fi
100100

101101
if [ "$1" != "--fast" -o ! -f "$RULESETS_SQLITE" ] ; then
102102
echo "Generating sqlite DB"
103-
./utils/make-sqlite.py src/chrome/content/rules
103+
python2.7 ./utils/make-sqlite.py src/chrome/content/rules
104104
fi
105105

106106
# The name/version of the XPI we're building comes from src/install.rdf
@@ -126,7 +126,7 @@ cd src
126126
rm -f "../$XPI_NAME"
127127
#zip -q -X -9r "../$XPI_NAME" . "-x@../.build_exclusions"
128128

129-
../utils/create_xpi.py -n "../$XPI_NAME" -x "../.build_exclusions" "."
129+
python2.7 ../utils/create_xpi.py -n "../$XPI_NAME" -x "../.build_exclusions" "."
130130

131131
ret="$?"
132132
if [ "$ret" != 0 ]; then

‎src/Changelog‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,27 @@
1+
4.0development.15 (2014-02-??)
2+
* Replace the single XML ruleset library with an sqlite database of rulesets
3+
that are loaded on demand
4+
- reduces startup time by a factor of 10-20:
5+
https://trac.torproject.org/projects/tor/ticket/10174
6+
- reduces RAM usage https://trac.torproject.org/projects/tor/ticket/4804
7+
- Is scalable: https://trac.torproject.org/projects/tor/ticket/6118
8+
Further analysis in this thread:
9+
https://lists.eff.org/pipermail/https-everywhere/2014-January/001919.html
10+
* Implement a cleanup case to recover from some Observatory UI code bugs that
11+
would leave the Observatory off incorrectly.
12+
https://trac.torproject.org/projects/tor/ticket/10728
13+
* Fix observatory - private browsing mode interaction
14+
https://trac.torproject.org/projects/tor/ticket/10208
15+
* Ship 848 new rulesets
16+
* Update cert whitelist
17+
18+
3.5android.0 (2014-01-31)
19+
* First Firefox for Android release! :D
20+
* Major UI changes for mobile compatibility
21+
* Android channel update URL set to
22+
https://www.eff.org/files/https-everywhere-android-update-2048.rdf
23+
* Updated rulesets: Freenode, Imgur
24+
125
3.4.5 (2014-01-03)
226
* Updated license
327
* Updated README.md

0 commit comments

Comments
 (0)