浏览代码

Add changes file and enrich the manual page.

George Kadianakis 13 年之前
父节点
当前提交
133f380c87
共有 2 个文件被更改,包括 9 次插入0 次删除
  1. 4 0
      changes/bug8929
  2. 5 0
      doc/tor.1.txt

+ 4 - 0
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.

+ 5 - 0
doc/tor.1.txt

@@ -186,6 +186,11 @@ GENERAL OPTIONS
     listening address of any pluggable transport proxy that tries to
     listening address of any pluggable transport proxy that tries to
     launch __transport__.
     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__::
 **ConnLimit** __NUM__::
     The minimum number of file descriptors that must be available to the Tor
     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
     process before it will start. Tor will ask the OS for as many file