Commit graph

30488 commits

Author SHA1 Message Date
Andrew Poelstra
cbf37c688c Merge df127ecede into merged_master (Bitcoin PR #19829) 2021-06-15 21:49:44 +00:00
Andrew Poelstra
a1504ea490 Merge 209974d379 into merged_master (Bitcoin PR #20740) 2021-06-15 21:30:12 +00:00
Andrew Poelstra
0e9be949cf Merge f4ac48d30a into merged_master (Bitcoin PR #20735) 2021-06-15 21:10:36 +00:00
Andrew Poelstra
df6ba0e0c8 Merge cc2a5ef9b2 into merged_master (Bitcoin PR #20683) 2021-06-15 20:51:02 +00:00
Andrew Poelstra
c1419171a6 Merge 2556a973ed into merged_master (Bitcoin PR #20731) 2021-06-15 20:31:23 +00:00
Andrew Poelstra
11ff9d19cb Merge 1d7243d307 into merged_master (Bitcoin PR #20737) 2021-06-15 20:11:35 +00:00
Andrew Poelstra
2520d6fe0d Merge 1077c93a34 into merged_master (Bitcoin PR #20692) 2021-06-15 17:06:07 +00:00
Andrew Poelstra
0a58119253 Merge 68c7acf6bb into merged_master (Bitcoin PR #20671) 2021-06-15 16:40:45 +00:00
Andrew Poelstra
ad862c1bc6 Merge f061da2887 into merged_master (Bitcoin PR #20697) 2021-06-15 15:27:02 +00:00
Andrew Poelstra
e5f1f5de3e Merge e9efb64a07 into merged_master (Bitcoin PR #20733) 2021-06-15 15:07:11 +00:00
Andrew Poelstra
b9a8def365 Merge f1dbf92ff0 into merged_master (Bitcoin PR #20434) 2021-06-15 14:46:56 +00:00
Andrew Poelstra
fe1fa5bd61 Merge 83e4670fd7 into merged_master (Bitcoin PR #20690) 2021-06-15 14:26:52 +00:00
Andrew Poelstra
64ce0f34bc Merge 20f4a9421b into merged_master (Bitcoin PR #20682) 2021-06-15 14:07:10 +00:00
Andrew Poelstra
34d59865cd Merge 3dd3f7c0af into merged_master (Bitcoin PR bitcoin-core/gui#155) 2021-06-15 13:47:28 +00:00
Andrew Poelstra
f1767b4fe3 Merge b27104dc52 into merged_master (Bitcoin PR #20687) 2021-06-15 13:27:44 +00:00
Andrew Poelstra
994de82dac Merge 9b28bd73a3 into merged_master (Bitcoin PR #20691) 2021-06-15 13:07:58 +00:00
Andrew Poelstra
80d6b1ae39 Merge 816314ef0f into merged_master (Bitcoin PR #20644) 2021-06-15 03:38:43 +00:00
Andrew Poelstra
b79135c5ea Merge b7136c11ab into merged_master (Bitcoin PR #20686) 2021-06-15 03:18:54 +00:00
Andrew Poelstra
0f0d346057 Merge 190d3d8a75 into merged_master (Bitcoin PR #20681) 2021-06-15 02:59:07 +00:00
Andrew Poelstra
e5d61f39b4 Merge 143bd108ed into merged_master (Bitcoin PR #19137) 2021-06-15 02:39:30 +00:00
Andrew Poelstra
0d66f6cf42 Merge af4ce674da into merged_master (Bitcoin PR #20635) 2021-06-14 23:58:34 +00:00
Andrew Poelstra
51f8ec379c Merge cfbfd389f6 into merged_master (Bitcoin PR #20668) 2021-06-14 23:39:00 +00:00
Andrew Poelstra
fc0d2bf1ce Merge f0913f2f95 into merged_master (Bitcoin PR #20677) 2021-06-14 23:19:26 +00:00
Andrew Poelstra
e797c493e1 Merge 7ef6b1c51d into merged_master (Bitcoin PR #19961) 2021-06-14 22:32:58 +00:00
Andrew Poelstra
d359c3b29c Merge d0e76b5050 into merged_master (Bitcoin PR bitcoin-core/gui#153) 2021-06-14 22:13:25 +00:00
Andrew Poelstra
543f9d3abc Merge 83abd6b126 into merged_master (Bitcoin PR #20680) 2021-06-14 21:54:03 +00:00
Andrew Poelstra
7755242e9e Merge 8452f922d2 into merged_master (Bitcoin PR #19050) 2021-06-14 21:34:24 +00:00
Andrew Poelstra
183caa4bd2 Merge 6f2ca726ce into merged_master (Bitcoin PR #20658)
This deletes .travis.yml. In a follow-up commit (to the whole rebase) we should
re-instate the Liquid-specific CI tests in Cirrus.
2021-06-14 21:14:04 +00:00
Andrew Poelstra
bc9605a44a Merge 1811e488d5 into merged_master (Bitcoin PR #20575) 2021-06-14 20:45:55 +00:00
Andrew Poelstra
f0dda8aba2 Merge 4acbcfa97d into merged_master (Bitcoin PR #20470) 2021-06-14 20:26:03 +00:00
Andrew Poelstra
79a769d60a Merge ae9ee5bdb1 into merged_master (Bitcoin PR #20651) 2021-06-14 20:06:39 +00:00
Andrew Poelstra
8f8513ff26 Merge 427f8c2cff into merged_master (Bitcoin PR #20248) 2021-06-14 19:46:54 +00:00
Andrew Poelstra
26d6840001 Merge 5b6f970e3f into merged_master (Bitcoin PR #20171) 2021-06-14 19:26:23 +00:00
Andrew Poelstra
b8364b36a4 Merge ad3d4b3929 into merged_master (Bitcoin PR #20661) 2021-06-14 19:06:55 +00:00
Andrew Poelstra
d52727714b Merge 69f1ee1922 into merged_master (Bitcoin PR #20365) 2021-06-14 18:47:18 +00:00
Andrew Poelstra
40b55f89b0 Merge 3f205808a5 into merged_master (Bitcoin PR #20605) 2021-06-14 18:26:20 +00:00
Andrew Poelstra
7744178267 Merge 9dbcd37105 into merged_master (Bitcoin PR #20569) 2021-06-14 18:06:07 +00:00
Andrew Poelstra
54488be25f Merge 2d4eeaf9c5 into merged_master (Bitcoin PR #20601)
Looks like Bitcoin #18340 and Elements #815 did the same doc change.
Took the Bitcoin version.
2021-06-14 17:46:19 +00:00
Andrew Poelstra
ea8dc50986 Merge a023094fc4 into merged_master (Bitcoin PR #20276) 2021-06-14 16:13:26 +00:00
Andrew Poelstra
98098be45c Merge 6af8a6232b into merged_master (Bitcoin PR #20650) 2021-06-14 15:20:02 +00:00
Andrew Poelstra
82a8c5ca5a Merge b440c33179 into merged_master (Bitcoin PR #20477) 2021-06-14 15:00:28 +00:00
Andrew Poelstra
8b52d33ea2 Merge dff0f6f753 into merged_master (Bitcoin PR #20611) 2021-06-14 14:41:00 +00:00
Andrew Poelstra
a9b0a3e06b Merge c434e2cca9 into merged_master (Bitcoin PR #20615) 2021-06-14 14:21:41 +00:00
Andrew Poelstra
756863ce67 Merge d9a4738c9d into merged_master (Bitcoin PR #20660) 2021-06-14 14:02:07 +00:00
Andrew Poelstra
5314c886d9 Merge 8bb40d5f56 into merged_master (Bitcoin PR #20560) 2021-06-14 13:42:32 +00:00
Andrew Poelstra
2171928ebc Merge a35a3466ef into merged_master (Bitcoin PR #20653) 2021-06-14 06:11:14 +00:00
Andrew Poelstra
97e70b638a Merge ec6149c01e into merged_master (Bitcoin PR #20616) 2021-06-14 05:50:21 +00:00
Andrew Poelstra
0b03e00cd4 Merge 70150824dc into merged_master (Bitcoin PR #20437) 2021-06-14 05:28:56 +00:00
Andrew Poelstra
f40eadb344 Merge f1f2418433 into merged_master (Bitcoin PR #20253) 2021-06-14 05:07:49 +00:00
Andrew Poelstra
70e525ecd8 Merge 33d6337269 into merged_master (Bitcoin PR bitcoin-core/gui#115) 2021-06-14 04:46:18 +00:00