commit fe6614657d384b15a0386b89d654bb75738e856a Author: George Kadianakis desnacked@riseup.net Date: Wed Jun 12 13:00:12 2013 +0300

Split "Server behavior" section into smaller sections. --- pt-spec.txt | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/pt-spec.txt b/pt-spec.txt index 4cefcfe..2cc02bd 100644 --- a/pt-spec.txt +++ b/pt-spec.txt @@ -139,29 +139,33 @@ Server behavior then Tor will launch the megaproxy binary twice: once with the option --foo and once with the option --bar.

- The address that a managed proxy will use to bind can be configured with: - ServerTransportListenAddr <method> address:port + Specify bind address

- For example, a valid configuration would be: - ServerTransportPlugin obfs2,obfs3,stegotorus exec /usr/bin/obfsproxy --managed - ServerTransportListenAddr obfs2 0.0.0.0:4200 - ServerTransportListenAddr stegotorus 98.23.4.45:6559 + The address that a managed proxy will use to bind can be configured with: + ServerTransportListenAddr <method> address:port

- If no ServerTransportListenAddr is specified and it's the first time - that Tor encounters that transport, Tor will instruct the managed - proxy to bind to a random TCP port on 0.0.0.0. If Tor has seen the - trasport before, it will instruct the managed proxy to bind to the - same TCP port that the transport used last time. + For example, a valid configuration would be: + ServerTransportPlugin obfs2,obfs3,stegotorus exec /usr/bin/obfsproxy --managed + ServerTransportListenAddr obfs2 0.0.0.0:4200 + ServerTransportListenAddr stegotorus 98.23.4.45:6559

- Further configuration parameters (like the k=v values passed to - client-transports using the Bridge line) can be passed to - server-transports using the ServerTransportOptions option. + If no ServerTransportListenAddr is specified and it's the first time + that Tor encounters that transport, Tor will instruct the managed + proxy to bind to a random TCP port on 0.0.0.0. If Tor has seen the + trasport before, it will instruct the managed proxy to bind to the + same TCP port that the transport used last time.

- The format of the ServerTransportOptions line is: - ServerTransportOptions <method> <k=v> ... + Specify additional configuration parameters

- For example, a valid instance of this line would be: - ServerTransportOptions trebuchet secret=nou cache=/tmp/cache + Further configuration parameters (like the k=v values passed to + client-transports using the Bridge line) can be passed to + server-transports using the ServerTransportOptions option. + + The format of the ServerTransportOptions line is: + ServerTransportOptions <method> <k=v> ... + + For example, a valid instance of this line would be: + ServerTransportOptions trebuchet secret=nou cache=/tmp/cache

Managed proxy interface