summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2019-01-04 10:52:50 +0000
committerintrigeri <intrigeri@boum.org>2019-01-04 10:52:50 +0000
commita5e22a177a912a73f27234a7de342811b42b7b0e (patch)
treeb440df2bfe28391bc3ea053ed4d617299a1d48c4
parentbb76938cca399e6307aa9931bf54dd8a06e03425 (diff)
Revert "Temporarily disable tor's sandbox (refs: #15480)"
This reverts commit 750cdccab8eb4571c4eb53796d42e078cf9fc45e. The bug this was working around (https://trac.torproject.org/projects/tor/ticket/25440) was fixed in Tor 0.3.4.
-rwxr-xr-xconfig/chroot_local-includes/etc/NetworkManager/dispatcher.d/10-tor.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/config/chroot_local-includes/etc/NetworkManager/dispatcher.d/10-tor.sh b/config/chroot_local-includes/etc/NetworkManager/dispatcher.d/10-tor.sh
index ee8424d..e0a1714 100755
--- a/config/chroot_local-includes/etc/NetworkManager/dispatcher.d/10-tor.sh
+++ b/config/chroot_local-includes/etc/NetworkManager/dispatcher.d/10-tor.sh
@@ -42,9 +42,9 @@ systemctl --no-block restart tails-tor-has-bootstrapped.target
# configuration is needed. Too bad users who simply need to configure
# a HTTP proxy or allowed firewall ports won't get the sandboxing, but
# much better than nothing.
-# if [ "$(tails_netconf)" = "direct" ]; then
-# tor_set_in_torrc Sandbox 1
-# fi
+if [ "$(tails_netconf)" = "direct" ]; then
+ tor_set_in_torrc Sandbox 1
+fi
# We would like Tor to be started during init time, even before the
# network is up, and then send it a SIGHUP here to make it start