sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add changes file and enrich the manual page.

This commit is contained in:
George Kadianakis 2013-06-12 19:01:22 +03:00 committed by Nick Mathewson
parent 1ee3a0cf44
commit 133f380c87
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug8929 Normal file
View File

@ -0,0 +1,4 @@
o Minor features:
- Add a new torrc option "ServerTransportOptions" that allows
bridge operators to pass configuration parameters to their
pluggable transports. Resolves ticket 8929.

5
doc/tor.1.txt
View File

@ -186,6 +186,11 @@ GENERAL OPTIONS
listening address of any pluggable transport proxy that tries to
launch __transport__.
**ServerTransportOptions** __transport__ __k=v__ __k=v__ ...::
When this option is set, Tor will pass the __k=v__ parameters to
any pluggable transport proxy that tries to launch __transport__. +
(Example: ServerTransportOptions obfs45 shared-secret=bridgepasswd cache=/var/lib/tor/cache)
**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