Commit graph

29954 commits

Author SHA1 Message Date
Andrew Poelstra
7af2bdc594 Merge 9453fbf5a0 into merged_master (Bitcoin PR bitcoin-core/gui#20) 2020-12-01 16:27:14 +00:00
Andrew Poelstra
1254d1081d Merge 88271184e8 into merged_master (Bitcoin PR #20112) 2020-12-01 16:10:09 +00:00
Andrew Poelstra
797a5bf283 Merge 7012db2a6b into merged_master (Bitcoin PR #20176) 2020-12-01 16:03:26 +00:00
Andrew Poelstra
f1188d79e4 Merge 1cb4e339f9 into merged_master (Bitcoin PR #20039) 2020-12-01 15:56:21 +00:00
Andrew Poelstra
5a0577ecb6 Merge dda18e7310 into merged_master (Bitcoin PR #20214) 2020-12-01 15:16:21 +00:00
Andrew Poelstra
bd9d811281 Merge b46f37ba5e into merged_master (Bitcoin PR #20198) 2020-12-01 14:56:40 +00:00
Andrew Poelstra
6f267e338a Merge 47fc883106 into merged_master (Bitcoin PR #19967) 2020-12-01 14:36:58 +00:00
Andrew Poelstra
eebfc818d0 Merge 0f86e7f128 into merged_master (Bitcoin PR #20157) 2020-12-01 14:25:00 +00:00
Andrew Poelstra
9eb2afd7ff Merge f5bd46a4cc into merged_master (Bitcoin PR #20125) 2020-12-01 14:13:32 +00:00
Andrew Poelstra
21a16c8199 Merge 45385018e1 into merged_master (Bitcoin PR #20162) 2020-12-01 06:56:01 +00:00
Andrew Poelstra
8258a74157 Merge 4f807348af into merged_master (Bitcoin PR #20185) 2020-12-01 06:49:23 +00:00
Andrew Poelstra
dad417577a Merge 4769942d90 into merged_master (Bitcoin PR #19624) 2020-12-01 06:42:52 +00:00
Andrew Poelstra
86062499f5 Merge d9d9a29352 into merged_master (Bitcoin PR #20179) 2020-12-01 06:36:26 +00:00
Andrew Poelstra
5ca702b5d9 Merge 152ddb3197 into merged_master (Bitcoin PR #20180) 2020-12-01 06:29:15 +00:00
Andrew Poelstra
3d291dba91 Merge 62af467ff0 into merged_master (Bitcoin PR #20082) 2020-12-01 06:22:43 +00:00
Andrew Poelstra
f515eab2f2 Merge a1e0359618 into merged_master (Bitcoin PR #19986) 2020-12-01 06:10:23 +00:00
Andrew Poelstra
60ebf8a17a Merge c92aa8357c into merged_master (Bitcoin PR #19911) 2020-12-01 05:53:59 +00:00
Andrew Poelstra
251361078d Merge 80c8a02f1b into merged_master (Bitcoin PR #20159) 2020-12-01 05:47:16 +00:00
Andrew Poelstra
ce4acf6ba9 Merge 5d644778da into merged_master (Bitcoin PR #20169) 2020-12-01 05:40:44 +00:00
Andrew Poelstra
8930903bcc Merge b3527fd2e9 into merged_master (Bitcoin PR #20168) 2020-12-01 05:33:57 +00:00
Andrew Poelstra
ebadde11cd Merge 9e8d2bd076 into merged_master (Bitcoin PR bitcoin-core/gui#97) 2020-12-01 05:20:53 +00:00
Andrew Poelstra
b733f588d8 Merge cb21d864c5 into merged_master (Bitcoin PR #19401) 2020-12-01 05:14:13 +00:00
Andrew Poelstra
205b628304 Merge 2947ae6f85 into merged_master (Bitcoin PR #20035) 2020-12-01 04:33:11 +00:00
Andrew Poelstra
85663c72a3 Merge 82d3596dfe into merged_master (Bitcoin PR #20161) 2020-12-01 04:25:27 +00:00
Andrew Poelstra
e483648523 Merge cbb5f3a2d5 into merged_master (Bitcoin PR #19836) 2020-12-01 04:16:10 +00:00
Andrew Poelstra
7578d2068f Merge 9ad7cd2887 into merged_master (Bitcoin PR #20090) 2020-12-01 04:04:03 +00:00
Andrew Poelstra
943ae42b1a Merge 9855422e65 into merged_master (Bitcoin PR #17428) 2020-12-01 03:53:08 +00:00
Andrew Poelstra
2a2f3e49ea Merge 0d22482353 into merged_master (Bitcoin PR #20002) 2020-12-01 03:42:49 +00:00
Andrew Poelstra
0ef34670a2 Merge 711ddce943 into merged_master (Bitcoin PR #20131) 2020-12-01 03:36:05 +00:00
Andrew Poelstra
653fe79fe8 Merge 560dea9b26 into merged_master (Bitcoin PR #19770) 2020-12-01 03:29:12 +00:00
Andrew Poelstra
ff121d071d Merge e3b474c548 into merged_master (Bitcoin PR #20140) 2020-12-01 03:09:48 +00:00
Andrew Poelstra
595bf707be Merge 3956165903 into merged_master (Bitcoin PR #17775) 2020-12-01 03:02:17 +00:00
Andrew Poelstra
e765fc93ea Merge 3caee16946 into merged_master (Bitcoin PR #19953)
Taproot :D
2020-12-01 02:54:57 +00:00
Andrew Poelstra
4eeadb7fde Merge 8ed37f6c84 into merged_master (Bitcoin PR #19077) 2020-11-30 20:20:56 +00:00
Andrew Poelstra
da0f4ad1de Merge f2e6d14430 into merged_master (Bitcoin PR #20147)
Update secp256k1-zkp to ff4714e6417c56f7235b287d4a9e555df10e09af latest master,
which is up to date with upstream libsecp 9e5939d2848df5508e3a6eb038273b28d255248c
(pull request #835 Nov 4 2020)
2020-11-30 19:33:11 +00:00
Andrew Poelstra
de9f3068a8 Merge 661fe5d65c into merged_master (Bitcoin PR #20146) 2020-11-30 19:25:46 +00:00
Andrew Poelstra
f327fa97f2 Merge c2c4dbaebd into merged_master (Bitcoin PR #19988) 2020-11-30 19:05:03 +00:00
Andrew Poelstra
a8f78d1aef Merge 99a1d572ea into merged_master (Bitcoin PR #18750) 2020-11-30 18:59:04 +00:00
Andrew Poelstra
6a979f902a Merge 9efa55c715 into merged_master (Bitcoin PR #20130) 2020-11-30 18:50:04 +00:00
Andrew Poelstra
5ac09f4543 Merge 3750f664b3 into merged_master (Bitcoin PR #20129) 2020-11-30 18:44:05 +00:00
Andrew Poelstra
ed77072953 Merge e21b824386 into merged_master (Bitcoin PR #20109) 2020-11-30 18:38:05 +00:00
Andrew Poelstra
e40c69583b Merge ec0453cd57 into merged_master (Bitcoin PR bitcoin-core/gui#102) 2020-11-30 18:32:13 +00:00
Andrew Poelstra
c33f69966f Merge cd6e193d4c into merged_master (Bitcoin PR #20126) 2020-11-30 18:26:10 +00:00
Andrew Poelstra
1c396306e3 Merge ad90dd9f31 into merged_master (Bitcoin PR #20141) 2020-11-30 18:14:23 +00:00
Andrew Poelstra
a21f702161 Merge f79a4a8952 into merged_master (Bitcoin PR #19998) 2020-11-30 17:55:22 +00:00
Andrew Poelstra
c9621a0d4a Merge af22322dab into merged_master (Bitcoin PR #20119) 2020-11-30 17:36:05 +00:00
Andrew Poelstra
4cb66aae97 Merge 0b2abaa666 into merged_master (Bitcoin PR #19954) 2020-11-30 17:12:23 +00:00
Andrew Poelstra
d504893530 Merge 12a1c3ad1a into merged_master (Bitcoin PR #20107) 2020-11-30 17:06:15 +00:00
Andrew Poelstra
d3cbe231b7 Merge 6854dbdc88 into merged_master (Bitcoin PR #20076) 2020-11-30 17:00:03 +00:00
Andrew Poelstra
6ded9c5799 Merge 380705ef4f into merged_master (Bitcoin PR #20106) 2020-11-30 16:53:46 +00:00