summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2011-10-19 13:28:28 +0200
committerTails developers <amnesia@boum.org>2011-10-19 13:28:28 +0200
commitea99653f8b2251d78455407ce3250b9839183987 (patch)
tree71f3fd8eec1c1d1e3ba5295b46ca42f176350719
parent47bc5b8cfc1ec07610ae41d34266a9dc614744b5 (diff)
Revert "Tor: disable ControlPort since the ControlSocket is now enabled by default."
This reverts commit 73397e5ee1c08b28c9bbff05db0e69cff0d83d05. The Torbutton "New identity" feature does not support ControlSocket yet: https://trac.torproject.org/projects/tor/ticket/3967
-rw-r--r--config/chroot_local-includes/etc/tor/torrc5
1 files changed, 5 insertions, 0 deletions
diff --git a/config/chroot_local-includes/etc/tor/torrc b/config/chroot_local-includes/etc/tor/torrc
index e4f91b4..c42eb76 100644
--- a/config/chroot_local-includes/etc/tor/torrc
+++ b/config/chroot_local-includes/etc/tor/torrc
@@ -50,6 +50,11 @@ SocksListenAddress 127.0.0.1 # accept connections only from localhost
## things in $HOME/.tor on Unix, and in Application Data\tor on Windows.
#DataDirectory /var/lib/tor
+## The port on which Tor will listen for local connections from Tor
+## controller applications, as documented in control-spec.txt.
+ControlPort 9051
+ControlListenAddress 127.0.0.1
+
############### This section is just for location-hidden services ###
## Once you have configured a hidden service, you can look at the