Merge af05bd9e1e into merged_master (Bitcoin PR #17891)

This commit is contained in:
Andrew Poelstra 2020-11-14 16:52:07 +00:00
commit 7c53615bb6
79 changed files with 127 additions and 128 deletions

View file

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