Merge branch 'maint-0.3.2' into release-0.3.2
This commit is contained in:
commit
bc250fcabd
|
@ -0,0 +1,5 @@
|
||||||
|
o Minor bugfixes (documentation):
|
||||||
|
- Document that the PerConnBW{Rate,Burst} options will fall back to their
|
||||||
|
corresponding consensus parameters only if those parameters are
|
||||||
|
set. Previously we had claimed that these values would always be
|
||||||
|
set in the consensus. Fixes bug 25296; bugfix on 0.2.2.7-alpha.
|
|
@ -239,14 +239,14 @@ GENERAL OPTIONS
|
||||||
(Default: 0)
|
(Default: 0)
|
||||||
|
|
||||||
[[PerConnBWRate]] **PerConnBWRate** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**::
|
[[PerConnBWRate]] **PerConnBWRate** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**::
|
||||||
If set, do separate rate limiting for each connection from a non-relay.
|
If this option is set manually, or via the "perconnbwrate" consensus
|
||||||
You should never need to change this value, since a network-wide value is
|
field, Tor will use it for separate rate limiting for each connection
|
||||||
published in the consensus and your relay will use that value. (Default: 0)
|
from a non-relay. (Default: 0)
|
||||||
|
|
||||||
[[PerConnBWBurst]] **PerConnBWBurst** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**::
|
[[PerConnBWBurst]] **PerConnBWBurst** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**::
|
||||||
If set, do separate rate limiting for each connection from a non-relay.
|
If this option is set manually, or via the "perconnbwburst" consensus
|
||||||
You should never need to change this value, since a network-wide value is
|
field, Tor will use it for separate rate limiting for each connection
|
||||||
published in the consensus and your relay will use that value. (Default: 0)
|
from a non-relay. (Default: 0)
|
||||||
|
|
||||||
[[ClientTransportPlugin]] **ClientTransportPlugin** __transport__ socks4|socks5 __IP__:__PORT__::
|
[[ClientTransportPlugin]] **ClientTransportPlugin** __transport__ socks4|socks5 __IP__:__PORT__::
|
||||||
**ClientTransportPlugin** __transport__ exec __path-to-binary__ [options]::
|
**ClientTransportPlugin** __transport__ exec __path-to-binary__ [options]::
|
||||||
|
|
Loading…
Reference in New Issue