Merge cac10e66d2 into merged_master (Bitcoin PR #21264)

This commit is contained in:
Andrew Poelstra 2021-06-25 14:10:05 +00:00
commit 705e356896
36 changed files with 51 additions and 51 deletions

View file

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