summaryrefslogtreecommitdiffstats
path: root/config/chroot_local-includes/etc/environment
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2014-12-03 13:01:52 +0100
committerTails developers <amnesia@boum.org>2014-12-03 13:01:52 +0100
commit1138ffbed4936969f0068ad29aeefb7b1bcb7697 (patch)
tree0c5e2a39fb2863125984321a8f4e0c717e3d1644 /config/chroot_local-includes/etc/environment
parent56c42191c0620c45c7659cce16b564467bb80759 (diff)
parent7999371f600097af34fe489d80a8eb253fe5778c (diff)
Merge https://git-tails.immerda.ch/tails into doc/projectdoc/projectdoc/7536-project
Diffstat (limited to 'config/chroot_local-includes/etc/environment')
-rw-r--r--config/chroot_local-includes/etc/environment4
1 files changed, 0 insertions, 4 deletions
diff --git a/config/chroot_local-includes/etc/environment b/config/chroot_local-includes/etc/environment
index a503d1e..940df33 100644
--- a/config/chroot_local-includes/etc/environment
+++ b/config/chroot_local-includes/etc/environment
@@ -5,10 +5,6 @@ HTTPS_PROXY=http://127.0.0.1:8118
SOCKS_SERVER=127.0.0.1:9050
SOCKS5_SERVER=127.0.0.1:9050
-# Torbutton 1.5.1+ uses those environment variables
-TOR_SOCKS_HOST='127.0.0.1'
-TOR_SOCKS_PORT='9151'
-
# Allow Torbutton access to the control port filter (for new identity).
# Setting a password is required, otherwise Torbutton attempts to
# read the authentication cookie file instead, which fails.