Commit 133f380c authored by George Kadianakis's avatar George Kadianakis Committed by Nick Mathewson
Browse files

Add changes file and enrich the manual page.

parent 1ee3a0cf

changes/bug8929

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  o Minor features:

    - Add a new torrc option "ServerTransportOptions" that allows

      bridge operators to pass configuration parameters to their

      pluggable transports. Resolves ticket 8929.

doc/tor.1.txt

+5 −0
Original line number Diff line number Diff line
@@ -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