diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-07-12 17:12:43 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-07-12 17:12:43 -0400 |
| commit | aac732322ae132a1659ecbd4039c7d017ddc3d20 (patch) | |
| tree | c3d31d970fb2ce4ffd458e4d415c9f6ce44a29ec /doc | |
| parent | 14d5e7f85e343a48e27c3b8f2b560c4d1aff5315 (diff) | |
| parent | f9c1ba6493478d227c202e4d3444283b2c840a6a (diff) | |
| download | tor-aac732322ae132a1659ecbd4039c7d017ddc3d20.tar tor-aac732322ae132a1659ecbd4039c7d017ddc3d20.tar.gz | |
Merge remote-tracking branch 'public/gsoc-ctoader-cap-phase1-squashed'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index aa37f1baf..a05ab33fc 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -423,6 +423,11 @@ GENERAL OPTIONS proxy authentication that Tor supports; feel free to submit a patch if you want it to support others. +**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. (Default: 0) + **Socks4Proxy** __host__[:__port__]:: Tor will make all OR connections through the SOCKS 4 proxy at host:port (or host:1080 if port is not specified). |