Let load_one_actions_file() use ssplit() like every other function

[privoxy.git] / default.action.master

diff --git a/default.action.master b/default.action.master
index c34bda3..8c2b90b 100644 (file)
--- a/default.action.master
+++ b/default.action.master
@@ -11,7 +11,7 @@
 #
 #  File        :  $Source: /cvsroot/ijbswa/current/default.action.master,v $
 #
-#  $Id: default.action.master,v 1.239 2011/06/25 12:41:17 fabiankeil Exp $
+#  $Id: default.action.master,v 1.244 2012/03/06 18:36:02 fabiankeil Exp $
 #
 #  Requires    :  This version requires Privoxy v3.0.11 or later due to
 #                 syntax changes.
@@ -701,6 +701,8 @@ countr*.
 #MASTER# REMARKS: We still like tor
 # URL = http://metrics.torproject.org/consensus-graphs.html
 metrics.torproject.org/
+# URL = http://linuxcounter.net/
+linuxcounter.net/
 
 #############################################################################
 # Generic block patterns by path:
@@ -728,6 +730,8 @@ metrics.torproject.org/
 support./(.*/)?track
 # URL = http://repo.or.cz/r/vlc.git/objects/ad/1d316efd83157217fdf9b5d417dddca54bbf41
 /.*\.git/objects/
+# URL = http://code.google.com/p/sm-ssc/wiki/Bugtracker?tm=3
+/.*Bugtracker
 
 #############################################################################
 # Exceptions for academia and non-profits
@@ -1312,6 +1316,12 @@ hstse.tradedoubler.com/.*\.swf
 www.zdnetasia.com/.*/sponsor/.*\.gif$
 # Blocked URL = http://pagead2.googlesyndication.com/pagead/imgad?id=CPjtipDs9taquQEQoAEYwgQyCIvo2PNnQywb
 .googlesyndication.com/.*/imgad\?
+#MASTER# BLOCK-REFERRER: http://textsfromlastnight.com/texts/page:19
+# Blocked URL = http://optimize.indieclick.com/www/delivery/avw.php?zoneid=337501&cb=4147152&n=a530d6f1
+#MASTER# BLOCK-REFERRER: http://textsfromlastnight.com/texts/page:19
+optimize.indieclick.com/
+# Blocked URL = http://optimized-by.rubiconproject.com/a/8327/13451/26301-2.img
+optimized-by.rubiconproject.com/
 
 #----------------------------------------------------------------------------
 # Cross-site user tracking
@@ -1808,6 +1818,10 @@ adassier.wordpress.com/
 adassier.files.wordpress.com
 # URL = http://adainitiative.org/about-us/
 adainitiative.org/
+# URL = http://adjamblog.wordpress.com/
+adjamblog.wordpress.com/
+# URL = http://adjamblog.files.wordpress.com/2011/12/cropped-terra.jpg
+adjamblog.files.wordpress.com/
 
 
 #############################################################################
@@ -2135,6 +2149,8 @@ javabog.dk/ijk/
 .couchsurfing.com/
 # URL = http://www.couchsurfing.org/mapsurf.html
 .couchsurfing.org/
+# URL = http://www.thinkgeek.com/tshirts-apparel/unisex/generic/
+.thinkgeek.com/
 
 {-filter{banners-by-link}}
 # Sticky Actions = -filter{banners-by-link}