Commit graph

29954 commits

Author SHA1 Message Date
Andrew Poelstra
d164aab502 Merge f61019f5a2 into merged_master (Bitcoin PR #19407) 2020-11-26 01:09:19 +00:00
Andrew Poelstra
5256a1801a Merge 7d9008f43e into merged_master (Bitcoin PR #18307) 2020-11-26 01:09:18 +00:00
Andrew Poelstra
75957715ea Merge daae8b8a1b into merged_master (Bitcoin PR #18649) 2020-11-26 01:09:18 +00:00
Andrew Poelstra
d664527f5a Merge a24806c25d into merged_master (Bitcoin PR #19215) 2020-11-26 01:09:18 +00:00
Andrew Poelstra
69e312dd49 Merge 7027c67cac into merged_master (Bitcoin PR #18288) 2020-11-26 01:09:18 +00:00
Andrew Poelstra
c99c50cb5d Merge d77170d526 into merged_master (Bitcoin PR #19422) 2020-11-26 01:09:18 +00:00
Andrew Poelstra
9ac0c98505 Merge 7173a3c73b into merged_master (Bitcoin PR #19396) 2020-11-26 01:09:18 +00:00
Andrew Poelstra
cc0072fe9d Merge d6fe5b28df into merged_master (Bitcoin PR #19427) 2020-11-26 01:09:17 +00:00
Andrew Poelstra
f29422f885 Merge 501203aa91 into merged_master (Bitcoin PR bitcoin-core/gui#17) 2020-11-26 01:09:17 +00:00
Andrew Poelstra
473dea4c7b Merge 01f857a1c9 into merged_master (Bitcoin PR #19428) 2020-11-26 01:09:17 +00:00
Andrew Poelstra
95afc45f8b Merge 85a68952f8 into merged_master (Bitcoin PR #19408) 2020-11-26 01:09:17 +00:00
Andrew Poelstra
5fcf5348d9 Merge e1b20e2285 into merged_master (Bitcoin PR #19028) 2020-11-26 01:09:17 +00:00
Andrew Poelstra
c98ad474ff Merge 9d92ee12fd into merged_master (Bitcoin PR #19257) 2020-11-26 01:09:17 +00:00
Andrew Poelstra
c5a26c7e94 Merge ffa70801da into merged_master (Bitcoin PR #19256) 2020-11-26 01:09:17 +00:00
Andrew Poelstra
bc6c7eaaed Merge 26291745ae into merged_master (Bitcoin PR #19308) 2020-11-26 01:09:16 +00:00
Andrew Poelstra
c473bf0bce Merge bb588669f9 into merged_master (Bitcoin PR #19331) 2020-11-26 01:09:16 +00:00
Andrew Poelstra
e96a115bab Merge f6072e601a into merged_master (Bitcoin PR #19368) 2020-11-26 01:09:16 +00:00
Andrew Poelstra
8a153a789d Merge e491e55646 into merged_master (Bitcoin PR #19375) 2020-11-26 01:09:16 +00:00
Andrew Poelstra
12fdc21bb3 Merge 2af56d6d5c into merged_master (Bitcoin PR #19399) 2020-11-26 01:09:16 +00:00
Andrew Poelstra
845369d7d7 Merge 8d3187fd0d into merged_master (Bitcoin PR #19412) 2020-11-26 01:09:16 +00:00
Andrew Poelstra
357c4d5d39 Merge 5c3c7cc50c into merged_master (Bitcoin PR #19300) 2020-11-26 01:09:15 +00:00
Andrew Poelstra
0ffac0f3a2 Merge dbadf746e2 into merged_master (Bitcoin PR #19333) 2020-11-26 01:09:15 +00:00
Andrew Poelstra
e2677ef2dc Merge 1269cab21a into merged_master (Bitcoin PR #19403) 2020-11-26 01:09:15 +00:00
Andrew Poelstra
a4f01a718d Merge 8edfc1715a into merged_master (Bitcoin PR #19204) 2020-11-26 01:09:15 +00:00
Andrew Poelstra
a208c7c379 Merge 748178f13e into merged_master (Bitcoin PR #19394) 2020-11-26 01:09:15 +00:00
Andrew Poelstra
8d7360e77e Merge fb87f6d168 into merged_master (Bitcoin PR #19367) 2020-11-26 01:09:15 +00:00
Andrew Poelstra
cf3a707cf4 Merge 19612ca2eb into merged_master (Bitcoin PR #19371) 2020-11-26 01:09:15 +00:00
Andrew Poelstra
03be0042a4 Merge b80ae6b4c0 into merged_master (Bitcoin PR #19344) 2020-11-26 01:09:14 +00:00
Andrew Poelstra
3ca5870220 Merge 2f54c76050 into merged_master (Bitcoin PR #19390) 2020-11-26 01:09:14 +00:00
Andrew Poelstra
b045c71f40 Merge dd191b5832 into merged_master (Bitcoin PR #19356) 2020-11-26 01:09:14 +00:00
Andrew Poelstra
dc44b27189 Merge d3a5dbfd1f into merged_master (Bitcoin PR #19114) 2020-11-26 01:09:14 +00:00
Andrew Poelstra
2b85057ca2 Merge d342a45ca7 into merged_master (Bitcoin PR #19354) 2020-11-26 01:09:14 +00:00
Andrew Poelstra
1d8262b7e5 Merge d06cf34656 into merged_master (Bitcoin PR bitcoin-core/gui#6) 2020-11-26 01:09:14 +00:00
Andrew Poelstra
3f85455775 Merge 4946400470 into merged_master (Bitcoin PR bitcoin-core/gui#8) 2020-11-26 01:09:13 +00:00
Andrew Poelstra
84109bef9a Merge 3bbd8225b9 into merged_master (Bitcoin PR #19366) 2020-11-26 01:09:13 +00:00
Andrew Poelstra
a2b426f3f9 Merge f32f7e907a into merged_master (Bitcoin PR #11413) 2020-11-26 01:09:13 +00:00
Andrew Poelstra
ec5e799c05 Merge 910f0468a1 into merged_master (Bitcoin PR #19348) 2020-11-26 01:09:13 +00:00
Andrew Poelstra
11d9e179e3 Merge c8fa03d176 into merged_master (Bitcoin PR #19378) 2020-11-26 01:09:13 +00:00
Andrew Poelstra
1f1b2cb2c6 Merge 90981b7d68 into merged_master (Bitcoin PR #19286) 2020-11-26 01:09:13 +00:00
Andrew Poelstra
72283db549 Merge 3a4a3729d9 into merged_master (Bitcoin PR #19090) 2020-11-26 01:09:13 +00:00
Andrew Poelstra
c4d62da832 Merge ead6d686eb into merged_master (Bitcoin PR #18912)
Another travis conflict. This time I just pulled .travis.yml, .cirrus.yml, and
ci/ directly from Core. Our diff against Travis pre-rebase was fairly small and
should be easy to reconstruct manually afterward.
2020-11-26 01:09:12 +00:00
Andrew Poelstra
44551473a5 Merge c9d1040d25 into merged_master (Bitcoin PR #19237) 2020-11-26 01:09:12 +00:00
Andrew Poelstra
5402e2ba19 Merge 67881de0e3 into merged_master (Bitcoin PR #19272) 2020-11-26 01:09:12 +00:00
Andrew Poelstra
b431cfa2d7 Merge 532b134cb0 into merged_master (Bitcoin PR #19373) 2020-11-26 01:09:12 +00:00
Andrew Poelstra
680abb8d59 Merge 205b87d2f6 into merged_master (Bitcoin PR #19357) 2020-11-26 01:09:12 +00:00
Andrew Poelstra
e9e70341b9 Merge dae1bd61b2 into merged_master (Bitcoin PR bitcoin-core/gui#11) 2020-11-26 01:09:12 +00:00
Andrew Poelstra
88ce28c8e8 Merge 80fd474e40 into merged_master (Bitcoin PR #19240) 2020-11-26 01:09:11 +00:00
Andrew Poelstra
2a08128dff Merge e3fa3c7d67 into merged_master (Bitcoin PR #19305) 2020-11-26 01:09:11 +00:00
Andrew Poelstra
85365481fa Merge a6aac20019 into merged_master (Bitcoin PR #19350) 2020-11-26 01:09:11 +00:00
Andrew Poelstra
3c6fb19445 Merge f591a1a184 into merged_master (Bitcoin PR #19351) 2020-11-26 01:09:11 +00:00