Merge 693c743a32 into merged_master (Bitcoin PR #15843)

This commit is contained in:
Andrew Poelstra 2020-10-28 16:47:34 +00:00
commit 269feab9f6

View file

@ -1,4 +1,4 @@
// Copyright (c) 2017-2018 The Bitcoin Core developers
// Copyright (c) 2017-2019 The Bitcoin Core developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.