Commit graph

24534 commits

Author SHA1 Message Date
Andrew Poelstra
c86fef7cf6 Merge a4a93a0bad into merged_master (Bitcoin PR #17906) 2020-11-14 16:52:06 +00:00
Andrew Poelstra
964e4aef5f Merge 7754cd3848 into merged_master (Elements PR #797) 2020-11-14 16:52:06 +00:00
Andrew Poelstra
3f3d6f9c98 Merge 2ed74a43a0 into merged_master (Bitcoin PR #16945) 2020-11-14 16:52:06 +00:00
Andrew Poelstra
55d131b9ad Merge f2f9fdf579 into merged_master (Bitcoin PR #17910) 2020-11-14 16:52:06 +00:00
Andrew Poelstra
89471dda35 Merge e258ce792a into merged_master (Bitcoin PR #17907) 2020-11-14 16:52:06 +00:00
Andrew Poelstra
eb8d73022f Merge f8c69677a1 into merged_master (Bitcoin PR #17893) 2020-11-14 16:52:06 +00:00
Andrew Poelstra
cc8ef0f28a Merge 62b189b91d into merged_master (Bitcoin PR #17899) 2020-11-14 16:52:06 +00:00
Andrew Poelstra
bf82cc6a32 Merge e7f8450357 into merged_master (Bitcoin PR #16688) 2020-11-14 16:52:06 +00:00
Andrew Poelstra
bf7738a5c8 Merge 6196e93001 into merged_master (Bitcoin PR #16963) 2020-11-14 16:52:05 +00:00
Andrew Poelstra
32b9383743 Merge 295211e668 into merged_master (Bitcoin PR #17445) 2020-11-14 16:52:05 +00:00
Andrew Poelstra
29b2c68c8b Merge 7f3675b3ce into merged_master (Bitcoin PR #17696) 2020-11-14 16:52:05 +00:00
Andrew Poelstra
75726e3bc3 Merge 40a495a38a into merged_master (Bitcoin PR #16975) 2020-11-14 16:52:05 +00:00
Andrew Poelstra
ef2713e142 Merge b065df803c into merged_master (Bitcoin PR #17880) 2020-11-14 16:52:05 +00:00
Andrew Poelstra
e3f76a1543 Merge 07efb3fe2b into merged_master (Bitcoin PR #17826) 2020-11-14 16:52:05 +00:00
Andrew Poelstra
722a9b575c Merge 6dd982aa9e into merged_master (Bitcoin PR #17886) 2020-11-14 16:52:05 +00:00
Andrew Poelstra
5ad4206904 Merge fcef6dbc15 into merged_master (Bitcoin PR #17452) 2020-11-14 16:52:05 +00:00
Andrew Poelstra
a5c0140923 Merge cab3859a35 into merged_master (Bitcoin PR #17677) 2020-11-14 16:52:04 +00:00
Andrew Poelstra
74d2e8da1b Merge 7ea3b85ecf into merged_master (Bitcoin PR #17578) 2020-11-14 16:52:04 +00:00
Andrew Poelstra
c0f55c006c Merge 45f151913e into merged_master (Bitcoin PR #16373) 2020-11-14 16:52:04 +00:00
Andrew Poelstra
4f611f400d Merge bcb4cdcca3 into merged_master (Bitcoin PR #17621) 2020-11-14 16:52:04 +00:00
Andrew Poelstra
39227c6306 Merge e8e79958a7 into merged_master (Bitcoin PR #17857) 2020-11-14 16:52:04 +00:00
Andrew Poelstra
8f67b81eb9 Merge b949ac9697 into merged_master (Bitcoin PR #17393) 2020-11-14 16:52:04 +00:00
Andrew Poelstra
5051f0a3fe Merge da279fe0ee into merged_master (Bitcoin PR #17869) 2020-11-14 16:52:04 +00:00
Andrew Poelstra
465793f48b Merge 593f5e239f into merged_master (Bitcoin PR #17850) 2020-11-14 16:52:03 +00:00
Andrew Poelstra
966a5629d3 Merge 392edbd49a into merged_master (Bitcoin PR #17817) 2020-11-14 16:52:03 +00:00
Andrew Poelstra
fe7b1b8551 Merge 9a4cc52d73 into merged_master (Bitcoin PR #17688) 2020-11-14 16:52:03 +00:00
Andrew Poelstra
a936f8e538 Merge 816464198c into merged_master (Bitcoin PR #17851) 2020-11-14 16:52:03 +00:00
Andrew Poelstra
d9db3e9012 Merge 17e14ac92f into merged_master (Bitcoin PR #17781) 2020-11-14 16:52:03 +00:00
Andrew Poelstra
ebc31a85a2 Merge 190a4051fd into merged_master (Bitcoin PR #17762) 2020-11-14 16:52:03 +00:00
Andrew Poelstra
1e9eff8c6d Merge 52900a764c into merged_master (Bitcoin PR #17849) 2020-11-14 16:52:03 +00:00
Andrew Poelstra
c4e2622681 Merge 3f8dbcd655 into merged_master (Bitcoin PR #16658) 2020-11-14 16:52:03 +00:00
Andrew Poelstra
2048abd5df Merge 0655c7a94c into merged_master (Bitcoin PR #17787) 2020-11-14 16:52:02 +00:00
Andrew Poelstra
0b6056198d Merge 35fff5be60 into merged_master (Bitcoin PR #17825) 2020-11-14 16:52:02 +00:00
Andrew Poelstra
009bc2fdfb Merge 99813a9745 into merged_master (Bitcoin PR #17829) 2020-11-14 16:52:02 +00:00
Andrew Poelstra
e63bcf36bd Merge 8830cb58ab into merged_master (Bitcoin PR #17741) 2020-11-14 16:52:02 +00:00
Andrew Poelstra
7eea796ee9 Merge b931f61b9a into merged_master (Bitcoin PR #17801)
Sets the "is this a release" flag off which apparently it was on Elements
master, and has been since the last rebase .... oops.
2020-11-14 16:52:02 +00:00
Andrew Poelstra
021eccb56e Merge 6cb80a068d into merged_master (Bitcoin PR #17806) 2020-11-14 16:52:01 +00:00
Andrew Poelstra
fc32ca8672 Merge 1dbf3350c6 into merged_master (Bitcoin PR #17793) 2020-11-14 16:52:01 +00:00
Andrew Poelstra
8d23feca6c Merge 0cda557340 into merged_master (Bitcoin PR #17751) 2020-11-14 16:52:01 +00:00
Andrew Poelstra
077355e651 Merge 6677be64f6 into merged_master (Bitcoin PR #17473) 2020-11-14 16:52:01 +00:00
Andrew Poelstra
03ba036f48 Merge 3e94938072 into merged_master (Bitcoin PR #17772) 2020-11-14 16:52:01 +00:00
Andrew Poelstra
93af3af1f9 Merge 7f9fbb89e8 into merged_master (Bitcoin PR #17769) 2020-11-14 16:52:01 +00:00
Andrew Poelstra
433a5cf61e Merge f3e8ef2ac5 into merged_master (Elements PR #799) 2020-11-14 16:52:01 +00:00
Andrew Poelstra
e3118efbbf Merge 6fef85bfa3 into merged_master (Bitcoin PR #17764) 2020-11-14 16:52:01 +00:00
Andrew Poelstra
72b9ed10f4 Merge 47f45b6776 into merged_master (Bitcoin PR #17686) 2020-11-14 16:52:00 +00:00
Andrew Poelstra
2757f305d4 Merge ab4e6ad762 into merged_master (Bitcoin PR #17756) 2020-11-14 16:52:00 +00:00
Andrew Poelstra
dc2a5e5af4 Merge e6acd9f72c into merged_master (Bitcoin PR #17537) 2020-11-14 16:52:00 +00:00
Andrew Poelstra
ce1aa041cb Merge 890eac8f82 into merged_master (Bitcoin PR #17725)
Another travis mess
2020-11-14 16:52:00 +00:00
Andrew Poelstra
b34f506353 Merge a54c16cdb6 into merged_master (Bitcoin PR #17661) 2020-11-14 16:52:00 +00:00
Andrew Poelstra
0e6f9042ec Merge 7df6a7ea98 into merged_master (Bitcoin PR #17758) 2020-11-14 16:52:00 +00:00