Andrew Poelstra
f3f736f76d
Merge befdef8aee into merged_master (Bitcoin PR #16887 )
2020-11-09 21:20:37 +00:00
Andrew Poelstra
8deb1ef6f1
Merge 59f0687fea into merged_master (Bitcoin PR #16786 )
2020-11-09 21:20:37 +00:00
Andrew Poelstra
56e1710af4
Merge 8fd1b52f9d into merged_master (Elements PR #744 )
2020-11-09 21:20:37 +00:00
Andrew Poelstra
109d39e33e
Merge 2a0164085b into merged_master (Bitcoin PR #16689 )
2020-11-09 21:20:37 +00:00
Andrew Poelstra
f553b708e2
Merge 2352aec9fc into merged_master (Bitcoin PR #17076 )
2020-11-09 21:20:37 +00:00
Andrew Poelstra
00efae6802
Merge b67ca4ee73 into merged_master (Bitcoin PR #17085 )
2020-11-09 21:20:37 +00:00
Andrew Poelstra
1a2b4f816c
Merge 3c01b3435e into merged_master (Elements PR #742 )
2020-11-09 21:20:36 +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
47c494113c
Merge bc7e721d97 into merged_master (Bitcoin PR #17087 )
2020-11-09 21:20:36 +00:00
Andrew Poelstra
809a747245
Merge a2a0a83716 into merged_master (Elements PR #738 )
2020-11-09 21:20:36 +00:00
Andrew Poelstra
d8c3562011
Merge 42d0eca725 into merged_master (Bitcoin PR #13728 )
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
b448c20b7b
Merge 1c11e53bb6 into merged_master (Bitcoin PR #17041 )
...
Take .travis.yml changes from PR (this time from Core, which looks like it drops
the Win32 build, which I semi-mistakenly added last time when I took the entire
file from Elements.
2020-11-09 21:20:35 +00:00
Andrew Poelstra
5ac705735c
Merge ceecefe0b0 into merged_master (Bitcoin PR #17081 )
2020-11-09 21:20:35 +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
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
