aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-08-09 09:29:34 -0400
committerNick Mathewson <nickm@torproject.org>2017-08-09 09:29:34 -0400
commit69222fe87d5c79bd389905b3041f1c2187d6a1e8 (patch)
tree93b4459bee27ab4729065e589eb6a76a151fc6c6
parentd2713b4ddc9d8a98d4b687188bcf392fd3235994 (diff)
downloadtor-69222fe87d5c79bd389905b3041f1c2187d6a1e8.tar.gz
tor-69222fe87d5c79bd389905b3041f1c2187d6a1e8.zip
Clarify that "sandbox 1" requires linux and seccomp2
Closes 22677.
-rw-r--r--changes/bug226773
-rw-r--r--doc/tor.1.txt6
2 files changed, 7 insertions, 2 deletions
diff --git a/changes/bug22677 b/changes/bug22677
new file mode 100644
index 0000000000..6d750172a9
--- /dev/null
+++ b/changes/bug22677
@@ -0,0 +1,3 @@
+ o Documentation:
+ - Clarify in the manual that "Sandbox 1" is only supported on Linux
+ kernels. Closes ticket 22677.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index b4a3cc5f75..dd860af5b9 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -558,8 +558,10 @@ GENERAL OPTIONS
[[Sandbox]] **Sandbox** **0**|**1**::
If set to 1, Tor will run securely through the use of a syscall sandbox.
Otherwise the sandbox will be disabled. The option is currently an
- experimental feature. Can not be changed while tor is running.
-
+ experimental feature. It only works on Linux-based operating systems,
+ and only when Tor has been built with the libseccomp library. This option
+ can not be changed while tor is running.
+ +
When the Sandbox is 1, the following options can not be changed when tor
is running:
Address