diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-08-24 09:23:43 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-08-24 09:23:43 -0400 |
| commit | d37e8b407a762316e89e0c0a613c26372ec897aa (patch) | |
| tree | ef968b1b87dabe3ce5258af990e3edccefd31e26 /doc | |
| parent | f4f828640f25d73e9a29c3d901af4ab594de0d56 (diff) | |
| parent | a0bb1ff6ab0be8faa7284aec3f7f93e31e8578d9 (diff) | |
| download | tor-d37e8b407a762316e89e0c0a613c26372ec897aa.tar.gz tor-d37e8b407a762316e89e0c0a613c26372ec897aa.zip | |
Merge branch 'feature22976_squashed'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 5bfafba1d9..03af9c4be8 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -775,6 +775,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 -------------- |