diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2020-06-06 09:51:15 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2020-06-06 09:51:21 -0400 |
| commit | b1b173994406158e5faa3c83b113da9d971ac104 (patch) | |
| tree | 353c5f8f4bf6c84703aef2ef009a44b21622b2c5 /doc | |
| parent | 17cfa52d380673eaec3d428383b163ca4eb83f04 (diff) | |
| parent | fa9604c46f3245a704487c29b684caadffbf73bc (diff) | |
| download | bitcoin-b1b173994406158e5faa3c83b113da9d971ac104.tar.xz | |
Merge #18968: doc: noban precludes maxuploadtarget disconnects
fa9604c46f3245a704487c29b684caadffbf73bc doc: noban precludes maxuploadtarget disconnects (MarcoFalke)
fa3999fe351b510bb141dff9ae4ecc8e717bf292 net: Reformat excessively long if condition into multiple lines (MarcoFalke)
Pull request description:
Whitelisting has been replaced by permission flags, so properly document this. See also #10131
ACKs for top commit:
hebasto:
ACK fa9604c46f3245a704487c29b684caadffbf73bc, I have reviewed the code and it looks OK, I agree it can be merged.
ariard:
ACK fa9604c
Tree-SHA512: 5aee917ab9817719f01ec155487542118e17fa3d145ae7e4bc0e872b2cec39cde9e7fbdee2ae77e9a52700dd8bcc366de4224152e08e709d44d08e0d2f19c613
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/reduce-traffic.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/reduce-traffic.md b/doc/reduce-traffic.md index e39e43df7a..ce77a00dd5 100644 --- a/doc/reduce-traffic.md +++ b/doc/reduce-traffic.md @@ -23,7 +23,7 @@ longer serving historic blocks (blocks older than one week). Keep in mind that new nodes require other nodes that are willing to serve historic blocks. -Whitelisted peers will never be disconnected, although their traffic counts for +Peers with the `noban` permission will never be disconnected, although their traffic counts for calculating the target. ## 2. Disable "listening" (`-listen=0`) |