diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-08-08 13:51:47 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-08-08 13:55:27 +0200 |
| commit | 78dae8caccd82cfbfd76557f1fb7d7557c7b5edb (patch) | |
| tree | b1f18d5bd15764f63a6e4e7dc895c0d63453b8de /test/functional/feature_proxy.py | |
| parent | 9d86aad287f07e20066138b9f909758ad7a2e098 (diff) | |
| parent | 3fc20632a3ad30809356a58d2cf0ea4a4ad4cec3 (diff) | |
Merge #13780: 0.17: Pre-branch maintenance
3fc20632a3ad30809356a58d2cf0ea4a4ad4cec3 qt: Set BLOCK_CHAIN_SIZE = 220 (DrahtBot)
2b6a2f4a28792f2fe9dc1be843b1ff1ecae35e8a Regenerate manpages (DrahtBot)
eb7daf4d600eeb631427c018a984a77a34aca66e Update copyright headers to 2018 (DrahtBot)
Pull request description:
Some trivial maintenance to avoid having to do it again after the 0.17 branch off.
(The scripts to do this are in `./contrib/`)
Tree-SHA512: 16b2af45e0351b1c691c5311d48025dc6828079e98c2aa2e600dc5910ee8aa01858ca6c356538150dc46fe14c8819ed8ec8e4ec9a0f682b9950dd41bc50518fa
Diffstat (limited to 'test/functional/feature_proxy.py')
| -rwxr-xr-x | test/functional/feature_proxy.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/functional/feature_proxy.py b/test/functional/feature_proxy.py index 2d10c547e2..31d2ee8e13 100755 --- a/test/functional/feature_proxy.py +++ b/test/functional/feature_proxy.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2017 The Bitcoin Core developers +# Copyright (c) 2015-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test bitcoind with different proxy configuration. |