Merge remote-tracking branch 'upstream/master'

.gitignore

@@ -5,6 +5,7 @@ pkg/crx
 pkg/*.crx
 pkg/*.xpi
 src/chrome/content/rules/default.rulesets
+src/defaults/rulesets.sqlite
 *.swp
 tokenkeys.py*
 .idea

makexpi.sh

@@ -53,9 +53,9 @@ fi
 
 if [ "$1" != "--fast" ] ; then
   if [ -f utils/trivial-validate.py ]; then
-    VALIDATE="./utils/trivial-validate.py --ignoredups google --ignoredups facebook"
+    VALIDATE="python2.7 ./utils/trivial-validate.py --ignoredups google --ignoredups facebook"
   elif [ -f trivial-validate.py ] ; then
-    VALIDATE="python trivial-validate.py --ignoredups google --ignoredups facebook"
+    VALIDATE="python2.7 trivial-validate.py --ignoredups google --ignoredups facebook"
   elif [ -x utils/trivial-validate ] ; then
     # This case probably never happens
     VALIDATE=./utils/trivial-validate
@@ -100,7 +100,7 @@ fi
 
 if [ "$1" != "--fast" -o ! -f "$RULESETS_SQLITE" ] ; then
   echo "Generating sqlite DB"
-  ./utils/make-sqlite.py src/chrome/content/rules
+  python2.7 ./utils/make-sqlite.py src/chrome/content/rules
 fi
 
 # The name/version of the XPI we're building comes from src/install.rdf
@@ -126,7 +126,7 @@ cd src
 rm -f "../$XPI_NAME"
 #zip -q -X -9r "../$XPI_NAME" . "-x@../.build_exclusions"
 
-../utils/create_xpi.py -n "../$XPI_NAME" -x "../.build_exclusions" "."
+python2.7 ../utils/create_xpi.py -n "../$XPI_NAME" -x "../.build_exclusions" "."
 
 ret="$?"
 if [ "$ret" != 0 ]; then

src/Changelog

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