[tor-commits] [torspec/master] Support multiple transports in a single transport line.

[nickm at torproject.org]

commit ef5a3c93402000dcaa5eff4878010cbb36a01205
Author: George Kadianakis <desnacked at gmail.com>
Date:   Wed Oct 5 16:41:09 2011 +0200

    Support multiple transports in a single transport line.
    
    Support multiple comma-separated transpotrs in a single
    {Client,Server}TransportPlugin line.
---
 proposals/180-pluggable-transport.txt |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/proposals/180-pluggable-transport.txt b/proposals/180-pluggable-transport.txt
index eee2e0e..b4e8dad 100644
--- a/proposals/180-pluggable-transport.txt
+++ b/proposals/180-pluggable-transport.txt
@@ -188,7 +188,7 @@ Specifications: Client behavior
   'trubuchet' connections, and Tor doesn't need to worry about it.
 
   A managed proxy is configured with
-     ClientTransportPlugin <method> exec <path> [options]
+     ClientTransportPlugin <methods> exec <path> [options]
   as in
     "ClientTransportPlugin trebuchet exec /usr/libexec/trebuchet --managed".
   This example tells Tor to launch an external program to provide a
@@ -197,6 +197,10 @@ Specifications: Client behavior
   options, even if the same executable and options are listed for
   more than one method.
 
+  In managed proxies, <methods> can be a comma-separated list of
+  pluggable transport method names, as in:
+    "ClientTransportPlugin pawn,bishop,rook exec /bin/ptproxy --managed".
+
   If instead of a transport method, the torrc lists "*" for a managed
   proxy, Tor uses that proxy for all transport methods that the plugin
   supports. So "ClientTransportPlugin * exec /usr/libexec/tor/foobar"
@@ -235,7 +239,7 @@ Server behavior
   configuration information that we'll tell users.
 
   A managed proxy is configured as
-     ServerTransportPlugin <method> exec </path/to/binary> [options]
+     ServerTransportPlugin <methods> exec </path/to/binary> [options]
   or
      ServerTransportPlugin * exec </path/to/binary> [options]