diff options
| author | George Kadianakis <desnacked@riseup.net> | 2013-06-12 19:01:22 +0300 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-07-18 08:45:03 -0400 |
| commit | 133f380c87854af2ddd6f05f5d5f0cda197197b5 (patch) | |
| tree | f77575549bca8e53474001341398a53f2298de96 | |
| parent | 1ee3a0cf4440f34c024ff61a320e0b16553a3558 (diff) | |
| download | tor-133f380c87854af2ddd6f05f5d5f0cda197197b5.tar tor-133f380c87854af2ddd6f05f5d5f0cda197197b5.tar.gz | |
Add changes file and enrich the manual page.
| -rw-r--r-- | changes/bug8929 | 4 | ||||
| -rw-r--r-- | doc/tor.1.txt | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/changes/bug8929 b/changes/bug8929 new file mode 100644 index 000000000..2a1898b8a --- /dev/null +++ b/changes/bug8929 @@ -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. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index a05ab33fc..bade531a0 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -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 |