Commit graph

24381 commits

Author SHA1 Message Date
Andrew Poelstra
433a5cf61e Merge f3e8ef2ac5 into merged_master (Elements PR #799) 2020-11-14 16:52:01 +00:00
Andrew Poelstra
e3118efbbf Merge 6fef85bfa3 into merged_master (Bitcoin PR #17764) 2020-11-14 16:52:01 +00:00
Andrew Poelstra
72b9ed10f4 Merge 47f45b6776 into merged_master (Bitcoin PR #17686) 2020-11-14 16:52:00 +00:00
Andrew Poelstra
2757f305d4 Merge ab4e6ad762 into merged_master (Bitcoin PR #17756) 2020-11-14 16:52:00 +00:00
Andrew Poelstra
dc2a5e5af4 Merge e6acd9f72c into merged_master (Bitcoin PR #17537) 2020-11-14 16:52:00 +00:00
Andrew Poelstra
ce1aa041cb Merge 890eac8f82 into merged_master (Bitcoin PR #17725)
Another travis mess
2020-11-14 16:52:00 +00:00
Andrew Poelstra
b34f506353 Merge a54c16cdb6 into merged_master (Bitcoin PR #17661) 2020-11-14 16:52:00 +00:00
Andrew Poelstra
0e6f9042ec Merge 7df6a7ea98 into merged_master (Bitcoin PR #17758) 2020-11-14 16:52:00 +00:00
Andrew Poelstra
6b5ef039c0 Merge 03dfa36641 into merged_master (Bitcoin PR #17229) 2020-11-14 16:52:00 +00:00
Andrew Poelstra
7d5d0e9d6a Merge 94c6f2bba4 into merged_master (Bitcoin PR #17593) 2020-11-14 16:52:00 +00:00
Andrew Poelstra
c7a29c2228 Merge f9fd3a27fd into merged_master (Bitcoin PR #17750) 2020-11-14 16:52:00 +00:00
Andrew Poelstra
4219b6d7d9 Merge 48d64d73c0 into merged_master (Bitcoin PR #17564) 2020-11-14 16:51:59 +00:00
Andrew Poelstra
ff582f396c Merge 988eaf2fcb into merged_master (Bitcoin PR #17752) 2020-11-14 16:51:59 +00:00
Andrew Poelstra
c6c5243a64 Merge 806a2c602c into merged_master (Bitcoin PR #17071) 2020-11-14 16:51:59 +00:00
Andrew Poelstra
ba2897d87a Merge 6b51cce65a into merged_master (Bitcoin PR #17753) 2020-11-14 16:51:59 +00:00
Andrew Poelstra
29c6b63021 Merge 5e4912f990 into merged_master (Bitcoin PR #17730) 2020-11-14 16:51:59 +00:00
Andrew Poelstra
296a86e215 Merge c3628e4483 into merged_master (Bitcoin PR #17743) 2020-11-14 16:51:59 +00:00
Andrew Poelstra
37b9b15143 Merge a595011f5a into merged_master (Bitcoin PR #17728) 2020-11-14 16:51:59 +00:00
Andrew Poelstra
0381883d44 Merge ddecb671f0 into merged_master (Bitcoin PR #17654) 2020-11-14 16:51:59 +00:00
Andrew Poelstra
7776084b8f Merge 988fe5b1ad into merged_master (Bitcoin PR #12763) 2020-11-14 16:51:58 +00:00
Andrew Poelstra
dc8e2bcda2 Merge 995b6c83e1 into merged_master (Bitcoin PR #17721) 2020-11-14 16:51:58 +00:00
Andrew Poelstra
fe9767f625 Merge d4b335c60a into merged_master (Bitcoin PR #17617) 2020-11-14 16:51:58 +00:00
Andrew Poelstra
3b0173cd53 Merge c5e318aea6 into merged_master (Bitcoin PR #17736) 2020-11-14 16:51:58 +00:00
Andrew Poelstra
1d9ad3ab8a Merge 54e11a39e1 into merged_master (Bitcoin PR #17735) 2020-11-14 16:51:58 +00:00
Andrew Poelstra
851ce419b5 Merge cf2f439876 into merged_master (Bitcoin PR #17687) 2020-11-14 16:51:58 +00:00
Andrew Poelstra
b8ba5257bb Merge 8a01450b64 into merged_master (Bitcoin PR #17598) 2020-11-14 16:51:58 +00:00
Andrew Poelstra
9b3c4fb812 Merge 75a2a4f357 into merged_master (Bitcoin PR #17726) 2020-11-14 16:51:58 +00:00
Andrew Poelstra
010703797d Merge 0192bd0652 into merged_master (Bitcoin PR #17369) 2020-11-14 16:51:57 +00:00
Andrew Poelstra
c1ac820649 Merge 3914e877c4 into merged_master (Bitcoin PR #17511) 2020-11-14 16:51:57 +00:00
Andrew Poelstra
7187ea2de7 Merge 3f1966ead6 into merged_master (Bitcoin PR #17705) 2020-11-14 16:51:57 +00:00
Andrew Poelstra
1ceb281f8f Merge 5948398b18 into merged_master (Bitcoin PR #17474) 2020-11-14 16:51:57 +00:00
Andrew Poelstra
f3ec9fa522 Merge 7da9e3a817 into merged_master (Bitcoin PR #17050) 2020-11-14 16:51:57 +00:00
Andrew Poelstra
d86e1a77cd Merge 14dafcbc13 into merged_master (Bitcoin PR #17713) 2020-11-14 16:51:57 +00:00
Andrew Poelstra
473008e9e0 Merge f1d3d3430e into merged_master (Bitcoin PR #17714) 2020-11-14 16:51:57 +00:00
Andrew Poelstra
bc678f1935 Merge fab9d115cd into merged_master (Bitcoin PR #17697) 2020-11-14 16:51:57 +00:00
Andrew Poelstra
bae435e03d Merge 4863a8ff16 into merged_master (Bitcoin PR #17698) 2020-11-14 16:51:56 +00:00
Andrew Poelstra
c9585d0fde Merge 3d6752779f into merged_master (Bitcoin PR #17633) 2020-11-14 16:51:56 +00:00
Andrew Poelstra
a0053d9a9b Merge d5674c5f0f into merged_master (Bitcoin PR #17703) 2020-11-14 16:51:56 +00:00
Andrew Poelstra
2f0b1e883c Merge 2126d6ce69 into merged_master (Bitcoin PR #17561) 2020-11-14 16:51:56 +00:00
Andrew Poelstra
a959089a79 Merge ea756bc48c into merged_master (Bitcoin PR #17502) 2020-11-14 16:51:56 +00:00
Andrew Poelstra
9709d02c23 Merge fae94785d9 into merged_master (Bitcoin PR #17524)
lol converting the psbt test vector to a pset one was pretty brutal. Conversion to
hex using rust-bitcoin and then manual hex-editing in vim.
2020-11-14 16:51:56 +00:00
Andrew Poelstra
0f9ee77fe1 Merge 1189b6acab into merged_master (Bitcoin PR #17109) 2020-11-14 16:51:56 +00:00
Andrew Poelstra
f68c3ea229 Merge 347dd76ec8 into merged_master (Bitcoin PR #17093) 2020-11-14 16:51:56 +00:00
Andrew Poelstra
e12785c194 Merge 74c6ad3aab into merged_master (Bitcoin PR #17225) 2020-11-14 16:51:55 +00:00
Andrew Poelstra
60a27c8207 Merge 5bf1909dd9 into merged_master (Bitcoin PR #17682) 2020-11-14 16:51:55 +00:00
Andrew Poelstra
11487538e9 Merge df2b743759 into merged_master (Bitcoin PR #17675) 2020-11-14 16:51:55 +00:00
Andrew Poelstra
8e6dbc90b5 Merge 03e781ff4f into merged_master (Bitcoin PR #17702) 2020-11-14 16:51:55 +00:00
Andrew Poelstra
0da7001e5e Merge 1d6fda65dd into merged_master (Bitcoin PR #17678) 2020-11-14 16:51:55 +00:00
Andrew Poelstra
7579079b64 Merge ac09180128 into merged_master (Bitcoin PR #17680) 2020-11-14 16:51:55 +00:00
Andrew Poelstra
f118b70f8e Merge 05c23488c2 into merged_master (Bitcoin PR #17694) 2020-11-14 16:51:55 +00:00