diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-11-27 22:18:16 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-11-27 22:18:16 -0500 |
| commit | 190c1d4981e5751aabd3d894095851c830f1d570 (patch) | |
| tree | a832d932339382cb7f43fb33a255d7507e037c2e /doc/tor.1.txt | |
| parent | 267c0e5aa14deeb2ca0d7997b4ef5a5c2bbf5fd4 (diff) | |
| parent | 6f21d2e49657ada264cace9da7cf6945b4fc073d (diff) | |
| download | tor-190c1d4981e5751aabd3d894095851c830f1d570.tar tor-190c1d4981e5751aabd3d894095851c830f1d570.tar.gz | |
Merge branch 'bug7013_take2_squashed'
Diffstat (limited to 'doc/tor.1.txt')
| -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 1e1ff1e83..1a7f8d597 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -181,6 +181,11 @@ GENERAL OPTIONS using __options__ as its command-line options, and expects to receive proxied client traffic from it. +**ServerTransportListenAddr** __transport__ __IP__:__PORT__:: + When this option is set, Tor will suggest __IP__:__PORT__ as the + listening address of any pluggable transport proxy that tries to + launch __transport__. + **ConnLimit** __NUM__:: The minimum number of file descriptors that must be available to the Tor process before it will start. Tor will ask the OS for as many file |