aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.am16
-rw-r--r--configure.in2
-rw-r--r--contrib/Makefile.am3
-rw-r--r--contrib/osx/.cvsignore6
-rw-r--r--contrib/osx/Makefile.am8
-rw-r--r--contrib/osx/PrivoxyConfDesc.plist10
-rw-r--r--contrib/osx/PrivoxyConfInfo.plist20
-rw-r--r--contrib/osx/ReadMe.rtf7
-rw-r--r--contrib/osx/StartupParameters.plist13
-rwxr-xr-xcontrib/osx/Tor48
-rw-r--r--contrib/osx/TorBundleDesc.plist14
-rw-r--r--contrib/osx/TorBundleDesc.plist.in14
-rw-r--r--contrib/osx/TorBundleInfo.plist45
-rw-r--r--contrib/osx/TorBundleInfo.plist.in45
-rwxr-xr-xcontrib/osx/TorBundleWelcome.rtf23
-rw-r--r--contrib/osx/TorDesc.plist10
-rw-r--r--contrib/osx/TorDesc.plist.in10
-rw-r--r--contrib/osx/TorInfo.plist22
-rw-r--r--contrib/osx/TorInfo.plist.in22
-rw-r--r--contrib/osx/TorPostflight36
-rw-r--r--contrib/osx/TorStartupDesc.plist10
-rw-r--r--contrib/osx/TorStartupInfo.plist24
-rwxr-xr-xcontrib/osx/addsysuser42
-rw-r--r--contrib/osx/package.sh147
-rw-r--r--contrib/osx/privoxy.config1073
25 files changed, 1669 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 1e1013e6d..068c15c0d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,6 +24,22 @@ dist-rpm: dist
mv $$RPM_BUILD_DIR/RPMS/*/* .; \
rm -rf $$RPM_BUILD_DIR
+dist-osx:
+ @if [ "x$(prefix)" != 'x/Library/Tor' ]; then \
+ echo "Configure with --prefix=/Library/Tor, please"; \
+ exit 1; \
+ fi; \
+ if [ "x$(bindir)" != 'x/Library/Tor' ]; then \
+ echo "Configure with --bindir=/Library/Tor, please"; \
+ exit 1; \
+ fi; \
+ if [ "x$(sysconfdir)" != 'x/Library' ]; then \
+ echo "Configure with --sysconfdir=/Library, please"; \
+ exit 1; \
+ fi
+ $(MAKE) all
+ VERSION=$(VERSION) sh ./contrib/osx/package.sh
+
doxygen:
doxygen && cd doc/doxygen/latex && make
diff --git a/configure.in b/configure.in
index 19ed847f8..05cd361ac 100644
--- a/configure.in
+++ b/configure.in
@@ -244,7 +244,7 @@ CFLAGS="$CFLAGS -Wall -g -O2"
echo "confdir: $CONFDIR"
-AC_OUTPUT(Makefile tor.spec contrib/tor.sh contrib/torctl contrib/torify contrib/Makefile src/config/torrc.sample doc/tor.1 src/Makefile doc/Makefile doc/design-paper/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/win32/Makefile src/tools/Makefile)
+AC_OUTPUT(Makefile tor.spec contrib/tor.sh contrib/torctl contrib/torify contrib/Makefile contrib/osx/Makefile contrib/osx/TorBundleDesc.plist contrib/osx/TorBundleInfo.plist contrib/osx/TorDesc.plist contrib/osx/TorInfo.plist src/config/torrc.sample doc/tor.1 src/Makefile doc/Makefile doc/design-paper/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/win32/Makefile src/tools/Makefile)
if test -x /usr/bin/perl && test -x ./contrib/updateVersions.pl ; then
./contrib/updateVersions.pl
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 5b073557a..3aa5a2bf6 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,3 +1,6 @@
+SUBDIRS = osx
+DIST_SUBDIRS = osx
+
confdir = $(sysconfdir)/tor
EXTRA_DIST = tor-tsocks.conf torify.1 tor-control.py tor.nsi tor.sh torctl
diff --git a/contrib/osx/.cvsignore b/contrib/osx/.cvsignore
new file mode 100644
index 000000000..1692a251d
--- /dev/null
+++ b/contrib/osx/.cvsignore
@@ -0,0 +1,6 @@
+Makefile
+Makefile.in
+TorBundleDesc.plist
+TorBundleInfo.plist
+TorDesc.plist
+TorInfo.plist
diff --git a/contrib/osx/Makefile.am b/contrib/osx/Makefile.am
new file mode 100644
index 000000000..11380a04b
--- /dev/null
+++ b/contrib/osx/Makefile.am
@@ -0,0 +1,8 @@
+confdir = $(sysconfdir)/tor
+
+EXTRA_DIST = PrivoxyConfDesc.plist PrivoxyConfInfo.plist \
+ ReadMe.rtf StartupParameters.plist Tor TorBundleDesc.plist.in \
+ TorBundleInfo.plist.in TorBundleWelcome.rtf TorDesc.plist.in \
+ TorInfo.plist.in TorStartupDesc.plist TorStartupInfo.plist \
+ package.sh privoxy.config TorPostflight addsysuser
+
diff --git a/contrib/osx/PrivoxyConfDesc.plist b/contrib/osx/PrivoxyConfDesc.plist
new file mode 100644
index 000000000..fcf925d39
--- /dev/null
+++ b/contrib/osx/PrivoxyConfDesc.plist
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IFPkgDescriptionTitle</key>
+ <string>Privoxy configuration for Tor</string>
+ <key>IFPkgDescriptionVersion</key>
+ <string>0.1</string>
+</dict>
+</plist>
diff --git a/contrib/osx/PrivoxyConfInfo.plist b/contrib/osx/PrivoxyConfInfo.plist
new file mode 100644
index 000000000..7294d8960
--- /dev/null
+++ b/contrib/osx/PrivoxyConfInfo.plist
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleGetInfoString</key>
+ <string>Privoxy configuration for Tor</string>
+ <key>CFBundleName</key>
+ <string>Privoxy configuration for Tor</string>
+ <key>CFBundleSortVersionString</key>
+ <string>0.1</string>
+ <key>IFPkgFlagAuthorizationAction</key>
+ <string>RootAuthorization</string>
+ <key>IFPkgFlagRestartAction</key>
+ <string>RecommendedRestart</string>
+ <key>IFPkgFlagFollowLinks</key>
+ <true/>
+ <key>IFPkgFlagIsRequired</key>
+ <false/>
+</dict>
+</plist>
diff --git a/contrib/osx/ReadMe.rtf b/contrib/osx/ReadMe.rtf
new file mode 100644
index 000000000..8922760b5
--- /dev/null
+++ b/contrib/osx/ReadMe.rtf
@@ -0,0 +1,7 @@
+{\rtf1\mac\ansicpg10000\cocoartf102
+{\fonttbl\f0\fswiss\fcharset77 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\margl1440\margr1440\vieww9000\viewh9000\viewkind0
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f0\fs24 \cf0 Tor is a toolset for a wide range of organizations and people who want to improve their safety and security on the Internet. Using Tor can help you anonymize web browsing and publishing, instant messaging, IRC, SSH, and more. Tor also provides a platform on which software developers can build new applications with built-in anonymity, safety, and privacy features.} \ No newline at end of file
diff --git a/contrib/osx/StartupParameters.plist b/contrib/osx/StartupParameters.plist
new file mode 100644
index 000000000..0537b435d
--- /dev/null
+++ b/contrib/osx/StartupParameters.plist
@@ -0,0 +1,13 @@
+{
+ Description = "Tor";
+ Provides = ("tor");
+ Requires = ("Network");
+ Uses = ("Network");
+ OrderPreference = "Last";
+ Messages =
+ {
+ start = "Starting Tor";
+ stop = "Stopping Tor";
+ };
+}
+
diff --git a/contrib/osx/Tor b/contrib/osx/Tor
new file mode 100755
index 000000000..0752b85c5
--- /dev/null
+++ b/contrib/osx/Tor
@@ -0,0 +1,48 @@
+#!/bin/sh
+
+TORCONF=/Library/Tor/torrc
+TORDIR=/Library/Tor/var/lib/tor
+TORPID=/var/run/Tor.pid
+TORUSER=_tor
+TORGROUP=daemon
+TORCMD=/Library/Tor/tor
+
+##
+# Tor Service
+##
+
+. /etc/rc.common
+
+StartService ()
+{
+
+ if [ -f $TORCMD ]; then
+ if pid=$(GetPID Tor); then
+ return 0
+ else
+ ConsoleMessage "Starting Tor Service"
+# Tentative
+# Making sure it is not running (I know it is not a best approarch)
+ killall tor 2>/dev/null
+ $TORCMD -f $TORCONF --runasdaemon 1 --pidfile $TORPID --datadirectory $TORDIR --user $TORUSER --group $TORGROUP &
+ fi
+ fi
+}
+
+StopService ()
+{
+ if pid=$(GetPID Tor); then
+ ConsoleMessage "Stopping Tor Service"
+ kill -TERM "${pid}"
+# Just for sanity (sometimes necessary.)
+ killall tor 2>/dev/null
+ else
+ ConsoleMessage "Tor Service not responding."
+# Just for sanity (sometimes necessary.)
+ killall tor 2>/dev/null
+ fi
+}
+
+RestartService () { StopService; StartService; }
+
+RunService "$1"
diff --git a/contrib/osx/TorBundleDesc.plist b/contrib/osx/TorBundleDesc.plist
new file mode 100644
index 000000000..a958b6e2d
--- /dev/null
+++ b/contrib/osx/TorBundleDesc.plist
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IFPkgDescriptionDeleteWarning</key>
+ <string></string>
+ <key>IFPkgDescriptionDescription</key>
+ <string>Bundled package of Tor 0.1.0.0-alpha-cvs and Privoxy.</string>
+ <key>IFPkgDescriptionTitle</key>
+ <string>Tor - Privoxy Bundle</string>
+ <key>IFPkgDescriptionVersion</key>
+ <string>0.1.0.0-alpha-cvs</string>
+</dict>
+</plist>
diff --git a/contrib/osx/TorBundleDesc.plist.in b/contrib/osx/TorBundleDesc.plist.in
new file mode 100644
index 000000000..60b4a696c
--- /dev/null
+++ b/contrib/osx/TorBundleDesc.plist.in
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IFPkgDescriptionDeleteWarning</key>
+ <string></string>
+ <key>IFPkgDescriptionDescription</key>
+ <string>Bundled package of Tor @VERSION@ and Privoxy.</string>
+ <key>IFPkgDescriptionTitle</key>
+ <string>Tor - Privoxy Bundle</string>
+ <key>IFPkgDescriptionVersion</key>
+ <string>@VERSION@</string>
+</dict>
+</plist>
diff --git a/contrib/osx/TorBundleInfo.plist b/contrib/osx/TorBundleInfo.plist
new file mode 100644
index 000000000..d48ef3a7b
--- /dev/null
+++ b/contrib/osx/TorBundleInfo.plist
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleName</key>
+ <string>Tor Bundle</string>
+ <key>CFBundleGetInfoString</key>
+ <string>Tor Bundle 0.1.0.0-alpha-cvs</string>
+ <key>CFBundleIdentifier</key>
+ <string>net.freehaven.torbundle</string>
+ <key>CFBundleSortVersionString</key>
+ <string>0.1.0.0-alpha-cvs</string>
+ <key>IFPkgFlagComponentDirectory</key>
+ <string>../.contained_packages</string>
+ <key>IFPkgFlagPackageList</key>
+ <array>
+ <dict>
+ <key>IFPkgFlagPackageLocation</key>
+ <string>Tor.pkg</string>
+ <key>IFPkgFlagPackageSelection</key>
+ <string>required</string>
+ </dict>
+ <dict>
+ <key>IFPkgFlagPackageLocation</key>
+ <string>Privoxy.pkg</string>
+ <key>IFPkgFlagPackageSelection</key>
+ <string>selected</string>
+ </dict>
+ <dict>
+ <key>IFPkgFlagPackageLocation</key>
+ <string>privoxyconf.pkg</string>
+ <key>IFPkgFlagPackageSelection</key>
+ <string>selected</string>
+ </dict>
+ <dict>
+ <key>IFPkgFlagPackageLocation</key>
+ <string>torstartup.pkg</string>
+ <key>IFPkgFlagPackageSelection</key>
+ <string>unselected</string>
+ </dict>
+ </array>
+ <key>IFPkgFormatVersion</key>
+ <real>0.10000000149011612</real>
+</dict>
+</plist>
diff --git a/contrib/osx/TorBundleInfo.plist.in b/contrib/osx/TorBundleInfo.plist.in
new file mode 100644
index 000000000..0801d432d
--- /dev/null
+++ b/contrib/osx/TorBundleInfo.plist.in
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleName</key>
+ <string>Tor Bundle</string>
+ <key>CFBundleGetInfoString</key>
+ <string>Tor Bundle @VERSION@</string>
+ <key>CFBundleIdentifier</key>
+ <string>net.freehaven.torbundle</string>
+ <key>CFBundleSortVersionString</key>
+ <string>@VERSION@</string>
+ <key>IFPkgFlagComponentDirectory</key>
+ <string>../.contained_packages</string>
+ <key>IFPkgFlagPackageList</key>
+ <array>
+ <dict>
+ <key>IFPkgFlagPackageLocation</key>
+ <string>Tor.pkg</string>
+ <key>IFPkgFlagPackageSelection</key>
+ <string>required</string>
+ </dict>
+ <dict>
+ <key>IFPkgFlagPackageLocation</key>
+ <string>Privoxy.pkg</string>
+ <key>IFPkgFlagPackageSelection</key>
+ <string>selected</string>
+ </dict>
+ <dict>
+ <key>IFPkgFlagPackageLocation</key>
+ <string>privoxyconf.pkg</string>
+ <key>IFPkgFlagPackageSelection</key>
+ <string>selected</string>
+ </dict>
+ <dict>
+ <key>IFPkgFlagPackageLocation</key>
+ <string>torstartup.pkg</string>
+ <key>IFPkgFlagPackageSelection</key>
+ <string>unselected</string>
+ </dict>
+ </array>
+ <key>IFPkgFormatVersion</key>
+ <real>0.10000000149011612</real>
+</dict>
+</plist>
diff --git a/contrib/osx/TorBundleWelcome.rtf b/contrib/osx/TorBundleWelcome.rtf
new file mode 100755
index 000000000..8feaab090
--- /dev/null
+++ b/contrib/osx/TorBundleWelcome.rtf
@@ -0,0 +1,23 @@
+{\rtf1\mac\ansicpg10001\cocoartf102
+{\fonttbl\f0\fswiss\fcharset77 Helvetica;\f1\fswiss\fcharset77 Helvetica-Bold;}
+{\colortbl;\red255\green255\blue255;}
+\paperw11900\paperh16840\margl1440\margr1440\vieww9000\viewh9000\viewkind0
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
+
+\f0\fs24 \cf0 Welcome to Tor - Privoxy Bundle installer.\
+This will install Tor and privoxy in your computer.\
+\
+
+\f1\b Tor and Privoxy are separate product.\
+It is packaged together for your convenience.
+\f0\b0 \
+\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+\cf0 Tor is a system for using the internet anonymously, and allowing\
+others to do so.\
+\
+For more information, please visit http://www.freehaven.net/tor/\
+\
+Privoxy stands between your web browser and tor to make your web surfing experience safer.\
+\
+For more information, please visit http://www.privoxy.org/} \ No newline at end of file
diff --git a/contrib/osx/TorDesc.plist b/contrib/osx/TorDesc.plist
new file mode 100644
index 000000000..b92341abb
--- /dev/null
+++ b/contrib/osx/TorDesc.plist
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IFPkgDescriptionTitle</key>
+ <string>Tor</string>
+ <key>IFPkgDescriptionVersion</key>
+ <string>0.1.0.0-alpha-cvs</string>
+</dict>
+</plist>
diff --git a/contrib/osx/TorDesc.plist.in b/contrib/osx/TorDesc.plist.in
new file mode 100644
index 000000000..6d7b154dd
--- /dev/null
+++ b/contrib/osx/TorDesc.plist.in
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IFPkgDescriptionTitle</key>
+ <string>Tor</string>
+ <key>IFPkgDescriptionVersion</key>
+ <string>@VERSION@</string>
+</dict>
+</plist>
diff --git a/contrib/osx/TorInfo.plist b/contrib/osx/TorInfo.plist
new file mode 100644
index 000000000..6b439a28b
--- /dev/null
+++ b/contrib/osx/TorInfo.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleGetInfoString</key>
+ <string>Tor 0.1.0.0-alpha-cvs</string>
+ <key>CFBundleName</key>
+ <string>Tor</string>
+ <key>CFBundleSortVersionString</key>
+ <string>0.1.0.0-alpha-cvs</string>
+ <key>IFPkgFlagAllowBackRev</key>
+ <true/>
+ <key>IFPkgFlagAuthorizationAction</key>
+ <string>RootAuthorization</string>
+ <key>IFPkgFlagFollowLinks</key>
+ <true/>
+ <key>IFPkgFlagIsRequired</key>
+ <true/>
+ <key>IFPkgFlagRootVolumeOnly</key>
+ <true/>
+</dict>
+</plist>
diff --git a/contrib/osx/TorInfo.plist.in b/contrib/osx/TorInfo.plist.in
new file mode 100644
index 000000000..b54229920
--- /dev/null
+++ b/contrib/osx/TorInfo.plist.in
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleGetInfoString</key>
+ <string>Tor @VERSION@</string>
+ <key>CFBundleName</key>
+ <string>Tor</string>
+ <key>CFBundleSortVersionString</key>
+ <string>@VERSION@</string>
+ <key>IFPkgFlagAllowBackRev</key>
+ <true/>
+ <key>IFPkgFlagAuthorizationAction</key>
+ <string>RootAuthorization</string>
+ <key>IFPkgFlagFollowLinks</key>
+ <true/>
+ <key>IFPkgFlagIsRequired</key>
+ <true/>
+ <key>IFPkgFlagRootVolumeOnly</key>
+ <true/>
+</dict>
+</plist>
diff --git a/contrib/osx/TorPostflight b/contrib/osx/TorPostflight
new file mode 100644
index 000000000..1a46fcd0f
--- /dev/null
+++ b/contrib/osx/TorPostflight
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+# TorPostflight gets invoked after any install or upgrade.
+
+ADDSYSUSER=$RECEIPT_PATH/addsysuser
+if [ ! -x "$ADDSYSUSER" ]; then
+ echo "Could not find addsysuser script."
+ exit 1
+fi
+
+TORUSER=_tor
+TORGROUP=daemon
+TORDIR=/Library/Tor/var/lib/tor
+
+# Create user $TORUSER in group daemon. If it's already there, great.
+$ADDSYSUSER $TORUSER "Tor System user" $TORDIR
+
+# Create the tor directory, if it doesn't exist.
+if [ ! -d $TORDIR ]; then
+ mkdir -p $TORDIR
+fi
+# Check its permissions.
+chown $TORUSER $TORDIR
+chgrp daemon $TORDIR
+chmod 700 $TORDIR
+
+# Ensure a symbolic link.
+cd /usr/bin
+if [ -e /usr/bin/tor -a ! -L /usr/bin/tor ]; then
+ mv tor tor_old
+fi
+if [ -e /usr/bin/tor-resolve -a ! -L /usr/bin/tor-resolve ]; then
+ mv tor-resolve tor-resolve_old
+fi
+ln -sf /Library/Tor/tor .
+ln -sf /Library/Tor/tor_resolve .
diff --git a/contrib/osx/TorStartupDesc.plist b/contrib/osx/TorStartupDesc.plist
new file mode 100644
index 000000000..b94a12c38
--- /dev/null
+++ b/contrib/osx/TorStartupDesc.plist
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IFPkgDescriptionTitle</key>
+ <string>Tor Startup Script</string>
+ <key>IFPkgDescriptionVersion</key>
+ <string>0.0.9.1</string>
+</dict>
+</plist>
diff --git a/contrib/osx/TorStartupInfo.plist b/contrib/osx/TorStartupInfo.plist
new file mode 100644
index 000000000..7fd729a59
--- /dev/null
+++ b/contrib/osx/TorStartupInfo.plist
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleGetInfoString</key>
+ <string>Tor Startup Script (experimental)</string>
+ <key>CFBundleName</key>
+ <string>Tor Startup Script</string>
+ <key>CFBundleSortVersionString</key>
+ <string>0.1</string>
+ <key>IFPkgFlagAllowBackRev</key>
+ <true/>
+ <key>IFPkgFlagAuthorizationAction</key>
+ <string>RootAuthorization</string>
+ <key>IFPkgFlagRestartAction</key>
+ <string>NoRestart</string>
+ <key>IFPkgFlagFollowLinks</key>
+ <true/>
+ <key>IFPkgFlagIsRequired</key>
+ <false/>
+ <key>IFPkgFlagRootVolumeOnly</key>
+ <true/>
+</dict>
+</plist>
diff --git a/contrib/osx/addsysuser b/contrib/osx/addsysuser
new file mode 100755
index 000000000..62d201fca
--- /dev/null
+++ b/contrib/osx/addsysuser
@@ -0,0 +1,42 @@
+#!/bin/sh
+#
+# Original adduser 05 Feb 2002 by Jon L. Gardner
+#
+# Modified for Tor installer by Nick Mathewson
+
+if [ "`whoami`" != "root" ]; then
+echo "You must be root to execute this script."
+exit
+fi
+if [ "x$3" = "x" ]; then
+echo 'Usage: addsysuser <username> "<full name>" <homedir>'
+exit 0
+fi
+username=$1
+realname=$2
+homedir=$3
+# GID 20 is "staff" which is the default. Change it if you want.
+gid=`niutil -readprop / /groups/daemon gid`
+if [ "x`niutil -list / /users|cut -f2 -d' '|grep $username`" != "x" ]; then
+echo The account $username already exists.
+exit 0
+fi
+# home is the local path to the home directory
+home=/Users/$username
+# defhome is what goes into NetInfo
+defhome="/Network/Servers/MyServer/Users"
+#echo "Determining next available uid (please be patient)..."
+uiddef=`nidump passwd / | cut -d: -f3 | sort -n | tail -n 1`
+uiddef=`echo $uiddef + 1 |bc`
+echo Creating account for $username...
+niutil -create / /users/$username
+niutil -createprop / /users/$username _writers_tim_passwd $username
+niutil -createprop / /users/$username realname $realname
+niutil -createprop / /users/$username _writers_passwd $username
+niutil -createprop / /users/$username uid $uiddef
+#niutil -createprop / /users/$username home_loc "<home_dir><url>afp://afp.server.com/Users/</url><path>$username</path></home_dir>"
+niutil -createprop / /users/$username gid $gid
+niutil -createprop / /users/$username home $homedir
+niutil -createprop / /users/$username name $username
+niutil -createprop / /users/$username passwd '*'
+niutil -createprop / /users/$username shell /dev/null
diff --git a/contrib/osx/package.sh b/contrib/osx/package.sh
new file mode 100644
index 000000000..0a2976226
--- /dev/null
+++ b/contrib/osx/package.sh
@@ -0,0 +1,147 @@
+#!/bin/sh
+# $Id$
+# Copyright 2004 Nick Mathewson.
+# See LICENSE in Tor distribution for licensing information.
+
+# This script builds a Macintosh OS X metapackage containing 4 packages:
+# - One for Tor.
+# - One for Privoxy.
+# - One for a tor-specific privoxy configuration script.
+# - One for Startup scripts for Tor.
+#
+# This script expects to be run from the toplevel makefile, with VERSION
+# set to the latest Tor version, and Tor already built.
+
+# Where have we put the zip file containing Privoxy? Edit this if your
+# privoxy lives somewhere else.
+PRIVOXY_PKG_ZIP=~/src/privoxy-setup/privoxyosx_setup_3.0.3.zip
+
+###
+# Helpful info on OS X packaging:
+# http://developer.apple.com/documentation/DeveloperTools/Conceptual/SoftwareDistribution/index.html
+# man packagemaker
+
+# Make sure VERSION is set, so we don't name the package "Tor Bundle.dmg"
+if [ "XX$VERSION" = 'XX' ]; then
+ echo "VERSION not set."
+ exit 1
+fi
+
+# Where will we put our temporary files?
+BUILD_DIR=/tmp/tor-osx-$$
+# Path to PackageMaker app.
+PACKAGEMAKER=/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker
+
+umask 022
+
+echo I might ask you for your password now, so you can sudo.
+
+sudo rm -rf $BUILD_DIR
+mkdir $BUILD_DIR || exit 1
+for subdir in tor_packageroot tor_resources \
+ torstartup_packageroot \
+ privoxyconf_packageroot \
+ torbundle_resources \
+ output; do
+ mkdir $BUILD_DIR/$subdir
+done
+
+### Make Tor package.
+make install DESTDIR=$BUILD_DIR/tor_packageroot
+mv $BUILD_DIR/tor_packageroot/Library/Tor/torrc.sample $BUILD_DIR/tor_packageroot/Library/Tor/torrc
+cp contrib/osx/ReadMe.rtf $BUILD_DIR/tor_resources
+#cp contrib/osx/License.rtf $BUILD_DIR/tor_resources
+cp contrib/osx/TorPostflight $BUILD_DIR/tor_resources/postflight
+cp contrib/osx/addsysuser $BUILD_DIR/tor_resources/addsysuser
+cat <<EOF > $BUILD_DIR/tor_resources/Welcome.txt
+Tor: an anonymous Internet communication system
+
+Tor is a system for using the internet anonymously, and allowing
+others to do so.
+EOF
+
+find $BUILD_DIR/tor_packageroot -print0 |sudo xargs -0 chown root:admin
+
+$PACKAGEMAKER -build \
+ -p $BUILD_DIR/output/Tor.pkg \
+ -f $BUILD_DIR/tor_packageroot \
+ -r $BUILD_DIR/tor_resources \
+ -i contrib/osx/TorInfo.plist \
+ -d contrib/osx/TorDesc.plist
+
+### Put privoxy configuration package in place.
+mkdir -p $BUILD_DIR/privoxyconf_packageroot/Library/Privoxy
+cp contrib/osx/privoxy.config $BUILD_DIR/privoxyconf_packageroot/Library/Privoxy/config
+
+find $BUILD_DIR/privoxyconf_packageroot -print0 |sudo xargs -0 chown root:admin
+
+$PACKAGEMAKER -build \
+ -p $BUILD_DIR/output/privoxyconf.pkg \
+ -f $BUILD_DIR/privoxyconf_packageroot \
+ -i contrib/osx/PrivoxyConfInfo.plist \
+ -d contrib/osx/PrivoxyConfDesc.plist
+
+### Make Startup Script package
+
+mkdir -p $BUILD_DIR/torstartup_packageroot/Library/StartupItems/Tor
+cp contrib/osx/Tor contrib/osx/StartupParameters.plist \
+ $BUILD_DIR/torstartup_packageroot/Library/StartupItems/Tor
+
+find $BUILD_DIR/torstartup_packageroot -print0 | sudo xargs -0 chown root:admin
+$PACKAGEMAKER -build \
+ -p $BUILD_DIR/output/torstartup.pkg \
+ -f $BUILD_DIR/torstartup_packageroot \
+ -i contrib/osx/TorStartupInfo.plist \
+ -d contrib/osx/TorStartupDesc.plist
+
+### Assemble the metapackage. Packagemaker won't buld metapackages from
+# the command line, so we need to do it by hand.
+
+MPKG=$BUILD_DIR/output/Tor\ Bundle.mpkg
+mkdir -p "$MPKG/Contents/Resources"
+echo -n "pmkrpkg1" > "$MPKG/Contents/PkgInfo"
+cp contrib/osx/ReadMe.rtf "$MPKG/Contents/Resources"
+#cp contrib/osx/License.rtf "$MPKG/Contents/Resources"
+cp contrib/osx/TorBundleInfo.plist "$MPKG/Contents/Info.plist"
+cp contrib/osx/TorBundleWelcome.rtf "$MPKG/Contents/Resources/Welcome.rtf"
+cp contrib/osx/TorBundleDesc.plist "$MPKG/Contents/Resources/Description.plist"
+
+# Move all the subpackages into place. unzip Privoxy.pkg into place,
+# and fix its file permissions so we can rm -rf it later.
+mkdir $BUILD_DIR/output/.contained_packages
+mv $BUILD_DIR/output/*.pkg $BUILD_DIR/OUTPUT/.contained_packages
+( cd $BUILD_DIR/output/.contained_packages && unzip $PRIVOXY_PKG_ZIP && find Privoxy.pkg -type d -print0 | xargs -0 chmod u+w )
+
+### Copy readmes and licenses into toplevel.
+PRIVOXY_RESDIR=$BUILD_DIR/output/.contained_packages/Privoxy.pkg/Contents/Resources
+cp $PRIVOXY_RESDIR/License.html $BUILD_DIR/output/Privoxy\ License.html
+cp $PRIVOXY_RESDIR/ReadMe.txt $BUILD_DIR/output/Privoxy\ ReadMe.txt
+cp contrib/osx/ReadMe.rtf $BUILD_DIR/output/Tor\ ReadMe.rtf
+cp LICENSE $BUILD_DIR/output/Tor\ License.txt
+
+### Assemble documentation
+
+DOC=$BUILD_DIR/output/Documents
+mkdir $DOC
+cp doc/tor-doc.html doc/tor-doc.css $DOC
+cp AUTHORS $DOC/AUTHORS.txt
+groff doc/tor.1 -T ps -m man | ps2pdf - $DOC/tor-reference.pdf
+groff doc/tor-resolve.1 -T ps -m man | ps2pdf - $DOC/tor-resolve.pdf
+
+mkdir $DOC/Advanced
+cp doc/tor-spec.txt doc/rend-spec.txt doc/control-spec.txt doc/socks-extensions.txt $DOC/Advanced
+cp doc/CLIENTS $DOC/Advanced/CLIENTS.txt
+cp doc/HACKING $DOC/Advanced/HACKING.txt
+cp ChangeLog $DOC/Advanced/ChangeLog.txt
+
+### Package it all into a DMG
+
+find $BUILD_DIR/output -print0 | sudo xargs -0 chown root:admin
+
+mv $BUILD_DIR/output "$BUILD_DIR/Tor $VERSION Bundle"
+rm -f "Tor $VERSION Bundle.dmg"
+USER="`whoami`"
+sudo hdiutil create -format UDZO -srcfolder "$BUILD_DIR/Tor $VERSION Bundle" "Tor $VERSION Bundle.dmg"
+sudo chown "$USER" "Tor $VERSION Bundle.dmg"
+
+sudo rm -rf $BUILD_DIR
diff --git a/contrib/osx/privoxy.config b/contrib/osx/privoxy.config
new file mode 100644
index 000000000..90a5fdb43
--- /dev/null
+++ b/contrib/osx/privoxy.config
@@ -0,0 +1,1073 @@
+# Sample Configuration File for Privoxy v3.0.x
+#
+# Copyright (C) 2001-2004 Privoxy Developers http://privoxy.org
+#
+# $Id$
+#
+####################################################################
+# #
+# Table of Contents #
+# #
+# I. INTRODUCTION #
+# II. FORMAT OF THE CONFIGURATION FILE #
+# #
+# 1. CONFIGURATION AND LOG FILE LOCATIONS #
+# 2. LOCAL SET-UP DOCUMENTATION #
+# 3. DEBUGGING #
+# 4. ACCESS CONTROL AND SECURITY #
+# 5. FORWARDING #
+# 6. WINDOWS GUI OPTIONS #
+# #
+####################################################################
+#
+#
+# I. INTRODUCTION
+# ===============
+#
+# This file holds the Privoxy configuration. If you modify this file,
+# you will need to send a couple of requests to the proxy before any
+# changes take effect.
+#
+# When starting Privoxy on Unix systems, give the name of this file as
+# an argument. On Windows systems, Privoxy will look for this file
+# with the name 'config.txt' in the same directory where Privoxy
+# is installed.
+#
+#
+# II. FORMAT OF THE CONFIGURATION FILE
+# ====================================
+#
+# Configuration lines consist of an initial keyword followed by a
+# list of values, all separated by whitespace (any number of spaces
+# or tabs). For example,
+#
+# actionsfile default.action
+#
+# Indicates that the actionsfile is named 'default.action'.
+#
+# The '#' indicates a comment. Any part of a line following a '#'
+# is ignored, except if the '#' is preceded by a '\'.
+#
+# Thus, by placing a # at the start of an existing configuration line,
+# you can make it a comment and it will be treated as if it weren't
+# there. This is called "commenting out" an option and can be useful.
+#
+# Note that commenting out and option and leaving it at its default
+# are two completely different things! Most options behave very
+# differently when unset. See the the "Effect if unset" explanation
+# in each option's description for details.
+#
+# Long lines can be continued on the next line by using a `\' as the
+# last character.
+#
+
+#
+# 1. CONFIGURATION AND LOG FILE LOCATIONS
+# =======================================
+#
+# Privoxy can (and normally does) use a number of other files for
+# additional configuration, help and logging. This section of the
+# configuration file tells Privoxy where to find those other files.
+#
+# The user running Privoxy, must have read permission for all
+# configuration files, and write permission to any files that would
+# be modified, such as log files and actions files.
+#
+
+#
+# 1.1. confdir
+# ============
+#
+# Specifies:
+#
+# The directory where the other configuration files are located
+#
+# Type of value:
+#
+# Path name
+#
+# Default value:
+#
+# /etc/privoxy (Unix) or Privoxy installation dir (Windows)
+#
+# Effect if unset:
+#
+# Mandatory
+#
+# Notes:
+#
+# No trailing "/", please
+#
+# When development goes modular and multi-user, the blocker,
+# filter, and per-user config will be stored in subdirectories of
+# "confdir". For now, the configuration directory structure is
+# flat, except for confdir/templates, where the HTML templates
+# for CGI output reside (e.g. Privoxy's 404 error page).
+#
+confdir .
+
+#
+# 1.2. logdir
+# ===========
+#
+# Specifies:
+#
+# The directory where all logging takes place (i.e. where logfile
+# and jarfile are located)
+#
+# Type of value:
+#
+# Path name
+#
+# Default value:
+#
+# /var/log/privoxy (Unix) or Privoxy installation dir (Windows)
+#
+# Effect if unset:
+#
+# Mandatory
+#
+# Notes:
+#
+# No trailing "/", please
+#
+logdir .
+
+#
+# 1.3. actionsfile
+# ================
+#
+# Specifies:
+#
+# The actions file(s) to use
+#
+# Type of value:
+#
+# File name, relative to confdir, without the .action suffix
+#
+# Default values:
+#
+# standard # Internal purposes, no editing recommended
+#
+# default # Main actions file
+#
+# user # User customizations
+#
+# Effect if unset:
+#
+# No actions are taken at all. Simple neutral proxying.
+#
+# Notes:
+#
+# Multiple actionsfile lines are permitted, and are in fact
+# recommended!
+#
+# The default values include standard.action, which is used
+# for internal purposes and should be loaded, default.action,
+# which is the "main" actions file maintained by the developers,
+# and user.action, where you can make your personal additions.
+#
+# Actions files are where all the per site and per URL
+# configuration is done for ad blocking, cookie management,
+# privacy considerations, etc. There is no point in using Privoxy
+# without at least one actions file.
+#
+actionsfile standard # Internal purpose, recommended
+actionsfile default # Main actions file
+actionsfile user # User customizations
+
+#
+# 1.4. filterfile
+# ===============
+#
+# Specifies:
+#
+# The filter file to use
+#
+# Type of value:
+#
+# File name, relative to confdir
+#
+# Default value:
+#
+# default.filter (Unix) or default.filter.txt (Windows)
+#
+# Effect if unset:
+#
+# No textual content filtering takes place, i.e. all +filter{name}
+# actions in the actions files are turned neutral.
+#
+# Notes:
+#
+# The filter file contains content modification rules that use
+# regular expressions. These rules permit powerful changes on the
+# content of Web pages, e.g., you could disable your favorite
+# JavaScript annoyances, re-write the actual displayed text,
+# or just have some fun replacing "Microsoft" with "MicroSuck"
+# wherever it appears on a Web page.
+#
+# The +filter{name} actions rely on the relevant filter (name)
+# to be defined in the filter file!
+#
+# A pre-defined filter file called default.filter that contains
+# a bunch of handy filters for common problems is included in the
+# distribution. See the section on the filter action for a list.
+#
+filterfile default.filter
+
+#
+# 1.5. logfile
+# ============
+#
+# Specifies:
+#
+# The log file to use
+#
+# Type of value:
+#
+# File name, relative to logdir
+#
+# Default value:
+#
+# logfile (Unix) or privoxy.log (Windows)
+#
+# Effect if unset:
+#
+# No log file is used, all log messages go to the console (STDERR).
+#
+# Notes:
+#
+# The windows version will additionally log to the console.
+#
+# The logfile is where all logging and error messages are
+# written. The level of detail and number of messages are set with
+# the debug option (see below). The logfile can be useful for
+# tracking down a problem with Privoxy (e.g., it's not blocking
+# an ad you think it should block) but in most cases you probably
+# will never look at it.
+#
+# Your logfile will grow indefinitely, and you will probably
+# want to periodically remove it. On Unix systems, you can do
+# this with a cron job (see "man cron"). For Red Hat, a logrotate
+# script has been included.
+#
+# On SuSE Linux systems, you can place a line like
+# "/var/log/privoxy.* +1024k 644 nobody.nogroup" in /etc/logfiles,
+# with the effect that cron.daily will automatically archive,
+# gzip, and empty the log, when it exceeds 1M size.
+#
+# Any log files must be writable by whatever user Privoxy is
+# being run as (default on UNIX, user id is "privoxy").
+#
+logfile logfile
+
+#
+# 1.6. jarfile
+# ============
+#
+# Specifies:
+#
+# The file to store intercepted cookies in
+#
+# Type of value:
+#
+# File name, relative to logdir
+#
+# Default value:
+#
+# jarfile (Unix) or privoxy.jar (Windows)
+#
+# Effect if unset:
+#
+# Intercepted cookies are not stored at all.
+#
+# Notes:
+#
+# The jarfile may grow to ridiculous sizes over time.
+#
+jarfile jarfile
+
+#
+# 1.7. trustfile
+# ==============
+#
+# Specifies:
+#
+# The trust file to use
+#
+# Type of value:
+#
+# File name, relative to confdir
+#
+# Default value:
+#
+# Unset (commented out). When activated: trust (Unix) or trust.txt
+# (Windows)
+#
+# Effect if unset:
+#
+# The entire trust mechanism is turned off.
+#
+# Notes:
+#
+# The trust mechanism is an experimental feature for building
+# white-lists and should be used with care. It is NOT recommended
+# for the casual user.
+#
+# If you specify a trust file, Privoxy will only allow access to
+# sites that are specified in the trustfile. Sites can be listed
+# in one of two ways:
+#
+# Prepending a ~ character limits access to this site only (and
+# any sub-paths within this site), e.g. ~www.example.com.
+#
+# Or, you can designate sites as trusted referrers, by prepending
+# the name with a + character. The effect is that access to
+# untrusted sites will be granted -- but only if a link from this
+# trusted referrer was used. The link target will then be added
+# to the "trustfile" so that future, direct accesses will be
+# granted. Sites added via this mechanism do not become trusted
+# referrers themselves (i.e. they are added with a ~ designation).
+#
+# If you use the + operator in the trust file, it may grow
+# considerably over time.
+#
+# It is recommended that Privoxy be compiled with the
+# --disable-force, --disable-toggle and --disable-editor options,
+# if this feature is to be used.
+#
+# Possible applications include limiting Internet access for
+# children.
+#
+#trustfile trust
+
+#
+# 2. LOCAL SET-UP DOCUMENTATION
+# =============================
+#
+# If you intend to operate Privoxy for more users than just yourself,
+# it might be a good idea to let them know how to reach you, what
+# you block and why you do that, your policies, etc.
+#
+
+#
+# 2.1. user-manual
+# ================
+#
+# Specifies:
+#
+# Location of the Privoxy User Manual.
+#
+# Type of value:
+#
+# A fully qualified URI
+#
+# Default value:
+#
+# Unset
+#
+# Effect if unset:
+#
+# http://www.privoxy.org/version/user-manual/ will be used,
+# where version is the Privoxy version.
+#
+# Notes:
+#
+# The User Manual URI is used for help links from some of the
+# internal CGI pages. The manual itself is normally packaged
+# with the binary distributions, so you probably want to set this
+# to a locally installed copy. For multi-user setups, you could
+# provide a copy on a local webserver for all your users and use
+# the corresponding URL here.
+#
+# Examples:
+#
+# Unix, in local filesystem:
+#
+# user-manual file:///usr/share/doc/privoxy-3.0.1/user-manual/index.html
+#
+# Windows, in local filesystem, must use forward slash notation,
+# and %20 to denote spaces in path names:
+#
+# user-manual file:///c:/some%20dir/privoxy/user-manual/index.html
+#
+# Windows, UNC notation (forward slashes required again):
+#
+# user-manual file://///some-server/some-path/privoxy/user-manual/index.html
+#
+# Any platform, on local webserver (called "local-webserver"):
+#
+# user-manual http://local-webserver/privoxy-user-manual/
+#
+# WARNING!!!
+#
+# If set, this option should be the first option in the config
+# file, because it is used while the config file is being read.
+#
+#user-manual http://www.privoxy.org/user-manual/
+
+#
+# 2.2. trust-info-url
+# ===================
+#
+# Specifies:
+#
+# A URL to be displayed in the error page that users will see if
+# access to an untrusted page is denied.
+#
+# Type of value:
+#
+# URL
+#
+# Default value:
+#
+# Two example URL are provided
+#
+# Effect if unset:
+#
+# No links are displayed on the "untrusted" error page.
+#
+# Notes:
+#
+# The value of this option only matters if the experimental trust
+# mechanism has been activated. (See trustfile above.)
+#
+# If you use the trust mechanism, it is a good idea to write
+# up some on-line documentation about your trust policy and to
+# specify the URL(s) here. Use multiple times for multiple URLs.
+#
+# The URL(s) should be added to the trustfile as well, so users
+# don't end up locked out from the information on why they were
+# locked out in the first place!
+#
+trust-info-url http://www.example.com/why_we_block.html
+trust-info-url http://www.example.com/what_we_allow.html
+
+#
+# 2.3. admin-address
+# ==================
+#
+# Specifies:
+#
+# An email address to reach the proxy administrator.
+#
+# Type of value:
+#
+# Email address
+#
+# Default value:
+#
+# Unset
+#
+# Effect if unset:
+#
+# No email address is displayed on error pages and the CGI user
+# interface.
+#
+# Notes:
+#
+# If both admin-address and proxy-info-url are unset, the whole
+# "Local Privoxy Support" box on all generated pages will not
+# be shown.
+#
+#admin-address privoxy-admin@example.com
+
+#
+# 2.4. proxy-info-url
+# ===================
+#
+# Specifies:
+#
+# A URL to documentation about the local Privoxy setup,
+# configuration or policies.
+#
+# Type of value:
+#
+# URL
+#
+# Default value:
+#
+# Unset
+#
+# Effect if unset:
+#
+# No link to local documentation is displayed on error pages and
+# the CGI user interface.
+#
+# Notes:
+#
+# If both admin-address and proxy-info-url are unset, the whole
+# "Local Privoxy Support" box on all generated pages will not
+# be shown.
+#
+# This URL shouldn't be blocked ;-)
+#
+#proxy-info-url http://www.example.com/proxy-service.html
+
+#
+# 3. DEBUGGING
+# ============
+#
+# These options are mainly useful when tracing a problem. Note that
+# you might also want to invoke Privoxy with the --no-daemon command
+# line option when debugging.
+#
+
+#
+# 3.1. debug
+# ==========
+#
+# Specifies:
+#
+# Key values that determine what information gets logged to
+# the logfile.
+#
+# Type of value:
+#
+# Integer values
+#
+# Default value:
+#
+# 12289 (i.e.: URLs plus informational and warning messages)
+#
+# Effect if unset:
+#
+# Nothing gets logged.
+#
+# Notes:
+#
+# The available debug levels are:
+#
+# debug 1 # show each GET/POST/CONNECT request
+# debug 2 # show each connection status
+# debug 4 # show I/O status
+# debug 8 # show header parsing
+# debug 16 # log all data into the logfile
+# debug 32 # debug force feature
+# debug 64 # debug regular expression filter
+# debug 128 # debug fast redirects
+# debug 256 # debug GIF de-animation
+# debug 512 # Common Log Format
+# debug 1024 # debug kill pop-ups
+# debug 2048 # CGI user interface
+# debug 4096 # Startup banner and warnings.
+# debug 8192 # Non-fatal errors
+#
+# To select multiple debug levels, you can either add them or
+# use multiple debug lines.
+#
+# A debug level of 1 is informative because it will show you each
+# request as it happens. 1, 4096 and 8192 are highly recommended
+# so that you will notice when things go wrong. The other levels
+# are probably only of interest if you are hunting down a specific
+# problem. They can produce a hell of an output (especially 16).
+#
+# The reporting of fatal errors (i.e. ones which crash Privoxy)
+# is always on and cannot be disabled.
+#
+# If you want to use CLF (Common Log Format), you should set
+# "debug 512" ONLY and not enable anything else.
+#
+debug 1 # show each GET/POST/CONNECT request
+debug 4096 # Startup banner and warnings
+debug 8192 # Errors - *we highly recommended enabling this*
+
+#
+# 3.2. single-threaded
+# ====================
+#
+# Specifies:
+#
+# Whether to run only one server thread
+#
+# Type of value:
+#
+# None
+#
+# Default value:
+#
+# Unset
+#
+# Effect if unset:
+#
+# Multi-threaded (or, where unavailable: forked) operation,
+# i.e. the ability to serve multiple requests simultaneously.
+#
+# Notes:
+#
+# This option is only there for debug purposes and you should
+# never need to use it. It will drastically reduce performance.
+#
+#single-threaded
+
+#
+# 4. ACCESS CONTROL AND SECURITY
+# ==============================
+#
+# This section of the config file controls the security-relevant
+# aspects of Privoxy's configuration.
+#
+
+#
+# 4.1. listen-address
+# ===================
+#
+# Specifies:
+#
+# The IP address and TCP port on which Privoxy will listen for
+# client requests.
+#
+# Type of value:
+#
+# [IP-Address]:Port
+#
+# Default value:
+#
+# 127.0.0.1:8118
+#
+# Effect if unset:
+#
+# Bind to 127.0.0.1 (localhost), port 8118. This is suitable and
+# recommended for home users who run Privoxy on the same machine
+# as their browser.
+#
+# Notes:
+#
+# You will need to configure your browser(s) to this proxy address
+# and port.
+#
+# If you already have another service running on port 8118, or
+# if you want to serve requests from other machines (e.g. on your
+# local network) as well, you will need to override the default.
+#
+# If you leave out the IP address, Privoxy will bind to all
+# interfaces (addresses) on your machine and may become reachable
+# from the Internet. In that case, consider using access control
+# lists (ACL's, see below), and/or a firewall.
+#
+# If you open Privoxy to untrusted users, you will also want
+# to turn off the enable-edit-actions and enable-remote-toggle
+# options!
+#
+# Example:
+#
+# Suppose you are running Privoxy on a machine which has the
+# address 192.168.0.1 on your local private network (192.168.0.0)
+# and has another outside connection with a different address. You
+# want it to serve requests from inside only:
+#
+# listen-address 192.168.0.1:8118
+#
+listen-address 127.0.0.1:8118
+
+#
+# 4.2. toggle
+# ===========
+#
+# Specifies:
+#
+# Initial state of "toggle" status
+#
+# Type of value:
+#
+# 1 or 0
+#
+# Default value:
+#
+# 1
+#
+# Effect if unset:
+#
+# Act as if toggled on
+#
+# Notes:
+#
+# If set to 0, Privoxy will start in "toggled off" mode,
+# i.e. behave like a normal, content-neutral proxy where all ad
+# blocking, filtering, etc are disabled. See enable-remote-toggle
+# below. This is not really useful anymore, since toggling is
+# much easier via the web interface than via editing the conf file.
+#
+# The windows version will only display the toggle icon in the
+# system tray if this option is present.
+#
+toggle 1
+
+#
+# 4.3. enable-remote-toggle
+# =========================
+#
+# Specifies:
+#
+# Whether or not the web-based toggle feature may be used
+#
+# Type of value:
+#
+# 0 or 1
+#
+# Default value:
+#
+# 1
+#
+# Effect if unset:
+#
+# The web-based toggle feature is disabled.
+#
+# Notes:
+#
+# When toggled off, Privoxy acts like a normal, content-neutral
+# proxy, i.e. it acts as if none of the actions applied to
+# any URL.
+#
+# For the time being, access to the toggle feature can not be
+# controlled separately by "ACLs" or HTTP authentication, so that
+# everybody who can access Privoxy (see "ACLs" and listen-address
+# above) can toggle it for all users. So this option is not
+# recommended for multi-user environments with untrusted users.
+#
+# Note that you must have compiled Privoxy with support for this
+# feature, otherwise this option has no effect.
+#
+enable-remote-toggle 1
+
+#
+# 4.4. enable-edit-actions
+# ========================
+#
+# Specifies:
+#
+# Whether or not the web-based actions file editor may be used
+#
+# Type of value:
+#
+# 0 or 1
+#
+# Default value:
+#
+# 1
+#
+# Effect if unset:
+#
+# The web-based actions file editor is disabled.
+#
+# Notes:
+#
+# For the time being, access to the editor can not be controlled
+# separately by "ACLs" or HTTP authentication, so that everybody
+# who can access Privoxy (see "ACLs" and listen-address above)
+# can modify its configuration for all users. So this option is
+# not recommended for multi-user environments with untrusted users.
+#
+# Note that you must have compiled Privoxy with support for this
+# feature, otherwise this option has no effect.
+#
+enable-edit-actions 1
+
+#
+# 4.5. ACLs: permit-access and deny-access
+# ========================================
+#
+# Specifies:
+#
+# Who can access what.
+#
+# Type of value:
+#
+# src_addr[/src_masklen] [dst_addr[/dst_masklen]]
+#
+# Where src_addr and dst_addr are IP addresses in dotted decimal
+# notation or valid DNS names, and src_masklen and dst_masklen are
+# subnet masks in CIDR notation, i.e. integer values from 2 to 30
+# representing the length (in bits) of the network address. The
+# masks and the whole destination part are optional.
+#
+# Default value:
+#
+# Unset
+#
+# Effect if unset:
+#
+# Don't restrict access further than implied by listen-address
+#
+# Notes:
+#
+# Access controls are included at the request of ISPs and systems
+# administrators, and are not usually needed by individual
+# users. For a typical home user, it will normally suffice to
+# ensure that Privoxy only listens on the localhost (127.0.0.1)
+# or internal (home) network address by means of the listen-address
+# option.
+#
+# Please see the warnings in the FAQ that this proxy is not
+# intended to be a substitute for a firewall or to encourage
+# anyone to defer addressing basic security weaknesses.
+#
+# Multiple ACL lines are OK. If any ACLs are specified, then
+# the Privoxy talks only to IP addresses that match at least one
+# permit-access line and don't match any subsequent deny-access
+# line. In other words, the last match wins, with the default
+# being deny-access.
+#
+# If Privoxy is using a forwarder (see forward below) for a
+# particular destination URL, the dst_addr that is examined is
+# the address of the forwarder and NOT the address of the ultimate
+# target. This is necessary because it may be impossible for the
+# local Privoxy to determine the IP address of the ultimate target
+# (that's often what gateways are used for).
+#
+# You should prefer using IP addresses over DNS names, because
+# the address lookups take time. All DNS names must resolve! You
+# can not use domain patterns like "*.org" or partial domain
+# names. If a DNS name resolves to multiple IP addresses, only
+# the first one is used.
+#
+# Denying access to particular sites by ACL may have undesired
+# side effects if the site in question is hosted on a machine
+# which also hosts other sites.
+#
+# Examples:
+#
+# Explicitly define the default behavior if no ACL and
+# listen-address are set: "localhost" is OK. The absence of a
+# dst_addr implies that all destination addresses are OK:
+#
+# permit-access localhost
+#
+# Allow any host on the same class C subnet as www.privoxy.org
+# access to nothing but www.example.com:
+#
+# permit-access www.privoxy.org/24 www.example.com/32
+#
+# Allow access from any host on the 26-bit subnet 192.168.45.64
+# to anywhere, with the exception that 192.168.45.73 may not
+# access www.dirty-stuff.example.com:
+#
+# permit-access 192.168.45.64/26
+# deny-access 192.168.45.73 www.dirty-stuff.example.com
+#
+
+#
+# 4.6. buffer-limit
+# =================
+#
+# Specifies:
+#
+# Maximum size of the buffer for content filtering.
+#
+# Type of value:
+#
+# Size in Kbytes
+#
+# Default value:
+#
+# 4096
+#
+# Effect if unset:
+#
+# Use a 4MB (4096 KB) limit.
+#
+# Notes:
+#
+# For content filtering, i.e. the +filter and +deanimate-gif
+# actions, it is necessary that Privoxy buffers the entire document
+# body. This can be potentially dangerous, since a server could
+# just keep sending data indefinitely and wait for your RAM to
+# exhaust -- with nasty consequences. Hence this option.
+#
+# When a document buffer size reaches the buffer-limit, it is
+# flushed to the client unfiltered and no further attempt to filter
+# the rest of the document is made. Remember that there may be
+# multiple threads running, which might require up to buffer-limit
+# Kbytes each, unless you have enabled "single-threaded" above.
+#
+buffer-limit 4096
+
+#
+# 5. FORWARDING
+# =============
+#
+# This feature allows routing of HTTP requests through a chain
+# of multiple proxies. It can be used to better protect privacy
+# and confidentiality when accessing specific domains by routing
+# requests to those domains through an anonymous public proxy (see
+# e.g. http://www.multiproxy.org/anon_list.htm) Or to use a caching
+# proxy to speed up browsing. Or chaining to a parent proxy may be
+# necessary because the machine that Privoxy runs on has no direct
+# Internet access.
+#
+# Also specified here are SOCKS proxies. Privoxy supports the SOCKS
+# 4 and SOCKS 4A protocols.
+#
+
+#
+# 5.1. forward
+# ============
+#
+# Specifies:
+#
+# To which parent HTTP proxy specific requests should be routed.
+#
+# Type of value:
+#
+# target_pattern http_parent[:port]
+#
+# where target_pattern is a URL pattern that specifies to which
+# requests (i.e. URLs) this forward rule shall apply. Use /
+# to denote "all URLs". http_parent[:port] is the DNS name or
+# IP address of the parent HTTP proxy through which the requests
+# should be forwarded, optionally followed by its listening port
+# (default: 8080). Use a single dot (.) to denote "no forwarding".
+#
+# Default value:
+#
+# Unset
+#
+# Effect if unset:
+#
+# Don't use parent HTTP proxies.
+#
+# Notes:
+#
+# If http_parent is ".", then requests are not forwarded to
+# another HTTP proxy but are made directly to the web servers.
+#
+# Multiple lines are OK, they are checked in sequence, and the
+# last match wins.
+#
+# Examples:
+#
+# Everything goes to an example anonymizing proxy, except SSL on
+# port 443 (which it doesn't handle):
+#
+# forward / anon-proxy.example.org:8080
+# forward :443 .
+#
+# Everything goes to our example ISP's caching proxy, except for
+# requests to that ISP's sites:
+#
+# forward / caching-proxy.example-isp.net:8000
+# forward .example-isp.net .
+#
+
+#
+# 5.2. forward-socks4 and forward-socks4a
+# =======================================
+#
+# Specifies:
+#
+# Through which SOCKS proxy (and to which parent HTTP proxy)
+# specific requests should be routed.
+#
+# Type of value:
+#
+# target_pattern socks_proxy[:port] http_parent[:port]
+#
+# where target_pattern is a URL pattern that specifies to which
+# requests (i.e. URLs) this forward rule shall apply. Use / to
+# denote "all URLs". http_parent and socks_proxy are IP addresses
+# in dotted decimal notation or valid DNS names (http_parent may
+# be "." to denote "no HTTP forwarding"), and the optional port
+# parameters are TCP ports, i.e. integer values from 1 to 64535
+#
+# Default value:
+#
+# Unset
+#
+# Effect if unset:
+#
+# Don't use SOCKS proxies.
+#
+# Notes:
+#
+# Multiple lines are OK, they are checked in sequence, and the
+# last match wins.
+#
+# The difference between forward-socks4 and forward-socks4a
+# is that in the SOCKS 4A protocol, the DNS resolution of the
+# target hostname happens on the SOCKS server, while in SOCKS 4
+# it happens locally.
+#
+# If http_parent is ".", then requests are not forwarded to another
+# HTTP proxy but are made (HTTP-wise) directly to the web servers,
+# albeit through a SOCKS proxy.
+#
+# Examples:
+#
+# From the company example.com, direct connections are made to all
+# "internal" domains, but everything outbound goes through their
+# ISP's proxy by way of example.com's corporate SOCKS 4A gateway
+# to the Internet.
+#
+# forward-socks4a / socks-gw.example.com:1080 www-cache.example-isp.net:8080
+# forward .example.com .
+#
+# A rule that uses a SOCKS 4 gateway for all destinations but no
+# HTTP parent looks like this:
+#
+# forward-socks4 / socks-gw.example.com:1080 .
+#
+forward-socks4a / localhost:9050 .
+
+#
+# 6. WINDOWS GUI OPTIONS
+# ======================
+#
+# Privoxy has a number of options specific to the Windows GUI
+# interface:
+#
+
+# If "activity-animation" is set to 1, the Privoxy icon will animate
+# when "Privoxy" is active. To turn off, set to 0.
+#
+#activity-animation 1
+
+# If "log-messages" is set to 1, Privoxy will log messages to the
+# console window:
+#
+#log-messages 1
+
+# If "log-buffer-size" is set to 1, the size of the log buffer,
+# i.e. the amount of memory used for the log messages displayed in
+# the console window, will be limited to "log-max-lines" (see below).
+#
+# Warning: Setting this to 0 will result in the buffer to grow
+# infinitely and eat up all your memory!
+#
+#log-buffer-size 1
+
+# log-max-lines is the maximum number of lines held in the log
+# buffer. See above.
+#
+#log-max-lines 200
+
+# If "log-highlight-messages" is set to 1, Privoxy will highlight
+# portions of the log messages with a bold-faced font:
+#
+#log-highlight-messages 1
+
+# The font used in the console window:
+#
+#log-font-name Comic Sans MS
+
+# Font size used in the console window:
+#
+#log-font-size 8
+
+# "show-on-task-bar" controls whether or not Privoxy will appear as
+# a button on the Task bar when minimized:
+#
+#show-on-task-bar 0
+
+# If "close-button-minimizes" is set to 1, the Windows close button
+# will minimize Privoxy instead of closing the program (close with
+# the exit option on the File menu).
+#
+#close-button-minimizes 1
+
+# The "hide-console" option is specific to the MS-Win console version
+# of Privoxy. If this option is used, Privoxy will disconnect from
+# and hide the command console.
+#
+#hide-console
+
+#
generated by cgit v1.2.3 (git 2.45.0) at 2024-12-15 17:09:46 +0000