Andrew Poelstra
b8a1b9df4d
Merge ed03bfc899 into merged_master (Elements PR #726 )
2020-11-09 21:20:31 +00:00
Andrew Poelstra
87c8ca42dd
Merge 696b5eb179 into merged_master (Bitcoin PR #16987 )
2020-11-09 21:20:31 +00:00
Andrew Poelstra
6aeb84256a
Merge c3a8e097b1 into merged_master (Bitcoin PR #16991 )
2020-11-09 21:20:31 +00:00
Andrew Poelstra
6a5ea9af4e
Merge 2fe6c185a6 into merged_master (Bitcoin PR #16988 )
...
Massive automated translation-update PR. I just blindly took Core's updates for
everything. We should re-run this after the rebase to add translations for all
the new Elements stuff.
2020-11-09 21:20:30 +00:00
Andrew Poelstra
8926bc044b
Merge 9edb2b6550 into merged_master (Bitcoin PR #16953 )
2020-11-09 21:20:29 +00:00
Andrew Poelstra
f2240a15bf
Merge a6c8aed1f1 into merged_master (Bitcoin PR #16817 )
2020-11-09 21:20:29 +00:00
Andrew Poelstra
065f0f7e86
Merge 4c4ff4911a into merged_master (Bitcoin PR #16961 )
2020-11-09 21:20:28 +00:00
Andrew Poelstra
e87be41b02
Merge 742cd77f6f into merged_master (Bitcoin PR #16929 )
2020-11-09 21:20:28 +00:00
Andrew Poelstra
282b502fc2
Merge 6393da8fdc into merged_master (Bitcoin PR #16960 )
2020-11-09 21:20:28 +00:00
Andrew Poelstra
eab90a6495
Merge 13377b7a69 into merged_master (Bitcoin PR #16918 )
2020-11-09 21:20:27 +00:00
Andrew Poelstra
7991670332
Merge f8b0b190aa into merged_master (Bitcoin PR #16920 )
2020-11-09 21:20:27 +00:00
Andrew Poelstra
e7e7cff7c7
Merge 04321494ae into merged_master (Bitcoin PR #16921 )
2020-11-09 21:20:27 +00:00
Andrew Poelstra
98c5244de1
Merge a73775e4d5 into merged_master (Bitcoin PR #16917 )
2020-11-09 21:20:27 +00:00
Andrew Poelstra
084729aa3d
Merge 9bf5768dd6 into merged_master (Bitcoin PR #16885 )
2020-11-09 21:20:27 +00:00
Andrew Poelstra
b24be4b1a7
Merge 59c138d2f1 into merged_master (Bitcoin PR #16898 )
2020-11-09 21:20:27 +00:00
Andrew Poelstra
b11de4e489
Merge cfcaa9759e into merged_master (Bitcoin PR #16907 )
2020-11-09 21:20:26 +00:00
Andrew Poelstra
244335056c
Merge 0ee0474234 into merged_master (Bitcoin PR #16521 )
2020-11-09 21:20:26 +00:00
Andrew Poelstra
df8fcece9d
Merge 72d30d668a into merged_master (Bitcoin PR #16512 )
2020-11-09 21:20:26 +00:00
Andrew Poelstra
ca7b7f3810
Merge feb162d500 into merged_master (Bitcoin PR #14696 )
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
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
31729410b6
Merge b0a7a76c9d into merged_master (Bitcoin PR #16873 )
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
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
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
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
f90ae69f01
Merge 08bb4c3156 into merged_master (Bitcoin PR #16285 )
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
5cca042772
Merge 0d20c42a01 into merged_master (Bitcoin PR #16421 )
2020-11-09 21:20:22 +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
2cdfea1aa4
Merge cbde2bc806 into merged_master (Bitcoin PR #16804 )
2020-11-09 21:20:21 +00:00
Andrew Poelstra
eb174d36e9
Merge 45be44cce4 into merged_master (Bitcoin PR #15257 )
2020-11-09 21:20:21 +00:00
Andrew Poelstra
eb92b1779c
Merge 761fe07ba9 into merged_master (Bitcoin PR #16768 )
2020-11-09 21:20:21 +00:00
Andrew Poelstra
d73a5a5a8d
Merge 33f9750b1b into merged_master (Bitcoin PR #16185 )
2020-11-09 21:20:20 +00:00
Andrew Poelstra
adceec0ffe
Merge a6878b8080 into merged_master (Elements PR #696 )
2020-11-09 21:20:20 +00:00
Andrew Poelstra
0bb6bd229c
Merge 495db72ee7 into merged_master (Bitcoin PR #16767 )
2020-11-09 21:20:20 +00:00
Andrew Poelstra
206311142a
Merge d8fc997913 into merged_master (Bitcoin PR #16695 )
2020-11-09 21:20:19 +00:00
Andrew Poelstra
39d8aa865c
Merge cc40b55da7 into merged_master (Bitcoin PR #16726 )
2020-11-09 21:20:18 +00:00
Andrew Poelstra
1613344366
Merge 119e97ae2d into merged_master (Bitcoin PR #16740 )
2020-11-09 21:20:18 +00:00
Andrew Poelstra
6e38c0cd4a
Merge 2d38950e5d into merged_master (Bitcoin PR #16742 )
2020-11-09 21:20:18 +00:00
Andrew Poelstra
58e5e4c784
Merge af4100cd6f into merged_master (Bitcoin PR #16404 )
2020-11-09 21:20:17 +00:00
Andrew Poelstra
9343f1e349
Merge 6dfa9efa3f into merged_master (Bitcoin PR #16656 )
2020-11-09 21:20:17 +00:00
