tor

commit 53c82c0821737ce76bb99a75b5f309d0b2d715ba
parent 18f3f1ffa3b2f08418b52f55dfe059c5b5d864b4
Author: Nick Mathewson <nickm@torproject.org>
Date:   Thu, 24 Aug 2017 09:18:03 -0400

Merge branch 'bug22677'

Diffstat:
A
changes/bug22677
 | 
3
+++
M
doc/tor.1.txt
 | 
6
++++--

2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/changes/bug22677 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
@@ -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