Andrew Poelstra
00efae6802
Merge b67ca4ee73 into merged_master (Bitcoin PR #17085 )
2020-11-09 21:20:37 +00:00
Andrew Poelstra
581f5924c6
Merge 5cb1d938a1 into merged_master (Bitcoin PR #15756 )
2020-11-09 21:20:36 +00:00
Andrew Poelstra
819ef42e25
Merge b265ffe323 into merged_master (Bitcoin PR #15023 )
2020-11-09 21:20:36 +00:00
Andrew Poelstra
378d8186d5
Merge a2ae766a61 into merged_master (Bitcoin PR #15098 )
2020-11-09 21:20:36 +00:00
Andrew Poelstra
ad6c1498ae
Merge 81fd79ab94 into merged_master (Elements PR #739 )
2020-11-09 21:20:36 +00:00
Andrew Poelstra
b90732c95d
Merge 4b2fac45b9 into merged_master (Elements PR #730 )
2020-11-09 21:20:36 +00:00
Andrew Poelstra
3dbd855a2d
Merge b1de33d29a into merged_master (Bitcoin PR #16821 )
2020-11-09 21:20:35 +00:00
Andrew Poelstra
3b0441c91a
Merge 97e05817d4 into merged_master (Bitcoin PR #17084 )
2020-11-09 21:20:35 +00:00
Andrew Poelstra
55b110cabc
Merge c08bf2b574 into merged_master (Bitcoin PR #15437 )
2020-11-09 21:20:35 +00:00
Andrew Poelstra
382e167ab3
Merge 520d140e6e into merged_master (Bitcoin PR #17056 )
...
Recreated addresses for functional tests using `hal elements address create --script`
with the given script from data/rpc_bip67.json, taking the P2SH output
2020-11-09 21:20:35 +00:00
Andrew Poelstra
b3385fa61b
Merge e173d587e1 into merged_master (Bitcoin PR #17068 )
2020-11-09 21:20:34 +00:00
Andrew Poelstra
d4fa1196db
Merge 9f8cd0ac89 into merged_master (Bitcoin PR #17059 )
2020-11-09 21:20:34 +00:00
Andrew Poelstra
c32120ef8a
Merge 2f174498d6 into merged_master (Bitcoin PR #17073 )
2020-11-09 21:20:34 +00:00
Andrew Poelstra
8dee814a17
Merge febc31c641 into merged_master (Bitcoin PR #17069 )
2020-11-09 21:20:34 +00:00
Andrew Poelstra
60dfbbddd8
Merge 94d6a18f23 into merged_master (Bitcoin PR #16507 )
2020-11-09 21:20:34 +00:00
Andrew Poelstra
4b7e085be8
Merge 8ddc303931 into merged_master (Bitcoin PR #17031 )
2020-11-09 21:20:33 +00:00
Andrew Poelstra
c7dea73134
Merge 4715037796 into merged_master (Bitcoin PR #17038 )
2020-11-09 21:20:33 +00:00
Andrew Poelstra
0fbbfe35c3
Merge a689c11907 into merged_master (Bitcoin PR #16524 )
2020-11-09 21:20:33 +00:00
Andrew Poelstra
009af6607f
Merge f4a0d27e85 into merged_master (Bitcoin PR #13716 )
2020-11-09 21:20:33 +00:00
Andrew Poelstra
1b3ae6c58b
Merge fecc1be231 into merged_master (Bitcoin PR #16884 )
2020-11-09 21:20:33 +00:00
Andrew Poelstra
e25e16c65e
Merge ccaef6c28b into merged_master (Bitcoin PR #16908 )
2020-11-09 21:20:33 +00:00
Andrew Poelstra
f126bc32b8
Merge 19ba43ae2d into merged_master (Bitcoin PR #16964 )
2020-11-09 21:20:32 +00:00
Andrew Poelstra
eec7dc36b6
Merge 8afa602f30 into merged_master (Bitcoin PR #16727 ) (Core 0.19 branch point)
2020-11-09 21:20:32 +00:00
Andrew Poelstra
ff55bb704c
Merge 8d39c636aa into merged_master (Bitcoin PR #16952 )
2020-11-09 21:20:32 +00:00
Andrew Poelstra
e5deb2eb70
Merge 30c2b0b1cb into merged_master (Bitcoin PR #16849 )
2020-11-09 21:20:32 +00:00
Andrew Poelstra
7f69d8993c
Merge 27322cd161 into merged_master (Bitcoin PR #16999 )
2020-11-09 21:20:32 +00:00
Andrew Poelstra
ccdb481c55
Merge 752debdbdb into merged_master (Bitcoin PR #13266 )
2020-11-09 21:20:32 +00:00
Andrew Poelstra
c7eefa8ea4
Merge 4b51ed89cf into merged_master (Bitcoin PR #17002 )
2020-11-09 21:20:32 +00:00
Andrew Poelstra
7598f940a2
Merge dab0e36652 into merged_master (Bitcoin PR #17015 )
2020-11-09 21:20:31 +00:00
Andrew Poelstra
05d7c28bbc
Merge 6e4f655391 into merged_master (Bitcoin PR #16984 )
2020-11-09 21:20:31 +00:00
Andrew Poelstra
0f3841125e
Merge 9dd99ea88e into merged_master (Bitcoin PR #17001 )
2020-11-09 21:20:31 +00:00
Andrew Poelstra
be63d74c91
Merge cd6e9b33a6 into merged_master (Bitcoin PR #16852 )
2020-11-09 21:20:31 +00:00
Andrew Poelstra
8a54dcdb44
Merge b0e268d2f6 into merged_master (Bitcoin PR #16969 )
2020-11-09 21:20:31 +00:00
Andrew Poelstra
b8a1b9df4d
Merge ed03bfc899 into merged_master (Elements PR #726 )
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
081a0198bd
Merge 79aeed8e76 into merged_master (Bitcoin PR #16397 )
2020-11-09 21:20:30 +00:00
Andrew Poelstra
5836ff48b8
Merge b658ca71b3 into merged_master (Bitcoin PR #16931 )
2020-11-09 21:20:30 +00:00
Andrew Poelstra
9f9af7d680
Merge d6026ec874 into merged_master (Bitcoin PR #16971 )
2020-11-09 21:20:30 +00:00
Andrew Poelstra
96f3c60af2
Merge 6b9405e319 into merged_master (Bitcoin PR #16957 )
2020-11-09 21:20:29 +00:00
Andrew Poelstra
c5e90d0076
Merge 26a7437045 into merged_master (Bitcoin PR #16982 )
2020-11-09 21:20:29 +00:00
Andrew Poelstra
8926bc044b
Merge 9edb2b6550 into merged_master (Bitcoin PR #16953 )
2020-11-09 21:20:29 +00:00
Andrew Poelstra
a3139d9501
Merge 280c33f865 into merged_master (Elements PR #723 )
2020-11-09 21:20:29 +00:00
Andrew Poelstra
14552b9725
Merge b1c36a8ba6 into merged_master (Elements PR #719 )
2020-11-09 21:20:29 +00:00
Andrew Poelstra
d1ed1db7fc
Merge 6b2210f101 into merged_master (Bitcoin PR #16713 )
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
acb351bf48
Merge 690fed668c into merged_master (Elements PR #720 )
2020-11-09 21:20:29 +00:00
Andrew Poelstra
9b0e31e130
Merge ab765c2ec7 into merged_master (Bitcoin PR #16577 )
2020-11-09 21:20:29 +00:00
Andrew Poelstra
f2874628b4
Merge fdfaeb67de into merged_master (Bitcoin PR #16956 )
2020-11-09 21:20:28 +00:00
Andrew Poelstra
1f7bfa84c8
Merge ae3902ee3f into merged_master (Bitcoin PR #16928 )
2020-11-09 21:20:28 +00:00
Andrew Poelstra
dad5fd9884
Merge 1e5da20b5e into merged_master (Elements PR #717 )
2020-11-09 21:20:28 +00:00
