Commit graph

1916 commits

Author SHA1 Message Date
Andrew Poelstra
b712035c61 Merge ad1b7b1817 into merged_master (Bitcoin PR #18957) 2020-11-26 01:08:41 +00:00
Andrew Poelstra
c74e34cf8e Merge f71a3a8829 into merged_master (Bitcoin PR #18939) 2020-11-26 01:08:41 +00:00
Andrew Poelstra
1d1a32e637 Merge 5b24f6084e into merged_master (Bitcoin PR #16224) 2020-11-26 01:08:40 +00:00
Andrew Poelstra
b86c297529 Merge afed2e98b0 into merged_master (Bitcoin PR #18810) 2020-11-26 01:08:34 +00:00
Andrew Poelstra
d92b52da42 Merge bab81f7e4d into merged_master (Bitcoin PR #18739) 2020-11-26 01:08:30 +00:00
Andrew Poelstra
1aa7a373b8 Merge 7812889849 into merged_master (Bitcoin PR #18157) 2020-11-26 01:08:29 +00:00
Andrew Poelstra
75c70539ba Merge fb89af26d8 into merged_master (Bitcoin PR #18733) 2020-11-26 01:08:28 +00:00
Andrew Poelstra
8218d55a47 Merge 56d2ff8a8f into merged_master (Bitcoin PR #18676) 2020-11-26 01:08:26 +00:00
Andrew Poelstra
713ff5a8b6 Merge e84a5f0004 into merged_master (Bitcoin PR #18645) 2020-11-26 01:08:20 +00:00
Andrew Poelstra
e8fb7a235f Merge 4d793bcfe8 into merged_master (Bitcoin PR #18632) 2020-11-26 01:08:19 +00:00
Andrew Poelstra
295275e76c Merge a5623ba89f into merged_master (Bitcoin PR #18588) 2020-11-26 01:08:17 +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
f3fc8e9b77 Merge 6ab96ec546 into merged_master (Bitcoin PR #18574) 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
e0c30317c3 Merge 516ebe8a62 into merged_master (Bitcoin PR #18514) 2020-11-26 01:08:10 +00:00
Andrew Poelstra
188d9a4510 Merge f0d6487e29 into merged_master (Bitcoin PR #18513) 2020-11-26 01:08:09 +00:00
Andrew Poelstra
ffe832f297 Merge be60e37e40 into merged_master (Bitcoin PR #18505) 2020-11-26 01:08:08 +00:00
Andrew Poelstra
e92f5306aa Merge d478595fad into merged_master (Bitcoin PR #18382) 2020-11-26 01:08:08 +00:00
Andrew Poelstra
90327e38f1 Merge 0d71395848 into merged_master (Bitcoin PR #18464) 2020-11-26 01:08:08 +00:00
Andrew Poelstra
902c87447a Merge 4df8f458b3 into merged_master (Elements PR #805) 2020-11-26 01:08:05 +00:00
Andrew Poelstra
66dc94c10c Merge 6cfb3dbbdb into merged_master (Bitcoin PR #18391) 2020-11-26 01:08:04 +00:00
Andrew Poelstra
6f9ed6addc Merge 5b4a9f4bdf into merged_master (Bitcoin PR #18342) 2020-11-26 01:08:01 +00:00
Andrew Poelstra
90c7d5774a Merge ac579ada7e into merged_master (Bitcoin PR #18278) 2020-11-26 01:08:00 +00:00
Andrew Poelstra
0d3a838936 Merge 5bf45fe2a9 into merged_master (Bitcoin PR #18386) 2020-11-26 01:07:59 +00:00
Andrew Poelstra
1ac4e4f54b Merge 527c3989e7 into merged_master (Bitcoin PR #18340) 2020-11-26 01:07:59 +00:00
Andrew Poelstra
acec4e75af Merge 5c9d408b2d into merged_master (Bitcoin PR #18300) 2020-11-26 01:07:58 +00:00
Andrew Poelstra
f6f78117e9 Merge 0eebe45cf7 into merged_master (Bitcoin PR #18208) 2020-11-26 01:07:54 +00:00
Andrew Poelstra
0e64ba629b Merge 2926cbcebb into merged_master (Bitcoin PR #18219) 2020-11-26 01:07:53 +00:00
Andrew Poelstra
939b629b2c Merge 90b3e59caf into merged_master (Bitcoin PR #17833) 2020-11-26 01:07:53 +00:00
Andrew Poelstra
a34e87e38f Merge 9c507a77f7 into merged_master (Bitcoin PR #18310) 2020-11-26 01:07:52 +00:00
Andrew Poelstra
0bfe4eb6c4 Merge 5d92ac26ed into merged_master (Bitcoin PR #18264) 2020-11-26 01:07:52 +00:00
Andrew Poelstra
73a733fc17 Merge ffdde475b0 into merged_master (Bitcoin PR #18303) 2020-11-26 01:07:51 +00:00
Andrew Poelstra
a2660bd336 Merge 2492dc0068 into merged_master (Bitcoin PR #18259) 2020-11-26 01:07:49 +00:00
Andrew Poelstra
a0e2e69cfd Merge 31c0006a6c into merged_master (Bitcoin PR #17264) 2020-11-26 01:07:45 +00:00
Andrew Poelstra
a06e42a9f1 Merge eb3c6b0912 into merged_master (Bitcoin PR #18070) 2020-11-26 01:07:44 +00:00
Andrew Poelstra
d6ed4831e0 Merge 56fc2dfcc3 into merged_master (Bitcoin PR #18122) 2020-11-26 01:07:44 +00:00
Andrew Poelstra
8fe90f58dc Merge d4fc9aeb8b into merged_master (Bitcoin PR #18125) 2020-11-26 01:07:42 +00:00
Andrew Poelstra
fae78f5f1e Merge 98264e2ccb into merged_master (Bitcoin PR #18104) 2020-11-26 01:07:42 +00:00
Andrew Poelstra
47d76259bf Merge 22d11187ee into merged_master (Bitcoin PR #17398) 2020-11-26 01:07:41 +00:00
Andrew Poelstra
bcf509470b Merge 75fb37ce68 into merged_master (Bitcoin PR #18032) 2020-11-26 01:07:40 +00:00
Andrew Poelstra
9a8c2b0e3f Merge 8a56f79d49 into merged_master (Bitcoin PR #17482) 2020-11-26 01:07:40 +00:00
Andrew Poelstra
5a603ed0ac Merge c8ce2632eb into merged_master (Bitcoin PR #16392) 2020-11-26 00:29:45 +00:00
Andrew Poelstra
ca0936ab69 Merge 6d0e532ae0 into merged_master (Bitcoin PR #17585) 2020-11-26 00:29:43 +00:00
Andrew Poelstra
b6dc1e00a3 Merge 3e1bf71064 into merged_master (Bitcoin PR #18025) 2020-11-14 19:16:33 +00:00
Andrew Poelstra
a04ef15eea Merge 3b5b276734 into merged_master (Bitcoin PR #17942) 2020-11-14 16:52:13 +00:00
Andrew Poelstra
5423251ff0 Merge 218274de7d into merged_master (Bitcoin PR #17819) 2020-11-14 16:52:08 +00:00
Andrew Poelstra
a16766d528 Merge ceb789cf3a into merged_master (Bitcoin PR #17873) 2020-11-14 16:52:07 +00:00
Andrew Poelstra
74d2e8da1b Merge 7ea3b85ecf into merged_master (Bitcoin PR #17578) 2020-11-14 16:52:04 +00:00
Andrew Poelstra
0b6056198d Merge 35fff5be60 into merged_master (Bitcoin PR #17825) 2020-11-14 16:52:02 +00:00
Andrew Poelstra
8d23feca6c Merge 0cda557340 into merged_master (Bitcoin PR #17751) 2020-11-14 16:52:01 +00:00