[tor-commits] [orbot/master] add new binaries and configs for polipo and others

Fri May 2 14:10:38 UTC 2014

commit 0178d3e4de35307ab130186e0803074994677cab
Author: Nathan Freitas <nathan at freitas.net>
Date:   Thu Apr 24 23:44:29 2014 -0400

    add new binaries and configs for polipo and others
---
 res/raw/obfsclient.mp3 |  Bin 3318009 -> 3318009 bytes
 res/raw/polipo.mp3     |  Bin 0 -> 312051 bytes
 res/raw/privoxy.mp3    |  Bin 306370 -> 0 bytes
 res/raw/privoxy_config |   27 --------
 res/raw/tor.mp3        |  Bin 1815448 -> 1815448 bytes
 res/raw/torpolipo.conf |  161 ++++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 161 insertions(+), 27 deletions(-)

diff --git a/res/raw/obfsclient.mp3 b/res/raw/obfsclient.mp3
index fab36e2..da065cb 100644
Binary files a/res/raw/obfsclient.mp3 and b/res/raw/obfsclient.mp3 differ
diff --git a/res/raw/polipo.mp3 b/res/raw/polipo.mp3
new file mode 100644
index 0000000..69fdf9f
Binary files /dev/null and b/res/raw/polipo.mp3 differ
diff --git a/res/raw/privoxy.mp3 b/res/raw/privoxy.mp3
deleted file mode 100644
index 2459aac..0000000
Binary files a/res/raw/privoxy.mp3 and /dev/null differ
diff --git a/res/raw/privoxy_config b/res/raw/privoxy_config
deleted file mode 100755
index 525b58a..0000000
--- a/res/raw/privoxy_config
+++ /dev/null
@@ -1,27 +0,0 @@
-# Generally, this file goes in /etc/privoxy/config
-#
-# Tor listens as a SOCKS4a proxy here:
-forward-socks4a / 127.0.0.1:9050 .
-confdir /data/data/org.torproject.android
-logdir /data/data/org.torproject.android
-# actionsfile standard  # Internal purpose, recommended
-#actionsfile default.action   # Main actions file
-#actionsfile user.action      # User customizations
-#filterfile default.filter
-
-# Don't log interesting things, only startup messages, warnings and errors
-#logfile logfile
-#jarfile jarfile
-#debug 1
-#debug   0    # show each GET/POST/CONNECT request
-#debug   4096 # Startup banner and warnings
-#debug   8192 # Errors - *we highly recommended enabling this*
-
-#user-manual /usr/share/doc/privoxy/user-manual
-listen-address  127.0.0.1:8118
-toggle  1
-accept-intercepted-requests 1 
-enable-remote-toggle 0
-enable-edit-actions 0
-enable-remote-http-toggle 0
-buffer-limit 4096
\ No newline at end of file
diff --git a/res/raw/tor.mp3 b/res/raw/tor.mp3
index 62adbdc..56bd825 100644
Binary files a/res/raw/tor.mp3 and b/res/raw/tor.mp3 differ
diff --git a/res/raw/torpolipo.conf b/res/raw/torpolipo.conf
new file mode 100644
index 0000000..32850f6
--- /dev/null
+++ b/res/raw/torpolipo.conf
@@ -0,0 +1,161 @@
+### Basic configuration
+### *******************
+
+# Uncomment one of these if you want to allow remote clients to
+# connect:
+
+# proxyAddress = "::0"        # both IPv4 and IPv6
+# proxyAddress = "0.0.0.0"    # IPv4 only
+
+proxyAddress = "127.0.0.1"
+proxyPort = 8118
+
+# If you do that, you'll want to restrict the set of hosts allowed to
+# connect:
+
+# allowedClients = "127.0.0.1, 134.157.168.57"
+# allowedClients = "127.0.0.1, 134.157.168.0/24"
+
+allowedClients = 127.0.0.1
+allowedPorts = 1-65535
+
+# Uncomment this if you want your Polipo to identify itself by
+# something else than the host name:
+
+proxyName = "localhost"
+
+# Uncomment this if there's only one user using this instance of Polipo:
+
+cacheIsShared = false
+
+# Uncomment this if you want to use a parent proxy:
+
+# parentProxy = "squid.example.org:3128"
+
+# Uncomment this if you want to use a parent SOCKS proxy:
+
+socksParentProxy = "localhost:9050"
+socksProxyType = socks5
+
+
+### Memory
+### ******
+
+# Uncomment this if you want Polipo to use a ridiculously small amount
+# of memory (a hundred C-64 worth or so):
+
+# chunkHighMark = 819200
+# objectHighMark = 128
+
+# Uncomment this if you've got plenty of memory:
+
+# chunkHighMark = 50331648
+# objectHighMark = 16384
+
+chunkHighMark = 67108864
+
+### On-disk data
+### ************
+
+# Uncomment this if you want to disable the on-disk cache:
+
+diskCacheRoot = ""
+
+# Uncomment this if you want to put the on-disk cache in a
+# non-standard location:
+
+# diskCacheRoot = "~/.polipo-cache/"
+
+# Uncomment this if you want to disable the local web server:
+
+localDocumentRoot = ""
+
+# Uncomment this if you want to enable the pages under /polipo/index?
+# and /polipo/servers?.  This is a serious privacy leak if your proxy
+# is shared.
+
+# disableIndexing = false
+# disableServersList = false
+
+disableLocalInterface = true
+disableConfiguration = true
+
+### Domain Name System
+### ******************
+
+# Uncomment this if you want to contact IPv4 hosts only (and make DNS
+# queries somewhat faster):
+#
+# dnsQueryIPv6 = no
+
+# Uncomment this if you want Polipo to prefer IPv4 to IPv6 for
+# double-stack hosts:
+#
+# dnsQueryIPv6 = reluctantly
+
+# Uncomment this to disable Polipo's DNS resolver and use the system's
+# default resolver instead.  If you do that, Polipo will freeze during
+# every DNS query:
+
+dnsUseGethostbyname = yes
+
+
+### HTTP
+### ****
+
+# Uncomment this if you want to enable detection of proxy loops.
+# This will cause your hostname (or whatever you put into proxyName
+# above) to be included in every request:
+
+disableVia = true
+
+# Uncomment this if you want to slightly reduce the amount of
+# information that you leak about yourself:
+
+# censoredHeaders = from, accept-language
+# censorReferer = maybe
+
+censoredHeaders = from,accept-language,x-pad,link
+censorReferer = maybe
+
+# Uncomment this if you're paranoid.  This will break a lot of sites,
+# though:
+
+# censoredHeaders = set-cookie, cookie, cookie2, from, accept-language
+# censorReferer = true
+
+# Uncomment this if you want to use Poor Man's Multiplexing; increase
+# the sizes if you're on a fast line.  They should each amount to a few
+# seconds' worth of transfer; if pmmSize is small, you'll want
+# pmmFirstSize to be larger.
+
+# Note that PMM is somewhat unreliable.
+
+# pmmFirstSize = 16384
+# pmmSize = 8192
+
+# Uncomment this if your user-agent does something reasonable with
+# Warning headers (most don't):
+
+# relaxTransparency = maybe
+
+# Uncomment this if you never want to revalidate instances for which
+# data is available (this is not a good idea):
+
+# relaxTransparency = yes
+
+# Uncomment this if you have no network:
+
+# proxyOffline = yes
+
+# Uncomment this if you want to avoid revalidating instances with a
+# Vary header (this is not a good idea):
+
+# mindlesslyCacheVary = true
+
+# Suggestions from Incognito configuration
+maxConnectionAge = 5m
+maxConnectionRequests = 120
+serverMaxSlots = 8
+serverSlots = 2
+tunnelAllowedPorts = 1-65535



