Andrew Poelstra
55b110cabc
Merge c08bf2b574 into merged_master (Bitcoin PR #15437 )
2020-11-09 21:20:35 +00:00
Andrew Poelstra
caf60b9b12
Merge 1d9ac7fded into merged_master (Bitcoin PR #17074 )
2020-11-09 21:20:35 +00:00
Andrew Poelstra
d15922961c
Merge 9b4dfec831 into merged_master (Bitcoin PR #17029 )
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
6ae80c3734
Merge ee14d88de2 into merged_master (Elements PR #734 )
...
Took the version of .travis.yml from the PR
2020-11-09 21:20:35 +00:00
Andrew Poelstra
aac4628c61
Merge d93e27ef93 into merged_master (Elements PR #733 )
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
c576e543da
Merge cc703a2398 into merged_master (Bitcoin PR #17066 )
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
e9bafa83f9
Merge 99cebc922c into merged_master (Bitcoin PR #16569 )
2020-11-09 21:20:34 +00:00
Andrew Poelstra
45c44b4d29
Merge 34919e0033 into merged_master (Bitcoin PR #17011 )
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
371d58de2f
Merge df50fd194f into merged_master (Bitcoin PR #16802 )
2020-11-09 21:20:34 +00:00
Andrew Poelstra
e73c3f2c3f
Merge 866fd2888f into merged_master (Bitcoin PR #17030 )
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
00fe4348f7
Merge 7b701fef58 into merged_master (Bitcoin PR #17049 )
2020-11-09 21:20:34 +00:00
Andrew Poelstra
78df750e14
Merge 917d3d9052 into merged_master (Bitcoin PR #17052 )
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
5044f82443
Merge 94e6e9f38d into merged_master (Bitcoin PR #17026 )
2020-11-09 21:20:33 +00:00
Andrew Poelstra
4b7e085be8
Merge 8ddc303931 into merged_master (Bitcoin PR #17031 )
2020-11-09 21:20:33 +00:00
Andrew Poelstra
8dd598464d
Merge f1f284aa75 into merged_master (Bitcoin PR #17042 )
2020-11-09 21:20:33 +00:00
Andrew Poelstra
f26a171f83
Merge c90ce0f709 into merged_master (Bitcoin PR #17022 )
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
366e82e966
Merge 284cd3195a into merged_master (Bitcoin PR #17040 )
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
862d421963
Merge ecc0f272a0 into merged_master (Bitcoin PR #17007 )
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
134e52cbed
Merge ddc4e3c2d6 into merged_master (Bitcoin PR #17006 )
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
24ed0f8aa7
Merge 1f40a91286 into merged_master (Bitcoin PR #17014 )
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
debae585ae
Merge 52acd24573 into merged_master (Bitcoin PR #17005 )
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
04b3db567b
Merge a54e52b4ae into merged_master (Bitcoin PR #16997 )
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
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
977162a889
Merge 981ec9b817 into merged_master (Bitcoin PR #15459 )
2020-11-09 21:20:30 +00:00
