diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-04-05 12:09:00 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-04-05 12:09:00 -0400 |
| commit | 12fc4206f28576d872033b8a99756252e5354662 (patch) | |
| tree | 2790b3c55c89fdf614f5eb600ffcea6698e00f53 | |
| parent | 2dee38fba0193c952500b9d0227ebcff6d5432d6 (diff) | |
| parent | 124e06e85cf72152e9bdbd91e3cd6da9a5b1fd39 (diff) | |
| download | tor-12fc4206f28576d872033b8a99756252e5354662.tar.gz tor-12fc4206f28576d872033b8a99756252e5354662.zip | |
Merge branch 'maint-0.3.2' into maint-0.3.3
| -rw-r--r-- | changes/bug25296_032 | 5 | ||||
| -rw-r--r-- | doc/tor.1.txt | 12 |
2 files changed, 11 insertions, 6 deletions
diff --git a/changes/bug25296_032 b/changes/bug25296_032 new file mode 100644 index 0000000000..f60048ca66 --- /dev/null +++ b/changes/bug25296_032 @@ -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. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 415cd6f3a0..af2ac090c6 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -242,14 +242,14 @@ GENERAL OPTIONS or other relays), because that is considered "client" activity. (Default: 0) [[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. - You should never need to change this value, since a network-wide value is - published in the consensus and your relay will use that value. (Default: 0) + If this option is set manually, or via the "perconnbwrate" consensus + field, Tor will use it for separate rate limiting for each connection + from a non-relay. (Default: 0) [[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. - You should never need to change this value, since a network-wide value is - published in the consensus and your relay will use that value. (Default: 0) + If this option is set manually, or via the "perconnbwburst" consensus + field, Tor will use it for separate rate limiting for each connection + from a non-relay. (Default: 0) [[ClientTransportPlugin]] **ClientTransportPlugin** __transport__ socks4|socks5 __IP__:__PORT__:: **ClientTransportPlugin** __transport__ exec __path-to-binary__ [options]:: |