Commit graph

21464 commits

Author SHA1 Message Date
Andrew Poelstra
e596f32b6f Merge 0853d8d2fd into merged_master (Bitcoin PR #16112) 2020-11-06 15:20:15 +00:00
Andrew Poelstra
a18976a7f9 Merge 6c9d3c704f into merged_master (Bitcoin PR #15651) 2020-11-06 15:20:15 +00:00
Andrew Poelstra
9de7dbaae0 Merge 8777a80706 into merged_master (Bitcoin PR #12324) 2020-11-06 15:20:15 +00:00
Andrew Poelstra
83f93df4d0 Merge e2182b02b5 into merged_master (Bitcoin PR #16171) 2020-11-06 15:20:15 +00:00
Andrew Poelstra
66474e84c9 Merge 22b6c4ed75 into merged_master (Bitcoin PR #15899) 2020-11-06 15:20:15 +00:00
Andrew Poelstra
f2d74db77d Merge 98958c81f5 into merged_master (Bitcoin PR #16225) 2020-11-06 15:20:15 +00:00
Andrew Poelstra
a29984dd9a Merge 91958d66cb into merged_master (Bitcoin PR #16210) 2020-11-06 15:20:15 +00:00
Andrew Poelstra
046cf94f99 Merge d9bafca20c into merged_master (Bitcoin PR #15982) 2020-11-06 15:20:15 +00:00
Andrew Poelstra
0e110f2b6e Merge fce4123242 into merged_master (Bitcoin PR #16217) 2020-11-06 15:20:15 +00:00
Andrew Poelstra
e33ff205ee Merge 1a274bce4b into merged_master (Bitcoin PR #16205) 2020-11-06 15:20:15 +00:00
Andrew Poelstra
9e2fd1df5e Merge f3855781fd into merged_master (Bitcoin PR #16196) 2020-11-06 15:20:15 +00:00
Andrew Poelstra
b4a7490e22 Merge 2ea8ebd211 into merged_master (Bitcoin PR #16149) 2020-11-06 15:20:14 +00:00
Andrew Poelstra
413732c74d Merge 47d981e827 into merged_master (Bitcoin PR #16186) 2020-11-06 15:20:14 +00:00
Andrew Poelstra
19b3c672cb Merge 8cbeaedee0 into merged_master (Bitcoin PR #16213) 2020-11-06 15:20:14 +00:00
Andrew Poelstra
d4a8a8611a Merge f6f924811d into merged_master (Bitcoin PR #16214) 2020-11-06 15:20:14 +00:00
Andrew Poelstra
94d71a40fe Merge 7524376a81 into merged_master (Bitcoin PR #16201) 2020-11-06 15:20:14 +00:00
Andrew Poelstra
2c4ed107ff Merge c977f2b99d into merged_master (Elements PR #664) 2020-11-06 15:20:14 +00:00
Andrew Poelstra
3a76b73035 Merge 3689bc83dd into merged_master (Elements PR #657) 2020-11-06 15:20:14 +00:00
Andrew Poelstra
d4b074ad4b Merge d54d02bfe1 into merged_master (Elements PR #660) 2020-11-06 15:20:14 +00:00
Andrew Poelstra
25946f0bae Merge 431d81b61c into merged_master (Bitcoin PR #15991) 2020-11-06 15:20:14 +00:00
Andrew Poelstra
7bef011d2a Merge afab1312c5 into merged_master (Bitcoin PR #16118) 2020-11-06 15:20:14 +00:00
Andrew Poelstra
96572abc81 Merge f792395d13 into merged_master (Bitcoin PR #15834) 2020-11-06 15:20:14 +00:00
Andrew Poelstra
61574a79ab Merge 473c6b7c5a into merged_master (Bitcoin PR #16184) 2020-11-06 15:20:14 +00:00
Andrew Poelstra
6553838f2c Merge 6899ef3f0e into merged_master (Bitcoin PR #16143) 2020-11-06 15:20:14 +00:00
Andrew Poelstra
371b96ff51 Merge 8a503a6c6d into merged_master (Bitcoin PR #16164) 2020-11-06 15:20:13 +00:00
Andrew Poelstra
199bd9287f Merge 70d77fff3a into merged_master (Bitcoin PR #16162)
adds a Core key to the verify-commits/trusted-keys file. Since we'd
removed all the Core keys, I also removed this one, so this PR is
a no-op --asp
2020-11-06 15:20:13 +00:00
Andrew Poelstra
2834091bbf Merge 5d2ccf0ce9 into merged_master (Bitcoin PR #15024)
lol thank Steven for hal
2020-11-06 15:20:13 +00:00
Andrew Poelstra
23155ae266 Merge af05f36b60 into merged_master (Bitcoin PR #16141) 2020-11-06 15:20:13 +00:00
Andrew Poelstra
daa130fe7b Merge ee642f5862 into merged_master (Elements PR #658) 2020-11-06 15:20:13 +00:00
Andrew Poelstra
118cb558b2 Merge e1928b7e71 into merged_master (Elements PR #653)
This PR updates libsecp; but we just did that (to a newer version) a
few PRs ago. So this one is a no-op. --asp
2020-11-06 15:20:13 +00:00
Andrew Poelstra
68d9951825 Merge d0f81a96d9 into merged_master (Bitcoin PR #16129) 2020-11-06 15:20:13 +00:00
Andrew Poelstra
1f80abfc06 Merge 36fb968825 into merged_master (Bitcoin PR #15461) 2020-11-06 15:20:13 +00:00
Andrew Poelstra
3d644f7fba Merge 9fccdd4ed4 into merged_master (Bitcoin PR #15886) 2020-11-06 15:20:12 +00:00
Andrew Poelstra
a914dbbeed Merge 26a0d07ddb into merged_master (Bitcoin PR #16130) 2020-11-06 15:20:12 +00:00
Andrew Poelstra
deea6fa65a Merge fc6cbc31e9 into merged_master (Bitcoin PR #15689) 2020-11-06 15:20:12 +00:00
Andrew Poelstra
40a8a7d8e0 Merge 89dd20a186 into merged_master (Elements PR #648) 2020-11-06 15:20:12 +00:00
Andrew Poelstra
54271a22ca Merge 94c7644da4 into merged_master (Elements PR #647) 2020-11-06 15:20:12 +00:00
Andrew Poelstra
c846857f14 Merge 335be0191b into merged_master (Elements PR #649) 2020-11-06 15:20:12 +00:00
Andrew Poelstra
3a611de50a Merge 03858b23fe into merged_master (Bitcoin PR #15844) 2020-11-06 15:20:12 +00:00
Andrew Poelstra
cf80950a4f Merge 03e2786f05 into merged_master (Bitcoin PR #16140)
Kept Core's copy of SECURITY.md -- we should replace this in a later
PR. --asp
2020-11-06 15:20:12 +00:00
Andrew Poelstra
6bcd777be0 Merge d936cf9eaf into merged_master (Bitcoin PR #15985) 2020-11-06 15:20:12 +00:00
Andrew Poelstra
739d2822a1 Merge d8d1e4f7f7 into merged_master (Elements PR #645) 2020-11-06 15:20:12 +00:00
Andrew Poelstra
738a42292f Merge 52ec4c64e8 into merged_master (Bitcoin PR #16144) 2020-11-06 15:20:12 +00:00
Andrew Poelstra
cb15f46946 Merge 5d37c1bde0 into merged_master (Bitcoin PR #15976) 2020-11-06 15:20:12 +00:00
Andrew Poelstra
11cdf7ebf5 Merge 1b78b9f222 into merged_master (Elements PR #636) 2020-11-06 15:20:12 +00:00
Andrew Poelstra
c6ad410dd9 Merge a6beb256ed into merged_master (Elements PR #629) 2020-11-06 15:20:11 +00:00
Andrew Poelstra
68a81ca040 Merge c29771437e into merged_master (Elements PR #625) 2020-11-06 15:20:11 +00:00
Andrew Poelstra
e5f9a5f873 Merge 1ccb0b67f9 into merged_master (Elements PR #610) 2020-11-06 15:20:11 +00:00
Andrew Poelstra
55de6ee0b7 Merge d8247a4143 into merged_master (Elements PR #640) 2020-11-06 15:20:11 +00:00
Andrew Poelstra
bbc59975b0 Merge 4858d36163 into merged_master (Elements PR #639) 2020-11-06 15:20:11 +00:00