summaryrefslogtreecommitdiffstats
path: root/wiki/src/contribute/design/Tor_enforcement/Proxy.mdwn
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2015-03-03 10:25:45 +0000
committerintrigeri <intrigeri@boum.org>2015-03-03 10:25:45 +0000
commit131d8f78a3cbd86f0fdba929e72130b80070c134 (patch)
tree7edd2164003fac96d2a25201ffe3e642b3f7b15b /wiki/src/contribute/design/Tor_enforcement/Proxy.mdwn
parent9e7aa97db078177c8f36d227a22b8a79da5096b6 (diff)
parent5ec5f06708514a494044e40a175e8d80fa446e5a (diff)
Merge remote-tracking branch 'origin/master' into faq/7926-apt-get-upgradefaq/7926-apt-get-upgrade
Diffstat (limited to 'wiki/src/contribute/design/Tor_enforcement/Proxy.mdwn')
-rw-r--r--wiki/src/contribute/design/Tor_enforcement/Proxy.mdwn10
1 files changed, 0 insertions, 10 deletions
diff --git a/wiki/src/contribute/design/Tor_enforcement/Proxy.mdwn b/wiki/src/contribute/design/Tor_enforcement/Proxy.mdwn
deleted file mode 100644
index 7389363..0000000
--- a/wiki/src/contribute/design/Tor_enforcement/Proxy.mdwn
+++ /dev/null
@@ -1,10 +0,0 @@
-Polipo provides with caching HTTP proxy functionality. It contacts the
-Tor software via SOCKS5 to make the real connections: [[!tails_gitweb
-config/chroot_local-includes/etc/polipo/config]].
-
-In case the firewall is buggy or not properly started, proxy settings
-are used as part of a defence in depth strategy:
-
-- The standard `http_proxy` and `HTTP_PROXY` environment variables are
- globally set in [[!tails_gitweb
- config/chroot_local-includes/etc/environment]] to point to Polipo.