Commit graph

23814 commits

Author SHA1 Message Date
Andrew Poelstra
2037872d1e Merge 1ed3e071df into merged_master (Bitcoin PR #17455) 2020-11-09 23:10:11 +00:00
Andrew Poelstra
061d0ea050 Merge f92e750eb4 into merged_master (Bitcoin PR #17480) 2020-11-09 23:10:11 +00:00
Andrew Poelstra
d0e2b032a8 Merge 422ec33d45 into merged_master (Bitcoin PR #17322) 2020-11-09 23:10:11 +00:00
Andrew Poelstra
2b6199bf17 Merge c7709cbf4c into merged_master (Bitcoin PR #17469) 2020-11-09 23:10:11 +00:00
Andrew Poelstra
2213cc6334 Merge 21ee676dd6 into merged_master (Bitcoin PR #17449) 2020-11-09 23:10:11 +00:00
Andrew Poelstra
19ad9587c8 Merge ccf6697e3b into merged_master (Elements PR #780) 2020-11-09 23:10:11 +00:00
Andrew Poelstra
70e702083b Merge ef4231fc00 into merged_master (Elements PR #776) 2020-11-09 23:10:10 +00:00
Andrew Poelstra
fc31e197f3 Merge cd6cb9745e into merged_master (Bitcoin PR #17409) 2020-11-09 23:10:10 +00:00
Andrew Poelstra
90d5425abf Merge 8237889e8d into merged_master (Bitcoin PR #17435) 2020-11-09 23:10:10 +00:00
Andrew Poelstra
bce97903cf Merge 1028882eea into merged_master (Bitcoin PR #17437) 2020-11-09 23:10:10 +00:00
Andrew Poelstra
328949db01 Merge 6d4b97cb1c into merged_master (Bitcoin PR #17450) 2020-11-09 23:10:10 +00:00
Andrew Poelstra
de23ec90a2 Merge 80fdb6fad1 into merged_master (Bitcoin PR #17442) 2020-11-09 23:10:10 +00:00
Andrew Poelstra
3613ae283d Merge f60e0684d1 into merged_master (Elements PR #773) 2020-11-09 23:10:10 +00:00
Andrew Poelstra
ff061fbc25 Merge a6f6333ba2 into merged_master (Bitcoin PR #17416) 2020-11-09 23:10:10 +00:00
Andrew Poelstra
b30da8e3fd Merge 89e93135ae into merged_master (Bitcoin PR #17427) 2020-11-09 23:10:10 +00:00
Andrew Poelstra
4e2b0c3df3 Merge ecc1a4ecd0 into merged_master (Bitcoin PR #17431) 2020-11-09 23:10:10 +00:00
Andrew Poelstra
f94f8bdfe9 Merge cef7df37ce into merged_master (Bitcoin PR #17410) 2020-11-09 23:10:09 +00:00
Andrew Poelstra
35020e3a32 Merge a7aec7ad97 into merged_master (Bitcoin PR #15934) 2020-11-09 23:10:09 +00:00
Andrew Poelstra
3efa6823d7 Merge adceca2ba5 into merged_master (Bitcoin PR #17422) 2020-11-09 23:10:09 +00:00
Andrew Poelstra
989b448129 Merge 9e0aabe50c into merged_master (Bitcoin PR #17367) 2020-11-09 23:10:09 +00:00
Andrew Poelstra
6bd0011f90 Merge 8021392b82 into merged_master (Bitcoin PR #17405) 2020-11-09 23:10:09 +00:00
Andrew Poelstra
c1d327d827 Merge 4a3b6f47cd into merged_master (Bitcoin PR #17354) 2020-11-09 23:10:09 +00:00
Andrew Poelstra
cfde15703a Merge 99ab3a72c5 into merged_master (Bitcoin PR #15931) 2020-11-09 23:10:09 +00:00
Andrew Poelstra
ad9db52fff Merge 2fb6140d58 into merged_master (Bitcoin PR #17404) 2020-11-09 23:10:09 +00:00
Andrew Poelstra
9f605a7f7c Merge 270616228b into merged_master (Bitcoin PR #17362) 2020-11-09 23:10:09 +00:00
Andrew Poelstra
54dd52556e Merge 772673dfbe into merged_master (Bitcoin PR #16978) 2020-11-09 23:10:08 +00:00
Andrew Poelstra
3f2190d870 Merge 7d14e35f3f into merged_master (Bitcoin PR #17342) 2020-11-09 23:10:08 +00:00
Andrew Poelstra
17e825d27e Merge 46e0e27639 into merged_master (Bitcoin PR #17364) 2020-11-09 23:10:08 +00:00
Andrew Poelstra
056b9bb06d Merge 46fc4d1a24 into merged_master (Bitcoin PR #17384) 2020-11-09 23:10:08 +00:00
Andrew Poelstra
111ab7d824 Merge e65b4160e9 into merged_master (Bitcoin PR #17340) 2020-11-09 23:10:08 +00:00
Andrew Poelstra
9ec912e160 Merge 976cc766c4 into merged_master (Bitcoin PR #17381) 2020-11-09 23:10:08 +00:00
Andrew Poelstra
eace3e1898 Merge 6f4e247357 into merged_master (Bitcoin PR #17390) 2020-11-09 23:10:08 +00:00
Andrew Poelstra
3fb58ec9d9 Merge 86771d4310 into merged_master (Bitcoin PR #17339) 2020-11-09 23:10:08 +00:00
Andrew Poelstra
23e022906c Merge 22a58811d4 into merged_master (Bitcoin PR #17353) 2020-11-09 23:10:07 +00:00
Andrew Poelstra
daf2eab951 Merge 7967104aee into merged_master (Bitcoin PR #17368) 2020-11-09 23:10:07 +00:00
Andrew Poelstra
df7c1ad3d7 Merge 224c19645f into merged_master (Bitcoin PR #17388) 2020-11-09 23:09:06 +00:00
Andrew Poelstra
4febd3655e Merge 4e21f72980 into merged_master (Bitcoin PR #17370) 2020-11-09 21:20:53 +00:00
Andrew Poelstra
f5036e8b4b Merge 45e65376ac into merged_master (Bitcoin PR #17382) 2020-11-09 21:20:53 +00:00
Andrew Poelstra
85feb8aadb Merge 40b6070ad7 into merged_master (Bitcoin PR #16805) 2020-11-09 21:20:53 +00:00
Andrew Poelstra
cf810dcf39 Merge d9a4550001 into merged_master (Bitcoin PR #17360) 2020-11-09 21:20:53 +00:00
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