Commit graph

29954 commits

Author SHA1 Message Date
Andrew Poelstra
8ecedcea73 Merge 75fcfdaf8b into merged_master (Bitcoin PR #18631) 2020-11-26 01:08:19 +00:00
Andrew Poelstra
23cab4213a Merge 4702cadca9 into merged_master (Bitcoin PR #17954) 2020-11-26 01:08:19 +00:00
Andrew Poelstra
0dc35ccd83 Merge 6110ae8326 into merged_master (Bitcoin PR #18451) 2020-11-26 01:08:18 +00:00
Andrew Poelstra
c729046501 Merge 6ef45bc968 into merged_master (Bitcoin PR #18581) 2020-11-26 01:08:18 +00:00
Andrew Poelstra
f8b9066bb1 Merge 130b64415f into merged_master (Bitcoin PR #18493) 2020-11-26 01:08:18 +00:00
Andrew Poelstra
3ad3ea7e75 Merge e28e5353c4 into merged_master (Bitcoin PR #18545) 2020-11-26 01:08:18 +00:00
Andrew Poelstra
c67b9f0c92 Merge d9fd7b5a67 into merged_master (Bitcoin PR #18596) 2020-11-26 01:08:18 +00:00
Andrew Poelstra
f72cf74cb7 Merge d5783985eb into merged_master (Bitcoin PR #18502) 2020-11-26 01:08:18 +00:00
Andrew Poelstra
0f61201649 Merge 4d26312c17 into merged_master (Bitcoin PR #18597) 2020-11-26 01:08:18 +00:00
Andrew Poelstra
bea14c785a Merge c49971f3c9 into merged_master (Bitcoin PR #18584) 2020-11-26 01:08:17 +00:00
Andrew Poelstra
79067914d8 Merge a2b282c9d0 into merged_master (Bitcoin PR #18609) 2020-11-26 01:08:17 +00:00
Andrew Poelstra
9146c7899d Merge 59d6249290 into merged_master (Bitcoin PR #18593) 2020-11-26 01:08:17 +00:00
Andrew Poelstra
d6d099ce1c Merge 76143bf714 into merged_master (Bitcoin PR #18495) 2020-11-26 01:08:17 +00:00
Andrew Poelstra
c37ebe5b63 Merge ed3b8eada8 into merged_master (Bitcoin PR #17595) 2020-11-26 01:08:17 +00:00
Andrew Poelstra
295275e76c Merge a5623ba89f into merged_master (Bitcoin PR #18588) 2020-11-26 01:08:17 +00:00
Andrew Poelstra
85838bef74 Merge 3eb8b1c392 into merged_master (Bitcoin PR #17905) 2020-11-26 01:08:17 +00:00
Andrew Poelstra
bd6ce65044 Merge 75917591c8 into merged_master (Bitcoin PR #18586) 2020-11-26 01:08:17 +00:00
Andrew Poelstra
5f85d5672b Merge 51e2ce45d6 into merged_master (Bitcoin PR #17693) 2020-11-26 01:08:16 +00:00
Andrew Poelstra
9ce236f051 Merge 10358a381a into merged_master (Bitcoin PR #17737) 2020-11-26 01:08:16 +00:00
Andrew Poelstra
8e0d668350 Merge a9213bbe75 into merged_master (Bitcoin PR #18422) 2020-11-26 01:08:16 +00:00
Andrew Poelstra
90081b0645 Merge 99d6a5be8b into merged_master (Bitcoin PR #17999) 2020-11-26 01:08:16 +00:00
Andrew Poelstra
9729ead815 Merge 1b30761360 into merged_master (Bitcoin PR #16367)
For the sake of getting on with the rebase, I just re-added all of bitcoin-common
and bitcoin-server to bitcoin-wallet. We should revisit and try to clean this
up in future, to try to achieve the same separation that Core has.
2020-11-26 01:08:16 +00:00
Andrew Poelstra
e978e137dd Merge 4eb1eeb02c into merged_master (Bitcoin PR #18504) 2020-11-26 01:08:16 +00:00
Andrew Poelstra
f3fc8e9b77 Merge 6ab96ec546 into merged_master (Bitcoin PR #18574) 2020-11-26 01:08:15 +00:00
Andrew Poelstra
5b8850461d Merge a840dab2a5 into merged_master (Bitcoin PR #18541) (Core 0.20 branch point) 2020-11-26 01:08:15 +00:00
Andrew Poelstra
60616b4894 Merge 3347ca4881 into merged_master (Bitcoin PR #18526) 2020-11-26 01:08:15 +00:00
Andrew Poelstra
63a52d3633 Merge 29893ec875 into merged_master (Bitcoin PR #18454) 2020-11-26 01:08:15 +00:00
Andrew Poelstra
db7e691de3 Merge 2b9a4a1332 into merged_master (Bitcoin PR #18577) 2020-11-26 01:08:15 +00:00
Andrew Poelstra
d4323bb589 Merge d486991aa5 into merged_master (Bitcoin PR #18295) 2020-11-26 01:08:15 +00:00
Andrew Poelstra
d53e9f8d68 Merge 405713d00f into merged_master (Bitcoin PR #18529) 2020-11-26 01:08:15 +00:00
Andrew Poelstra
8078d38fd4 Merge 081dcbde66 into merged_master (Bitcoin PR #18561) 2020-11-26 01:08:15 +00:00
Andrew Poelstra
0a82500424 Merge 1ae366ecb0 into merged_master (Bitcoin PR #18569) 2020-11-26 01:08:14 +00:00
Andrew Poelstra
10f14d1162 Merge 87374d80a7 into merged_master (Bitcoin PR #18566) 2020-11-26 01:08:14 +00:00
Andrew Poelstra
12b33a96c3 Merge dcef5ad6ec into merged_master (Bitcoin PR #18562) 2020-11-26 01:08:14 +00:00
Andrew Poelstra
78596942a2 Merge 661bd5dea3 into merged_master (Bitcoin PR #18363) 2020-11-26 01:08:14 +00:00
Andrew Poelstra
5be76a4a3e Merge 3410fe6887 into merged_master (Bitcoin PR #18521) 2020-11-26 01:08:14 +00:00
Andrew Poelstra
92ccd5001b Merge 4c59236376 into merged_master (Bitcoin PR #18533) 2020-11-26 01:08:14 +00:00
Andrew Poelstra
7fc681d080 Merge bfef72d0fb into merged_master (Bitcoin PR #18565) 2020-11-26 01:08:14 +00:00
Andrew Poelstra
73bc0ba257 Merge 2392566284 into merged_master (Bitcoin PR #18563) 2020-11-26 01:08:13 +00:00
Andrew Poelstra
05672b86b5 Merge b3c3d9a518 into merged_master (Bitcoin PR #18558) 2020-11-26 01:08:13 +00:00
Andrew Poelstra
3b362fff93 Merge 1f70185a80 into merged_master (Bitcoin PR #18551) 2020-11-26 01:08:13 +00:00
Andrew Poelstra
c18b5800f1 Merge 1427dfd6e7 into merged_master (Elements PR #855) 2020-11-26 01:08:13 +00:00
Andrew Poelstra
39be0fcc69 Merge 6d259b1446 into merged_master (Elements PR #854) 2020-11-26 01:08:13 +00:00
Andrew Poelstra
c8909955fa Merge 1b151e3ffc into merged_master (Bitcoin PR #18532) 2020-11-26 01:08:13 +00:00
Andrew Poelstra
0a87d878fa Merge 63dad67348 into merged_master (Bitcoin PR #18546) 2020-11-26 01:08:12 +00:00
Andrew Poelstra
50f0165948 Merge d12568e2f8 into merged_master (Bitcoin PR #18549) 2020-11-26 01:08:12 +00:00
Andrew Poelstra
389f392232 Merge 599f3c469d into merged_master (Elements PR #844) 2020-11-26 01:08:12 +00:00
Andrew Poelstra
d4beddb515 Merge abc145c9a4 into merged_master (Bitcoin PR #18543) 2020-11-26 01:08:12 +00:00
Andrew Poelstra
879cfb6ad8 Merge c5966a87d1 into merged_master (Bitcoin PR #18192) 2020-11-26 01:08:11 +00:00
Andrew Poelstra
50e2b06532 Merge c31bcaf203 into merged_master (Bitcoin PR #18458) 2020-11-26 01:08:11 +00:00