From 133f380c87854af2ddd6f05f5d5f0cda197197b5 Mon Sep 17 00:00:00 2001 From: George Kadianakis Date: Wed, 12 Jun 2013 19:01:22 +0300 Subject: [PATCH] Add changes file and enrich the manual page. --- changes/bug8929 | 4 ++++ doc/tor.1.txt | 5 +++++ 2 files changed, 9 insertions(+) create mode 100644 changes/bug8929 diff --git a/changes/bug8929 b/changes/bug8929 new file mode 100644 index 0000000000..2a1898b8a9 --- /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 a05ab33fce..bade531a07 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