Merged remote-tracking branch 'upstream/master'.

jpds-zz · jpds-zz · commit 259f6c8b5c4b · 2013-10-19T08:19:07.000Z
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -12,6 +12,10 @@ Incorporating code from Convergence
 Copyright © Moxie Marlinspike
 Licensed GPL v3+
 
+The build system incorporates code from Python 2.6,
+Copyright © 2001-2006 Python Software Foundation
+Python Software Foundation License Version 2 
+
 Net License:  GPL v3+ (complete tree)
               GPL v2+ (if Moxie's NSS.js is absent)
 
diff --git a/src/chrome/content/rules/XHamster.com.xml b/src/chrome/content/rules/XHamster.com.xml
@@ -51,7 +51,7 @@
 	*** Unsecurable
 
 -->
-<ruleset name="xHamster.com (partial)">
+<ruleset name="xHamster.com (buggy)" default_off="reportedly breaks videos">
 
 	<target host="xhamster.com" />
 	<target host="*.xhamster.com" />
@@ -70,4 +70,4 @@
 	<rule from="^http://suggestions\.xhamster\.com/track\.gif"
 		to="https://xhamster.uservoice.com/track.gif" />
 
-</ruleset>
+</ruleset>
diff --git a/utils/zipfile_deterministic.py b/utils/zipfile_deterministic.py
@@ -3,6 +3,10 @@
 This module aims to create deterministic, byte-for-byte identical zip files.
 
 Author: Yan Zhu, yan@mit.edu
+
+Derived from Python 2.6, Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006
+Python Software Foundation; All Rights Reserved, License at
+http://www.python.org/download/releases/2.6/license/
 """
 
 import struct, os, time, sys, shutil
