[tor-commits] [tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3

[nickm at torproject.org]

commit 12fc4206f28576d872033b8a99756252e5354662
Merge: 2dee38fba 124e06e85
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 5 12:09:00 2018 -0400

    Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug25296_032 |  5 +++++
 doc/tor.1.txt        | 12 ++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --cc doc/tor.1.txt
index 415cd6f3a,d7884968e..af2ac090c
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@@ -238,18 -236,17 +238,18 @@@ GENERAL OPTION
  [[RelayBandwidthBurst]] **RelayBandwidthBurst** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**::
      If not 0, limit the maximum token bucket size (also known as the burst) for
      \_relayed traffic_ to the given number of bytes in each direction.
 -    (Default: 0)
 +    They do not include directory fetches by the relay (from authority
 +    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]::