GitLab

For tor-0.4.6.0-alpha-dev.

ChangeLog :

  o Documentation (man tor):
     - Move option `ClientTransportPlugin` from `GENERAL OPTIONS` to `CLIENT OPTIONS`. Closes issue #40XXX

Output of git diff HEAD :

diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt
index f5dd1ec..308bf2d 100644
--- a/doc/man/tor.1.txt
+++ b/doc/man/tor.1.txt
@@ -334,20 +334,6 @@ forward slash (/) in the configuration file and on the command line.
     as a float value. This is an advanced option; you generally shouldn't have
     to mess with it. (Default: -1)
 
-[[ClientTransportPlugin]] **ClientTransportPlugin** __transport__ socks4|socks5 __IP__:__PORT__::
-**ClientTransportPlugin** __transport__ exec __path-to-binary__ [options]::
-    In its first form, when set along with a corresponding Bridge line, the Tor
-    client forwards its traffic to a SOCKS-speaking proxy on "IP:PORT".
-    (IPv4 addresses should written as-is; IPv6 addresses should be wrapped in
-    square brackets.) It's the
-    duty of that proxy to properly forward the traffic to the bridge. +
-     +
-    In its second form, when set along with a corresponding Bridge line, the Tor
-    client launches the pluggable transport proxy executable in
-    __path-to-binary__ using __options__ as its command-line options, and
-    forwards its traffic to it. It's the duty of that proxy to properly forward
-    the traffic to the bridge. (Default: none)
-
 [[ConnLimit]] **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
@@ -1178,6 +1164,21 @@ The following options are useful only for clients (that is, if
     controller request).  If true, multicast DNS hostnames for machines on the
     local network (of the form *.local) are also rejected.  (Default: 1)
 
+[[ClientTransportPlugin1]] **ClientTransportPlugin** __transport__ socks4|socks5 __IP__:__PORT__ +
+
+[[ClientTransportPlugin2]] **ClientTransportPlugin** __transport__ exec __path-to-binary__ [options]::
+    In its first form, when set along with a corresponding Bridge line, the Tor
+    client forwards its traffic to a SOCKS-speaking proxy on "IP:PORT".
+    (IPv4 addresses should written as-is; IPv6 addresses should be wrapped in
+    square brackets.) It's the
+    duty of that proxy to properly forward the traffic to the bridge. +
+     +
+    In its second form, when set along with a corresponding Bridge line, the Tor
+    client launches the pluggable transport proxy executable in
+    __path-to-binary__ using __options__ as its command-line options, and
+    forwards its traffic to it. It's the duty of that proxy to properly forward
+    the traffic to the bridge. (Default: none)
+
 [[ClientUseIPv4]] **ClientUseIPv4** **0**|**1**::
     If this option is set to 0, Tor will avoid connecting to directory servers
     and entry nodes over IPv4. Note that clients with an IPv4