Commit graph

29954 commits

Author SHA1 Message Date
Andrew Poelstra
569838252f Merge fea532a5f2 into merged_master (Bitcoin PR #16540) 2020-11-09 21:20:53 +00:00
Andrew Poelstra
1d3555cdaf Merge b05b28183c into merged_master (Bitcoin PR #16899) 2020-11-09 21:20:53 +00:00
Andrew Poelstra
4262cdaf35 Merge d35b12107e into merged_master (Bitcoin PR #17044) 2020-11-09 21:20:52 +00:00
Andrew Poelstra
886fde713c Merge 22e7eea629 into merged_master (Bitcoin PR #17363) 2020-11-09 21:20:52 +00:00
Andrew Poelstra
af3f2a1fd5 Merge 50591f6ec6 into merged_master (Bitcoin PR #17357) 2020-11-09 21:20:52 +00:00
Andrew Poelstra
0333ae666d Merge c7e6b3b343 into merged_master (Bitcoin PR #17243) 2020-11-09 21:20:52 +00:00
Andrew Poelstra
34f05222f9 Merge 08023b0b4e into merged_master (Elements PR #770) 2020-11-09 21:20:52 +00:00
Andrew Poelstra
132dcf17c7 Merge 54a337478d into merged_master (Bitcoin PR #17378) 2020-11-09 21:20:52 +00:00
Andrew Poelstra
ca29b12b22 Merge 53afce3b0b into merged_master (Elements PR #769)
This PR was broken; also pull in the change from #770 which fixes it,
so #770 will be an empty merge.
2020-11-09 21:20:52 +00:00
Andrew Poelstra
5aa6161bab Merge 5d3b7eb9f8 into merged_master (Elements PR #768) 2020-11-09 21:20:52 +00:00
Andrew Poelstra
c587d28965 Merge e204dc11b5 into merged_master (Bitcoin PR #17365) 2020-11-09 21:20:52 +00:00
Andrew Poelstra
c3b2f1d8c0 Merge bdda137878 into merged_master (Bitcoin PR #16766) 2020-11-09 21:20:51 +00:00
Andrew Poelstra
47f60c4e53 Merge bfc4c896d6 into merged_master (Bitcoin PR #17258) 2020-11-09 21:20:51 +00:00
Andrew Poelstra
7494bc176f Merge bc38bb9a60 into merged_master (Bitcoin PR #17288) 2020-11-09 21:20:51 +00:00
Andrew Poelstra
77593619be Merge 33b155f287 into merged_master (Bitcoin PR #17366) 2020-11-09 21:20:51 +00:00
Andrew Poelstra
00d30ddc6c Merge 94a26b192f into merged_master (Bitcoin PR #17318) 2020-11-09 21:20:51 +00:00
Andrew Poelstra
b9140de11e Merge 6cb10c14c6 into merged_master (Bitcoin PR #17199) 2020-11-09 21:20:51 +00:00
Andrew Poelstra
2b2060c6c3 Merge 8f9df2ed88 into merged_master (Bitcoin PR #17164) 2020-11-09 21:20:51 +00:00
Andrew Poelstra
84bc0faf8f Merge bbc9e4133c into merged_master (Bitcoin PR #17304) 2020-11-09 21:20:51 +00:00
Andrew Poelstra
a2a3f277d9 Merge fba574c908 into merged_master (Bitcoin PR #17349) 2020-11-09 21:20:50 +00:00
Andrew Poelstra
e9aed1d9c3 Merge def69e5a86 into merged_master (Bitcoin PR #17233) 2020-11-09 21:20:50 +00:00
Andrew Poelstra
3cb664e64e Merge 5933c6d924 into merged_master (Bitcoin PR #17228) 2020-11-09 21:20:50 +00:00
Andrew Poelstra
c82f65f262 Merge 73b26e38d7 into merged_master (Bitcoin PR #17351) 2020-11-09 21:20:50 +00:00
Andrew Poelstra
fd59ffef84 Merge 91fbcf41b3 into merged_master (Bitcoin PR #16110) 2020-11-09 21:20:50 +00:00
Andrew Poelstra
7ad62f5527 Merge c4b8dd2060 into merged_master (Bitcoin PR #17297) 2020-11-09 21:20:50 +00:00
Andrew Poelstra
b607d68347 Merge 463eab5e14 into merged_master (Bitcoin PR #17285) 2020-11-09 21:20:50 +00:00
Andrew Poelstra
6baeb70134 Merge 9641366950 into merged_master (Bitcoin PR #17293) 2020-11-09 21:20:50 +00:00
Andrew Poelstra
c89653aa74 Merge a5224be645 into merged_master (Bitcoin PR #17292) 2020-11-09 21:20:50 +00:00
Andrew Poelstra
da284da31b Merge 5021ef8d7f into merged_master (Bitcoin PR #17254) 2020-11-09 21:20:50 +00:00
Andrew Poelstra
cd3935c4c9 Merge c737839471 into merged_master (Bitcoin PR #17309) 2020-11-09 21:20:49 +00:00
Andrew Poelstra
9022af204b Merge 3f8d95500d into merged_master (Bitcoin PR #17345) 2020-11-09 21:20:49 +00:00
Andrew Poelstra
3875efaaa2 Merge 6a7c40bee4 into merged_master (Bitcoin PR #15888) 2020-11-09 21:20:49 +00:00
Andrew Poelstra
878a2af564 Merge 0e6cae0248 into merged_master (Bitcoin PR #17284) 2020-11-09 21:20:49 +00:00
Andrew Poelstra
5f236f427b Merge bc3fcf3c0d into merged_master (Bitcoin PR #17327) 2020-11-09 21:20:49 +00:00
Andrew Poelstra
ac3508f893 Merge 90a2341713 into merged_master (Bitcoin PR #17218) 2020-11-09 21:20:49 +00:00
Andrew Poelstra
5a9ac1eebb Merge ddd46293bd into merged_master (Bitcoin PR #17324) 2020-11-09 21:20:49 +00:00
Andrew Poelstra
90385214cc Merge b54666c849 into merged_master (Bitcoin PR #17286) 2020-11-09 21:20:49 +00:00
Andrew Poelstra
971870ffd5 Merge 462fbcd212 into merged_master (Bitcoin PR #17325) 2020-11-09 21:20:49 +00:00
Andrew Poelstra
a19375575a Merge 222b7d0ca7 into merged_master (Bitcoin PR #17330) 2020-11-09 21:20:49 +00:00
Andrew Poelstra
d472d58b7b Merge 811c381ab6 into merged_master (Bitcoin PR #17329) 2020-11-09 21:20:49 +00:00
Andrew Poelstra
751d0ac9f4 Merge 100fa0a62a into merged_master (Bitcoin PR #17300) 2020-11-09 21:20:48 +00:00
Andrew Poelstra
aa35f89d18 Merge 1c5e0ccaba into merged_master (Bitcoin PR #17274) 2020-11-09 21:20:48 +00:00
Andrew Poelstra
5a1affb94d Merge feb1a8c03a into merged_master (Bitcoin PR #17308) 2020-11-09 21:20:48 +00:00
Andrew Poelstra
9d15047222 Merge 08e2947312 into merged_master (Bitcoin PR #17316) 2020-11-09 21:20:48 +00:00
Andrew Poelstra
1f56eedcbb Merge a6abc94e93 into merged_master (Bitcoin PR #17281) 2020-11-09 21:20:48 +00:00
Andrew Poelstra
bde84fefc4 Merge 3c40bc6726 into merged_master (Bitcoin PR #15921) 2020-11-09 21:20:48 +00:00
Andrew Poelstra
cda20329e8 Merge cab94cc074 into merged_master (Bitcoin PR #16943) 2020-11-09 21:20:48 +00:00
Andrew Poelstra
0aba8c6168 Merge 341e8d355d into merged_master (Bitcoin PR #17291) 2020-11-09 21:20:48 +00:00
Andrew Poelstra
74509094d0 Merge edd9d0781b into merged_master (Bitcoin PR #17302) 2020-11-09 21:20:47 +00:00
Andrew Poelstra
34af974d28 Merge 471e5f8829 into merged_master (Bitcoin PR #16839) 2020-11-09 21:20:47 +00:00