Andrew Poelstra
a53cae00a0
Merge b3067f4338 into merged_master (Bitcoin PR #16865 )
2020-11-09 21:20:26 +00:00
Andrew Poelstra
fa089ac717
Merge 99beda47f5 into merged_master (Bitcoin PR #16864 )
2020-11-09 21:20:26 +00:00
Andrew Poelstra
66135f7fc9
Merge 318890b1ee into merged_master (Bitcoin PR #16888 )
2020-11-09 21:20:25 +00:00
Andrew Poelstra
7f749bf004
Merge f18a9065e9 into merged_master (Bitcoin PR #16812 )
2020-11-09 21:20:25 +00:00
Andrew Poelstra
bd03a1f4e6
Merge 92f35acb3b into merged_master (Bitcoin PR #16882 )
2020-11-09 21:20:25 +00:00
Andrew Poelstra
d3c16a64a8
Merge 796b713633 into merged_master (Bitcoin PR #16845 )
2020-11-09 21:20:25 +00:00
Andrew Poelstra
ce1470eb55
Merge cd737214ce into merged_master (Bitcoin PR #16737 )
2020-11-09 21:20:25 +00:00
Andrew Poelstra
7640bf65a0
Merge eb812257a3 into merged_master (Bitcoin PR #16847 )
2020-11-09 21:20:25 +00:00
Andrew Poelstra
94cf235067
Merge 871d3ae45b into merged_master (Bitcoin PR #16757 )
2020-11-09 21:20:25 +00:00
Andrew Poelstra
dd3496415c
Merge 19f301def7 into merged_master (Bitcoin PR #16871 )
2020-11-09 21:20:25 +00:00
Andrew Poelstra
caa37b8dca
Merge a953429a0e into merged_master (Bitcoin PR #16822 )
2020-11-09 21:20:25 +00:00
Andrew Poelstra
9b81868c8b
Merge 9debfd0e28 into merged_master (Bitcoin PR #16863 )
2020-11-09 21:20:25 +00:00
Andrew Poelstra
31729410b6
Merge b0a7a76c9d into merged_master (Bitcoin PR #16873 )
2020-11-09 21:20:24 +00:00
Andrew Poelstra
0236677800
Merge a40ccbb195 into merged_master (Bitcoin PR #16858 )
2020-11-09 21:20:24 +00:00
Andrew Poelstra
183aea8254
Merge 4bfef0daeb into merged_master (Bitcoin PR #16866 )
2020-11-09 21:20:24 +00:00
Andrew Poelstra
8b487a91fb
Merge 3c8aacee72 into merged_master (Elements PR #712 )
2020-11-09 21:20:24 +00:00
Andrew Poelstra
3465e350be
Merge fb4f5beb6e into merged_master (Bitcoin PR #16854 )
2020-11-09 21:20:24 +00:00
Andrew Poelstra
6be382597b
Merge 102998ea03 into merged_master (Bitcoin PR #15584 )
2020-11-09 21:20:24 +00:00
Andrew Poelstra
d4f4703df7
Merge a199f75225 into merged_master (Bitcoin PR #16857 )
2020-11-09 21:20:24 +00:00
Andrew Poelstra
98f49da27e
Merge cfc4cca1fd into merged_master (Elements PR #710 )
2020-11-09 21:20:24 +00:00
Andrew Poelstra
046f6550c3
Merge 884f7cc81b into merged_master (Bitcoin PR #16714 )
2020-11-09 21:20:24 +00:00
Andrew Poelstra
f818373174
Merge 4d9fa049af into merged_master (Elements PR #708 )
2020-11-09 21:20:24 +00:00
Andrew Poelstra
e413b2ebbb
Merge ca97d292ce into merged_master (Bitcoin PR #16551 )
2020-11-09 21:20:24 +00:00
Andrew Poelstra
bc7f2f6de6
Merge 04d9939f46 into merged_master (Bitcoin PR #16850 )
2020-11-09 21:20:23 +00:00
Andrew Poelstra
87438de6c3
Merge 51c4ebbe81 into merged_master (Elements PR #706 )
2020-11-09 21:20:23 +00:00
Andrew Poelstra
03d9c45257
Merge 2324aa1dc4 into merged_master (Bitcoin PR #15529 )
2020-11-09 21:20:23 +00:00
Andrew Poelstra
2e67acfabe
Merge 2296fe65f5 into merged_master (Bitcoin PR #16251 )
2020-11-09 21:20:23 +00:00
Andrew Poelstra
74dba6e6ce
Merge d75d1f3331 into merged_master (Elements PR #704 )
2020-11-09 21:20:23 +00:00
Andrew Poelstra
670b5e9c9b
Merge 1985c4efda into merged_master (Bitcoin PR #16413 )
2020-11-09 21:20:23 +00:00
Andrew Poelstra
d25787210f
Merge 750c2fbf26 into merged_master (Bitcoin PR #16680 )
2020-11-09 21:20:23 +00:00
Andrew Poelstra
5b89be04ff
Merge 33c466a642 into merged_master (Bitcoin PR #16787 )
2020-11-09 21:20:23 +00:00
Andrew Poelstra
9b5f3303ae
Merge 59681beb89 into merged_master (Bitcoin PR #16477 )
2020-11-09 21:20:23 +00:00
Andrew Poelstra
5253addec0
Merge d8fe24cbfb into merged_master (Bitcoin PR #16489 )
2020-11-09 21:20:23 +00:00
Andrew Poelstra
3d7ed201af
Merge 335b34c30c into merged_master (Bitcoin PR #16725 )
2020-11-09 21:20:23 +00:00
Andrew Poelstra
8fa52e84b0
Merge 8af835a72d into merged_master (Bitcoin PR #16796 )
2020-11-09 21:20:23 +00:00
Andrew Poelstra
59fe21f5ec
Merge 5b4e6886e0 into merged_master (Bitcoin PR #16806 )
2020-11-09 21:20:22 +00:00
Andrew Poelstra
de9cc92f1a
Merge 4c329d43a5 into merged_master (Bitcoin PR #16826 )
2020-11-09 21:20:22 +00:00
Andrew Poelstra
f90ae69f01
Merge 08bb4c3156 into merged_master (Bitcoin PR #16285 )
2020-11-09 21:20:22 +00:00
Andrew Poelstra
37bc5b5804
Merge 91fcb9ff66 into merged_master (Bitcoin PR #16830 )
2020-11-09 21:20:22 +00:00
Andrew Poelstra
efbf6851cc
Merge 410b745fe0 into merged_master (Bitcoin PR #16735 )
2020-11-09 21:20:22 +00:00
Andrew Poelstra
eebd0b7afa
Merge 189c19e012 into merged_master (Bitcoin PR #15759 )
2020-11-09 21:20:22 +00:00
Andrew Poelstra
f3a64d1877
Merge b5a8d0cff1 into merged_master (Bitcoin PR #15450 )
2020-11-09 21:20:22 +00:00
Andrew Poelstra
be281ea46e
Merge e4b974830e into merged_master (Bitcoin PR #16810 )
2020-11-09 21:20:22 +00:00
Andrew Poelstra
5cca042772
Merge 0d20c42a01 into merged_master (Bitcoin PR #16421 )
2020-11-09 21:20:22 +00:00
Andrew Poelstra
15573b7a25
Merge 46494b08e2 into merged_master (Bitcoin PR #16798 )
2020-11-09 21:20:22 +00:00
Andrew Poelstra
14b98224c3
Merge ae3e3bd151 into merged_master (Bitcoin PR #16793 )
2020-11-09 21:20:21 +00:00
Andrew Poelstra
9cc26a716a
Merge 5b2fe5563b into merged_master (Elements PR #642 )
...
FIXME: we disable standardness checks for the non-PAK node in the PAK tests.
This is because of a bug in Elements which causes non-PAK nodes to reject
pegouts for standardness reasons. Need to fix it after the rebase.
2020-11-09 21:20:21 +00:00
Andrew Poelstra
29e73c226a
Merge 5e202382a9 into merged_master (Bitcoin PR #16624 )
2020-11-09 21:20:21 +00:00
Andrew Poelstra
f8386055b5
Merge 5667b0d758 into merged_master (Bitcoin PR #16792 )
2020-11-09 21:20:21 +00:00
Andrew Poelstra
2cdfea1aa4
Merge cbde2bc806 into merged_master (Bitcoin PR #16804 )
2020-11-09 21:20:21 +00:00