summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-08-09 10:42:37 -0400
committerNick Mathewson <nickm@torproject.org>2017-08-09 10:45:48 -0400
commiteb43401bfb6d69db66d256582a99e63de7d222d8 (patch)
treea3a27cd622b1d4797fa28bfe87d09d56401ba683 /doc
parent94352368db9045a9704c713dbbc0f41ecc511910 (diff)
downloadtor-eb43401bfb6d69db66d256582a99e63de7d222d8.tar.gz
tor-eb43401bfb6d69db66d256582a99e63de7d222d8.zip
Add a 'NoExec' option that causes tor_spawn_background() to fail
Core of an implementation for 22976.
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index b4a3cc5f75..fb19ce38b3 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -773,6 +773,13 @@ GENERAL OPTIONS
circuits. If the option is set to "default", we obey a
parameter in the consensus document. (Default: auto)
+[[NoExec]] **NoExec** **0**|**1**::
+ If this option is set to 1, then Tor will never launch another
+ executable, regardless of the settings of PortForwardingHelper,
+ ClientTransportPlugin, or ServerTransportPlugin. Once this
+ option has been set to 1, it cannot be set back to 0 without
+ restarting Tor. (Default: 0)
+
CLIENT OPTIONS
--------------