Commit graph

27265 commits

Author SHA1 Message Date
Andrew Poelstra
9fdbb98aff Merge 5cafb46fef into merged_master (Bitcoin PR #19294) 2020-11-26 01:09:06 +00:00
Andrew Poelstra
c639197de0 Merge 23b2a68df5 into merged_master (Bitcoin PR #18275) 2020-11-26 01:09:06 +00:00
Andrew Poelstra
b9258b80c0 Merge 86590c17fc into merged_master (Bitcoin PR #19284) 2020-11-26 01:09:06 +00:00
Andrew Poelstra
66472b679f Merge f658c15bb9 into merged_master (Bitcoin PR #18434) 2020-11-26 01:09:06 +00:00
Andrew Poelstra
082754d60d Merge 4b30c41b4e into merged_master (Bitcoin PR #18927) 2020-11-26 01:09:05 +00:00
Andrew Poelstra
24f4a02a03 Merge 0afbeb73cc into merged_master (Bitcoin PR #19153) 2020-11-26 01:09:05 +00:00
Andrew Poelstra
607a572223 Merge 46bdd4b537 into merged_master (Bitcoin PR #19178) 2020-11-26 01:09:05 +00:00
Andrew Poelstra
4649bdde61 Merge 28ce05d06f into merged_master (Bitcoin PR #19260) 2020-11-26 01:09:05 +00:00
Andrew Poelstra
7f24308c8a Merge f28c949f72 into merged_master (Elements PR #815) 2020-11-26 01:09:05 +00:00
Andrew Poelstra
eb1d22acba Merge 1c86ed4148 into merged_master (Bitcoin PR #19276) 2020-11-26 01:09:05 +00:00
Andrew Poelstra
8b03cbaf35 Merge 75edf2cf02 into merged_master (Bitcoin PR #19282) 2020-11-26 01:09:04 +00:00
Andrew Poelstra
0876150543 Merge 195822f1e0 into merged_master (Bitcoin PR #19264) 2020-11-26 01:09:04 +00:00
Andrew Poelstra
0663613ea7 Merge eac65d99dd into merged_master (Bitcoin PR #19261) 2020-11-26 01:09:04 +00:00
Andrew Poelstra
e2ceebdba5 Merge 265492723a into merged_master (Bitcoin PR #18297) 2020-11-26 01:09:04 +00:00
Andrew Poelstra
b9a74b0aeb Merge 8c97780db8 into merged_master (Bitcoin PR #19228)
This commit updates libsecp; I didn't take the update (since I had already updated
to a more recent version of secp-zkp several commits ago) but did take Pieter's
cleanups in the rest of the codebase.
2020-11-26 01:09:04 +00:00
Andrew Poelstra
63d3cc4b8b Merge f154071ec8 into merged_master (Bitcoin PR #19177) 2020-11-26 01:09:04 +00:00
Andrew Poelstra
cd430597f1 Merge 5af16a4db7 into merged_master (Bitcoin PR #16756) 2020-11-26 01:09:04 +00:00
Andrew Poelstra
47f2c8acfa Merge 19e919217e into merged_master (Bitcoin PR #19250) 2020-11-26 01:09:03 +00:00
Andrew Poelstra
55d166627c Merge b33136b6ba into merged_master (Bitcoin PR #19083) 2020-11-26 01:09:03 +00:00
Andrew Poelstra
347c8d5942 Merge 8682414d02 into merged_master (Bitcoin PR #19247) 2020-11-26 01:09:03 +00:00
Andrew Poelstra
dd4616946d Merge 85f7db2284 into merged_master (Bitcoin PR #19239) 2020-11-26 01:09:03 +00:00
Andrew Poelstra
fe4f10e301 Merge 7a24cca829 into merged_master (Bitcoin PR #19100) 2020-11-26 01:09:03 +00:00
Andrew Poelstra
511c24864c Merge 45a6811d36 into merged_master (Bitcoin PR #19206) 2020-11-26 01:09:03 +00:00
Andrew Poelstra
9e70adf13e Merge 6762a627ec into merged_master (Bitcoin PR #19230) 2020-11-26 01:09:02 +00:00
Andrew Poelstra
440e85cbdb Merge 371a73e940 into merged_master (Bitcoin PR #19233) 2020-11-26 01:09:02 +00:00
Andrew Poelstra
9103b3ba4b Merge bc933aeaf0 into merged_master (Bitcoin PR #19226) 2020-11-26 01:09:02 +00:00
Andrew Poelstra
5b92f1e6c2 Merge 20e9531379 into merged_master (Bitcoin PR #19231) 2020-11-26 01:09:02 +00:00
Andrew Poelstra
3aaeae55ea Merge f8364df250 into merged_master (Bitcoin PR #19176) 2020-11-26 01:09:02 +00:00
Andrew Poelstra
cdd63296c9 Merge 221873e158 into merged_master (Bitcoin PR #19227) 2020-11-26 01:09:02 +00:00
Andrew Poelstra
45fbde59c5 Merge 9ad6f14175 into merged_master (Bitcoin PR #19220) 2020-11-26 01:09:02 +00:00
Andrew Poelstra
e92d54175b Merge a79bca2f1f into merged_master (Bitcoin PR #19069) 2020-11-26 01:09:01 +00:00
Andrew Poelstra
7444e07772 Merge 297466b49f into merged_master (Bitcoin PR #18826) 2020-11-26 01:09:01 +00:00
Andrew Poelstra
be9d11ff46 Merge 3e58734e55 into merged_master (Bitcoin PR #18898) 2020-11-26 01:09:01 +00:00
Andrew Poelstra
89ca8ea199 Merge b3ec1fe811 into merged_master (Bitcoin PR #18890) 2020-11-26 01:09:01 +00:00
Andrew Poelstra
c817786377 Merge 9573d2b55b into merged_master (Bitcoin PR #19194) 2020-11-26 01:09:01 +00:00
Andrew Poelstra
f2abfdd2c4 Merge 41fb69404c into merged_master (Bitcoin PR #19192) 2020-11-26 01:09:01 +00:00
Andrew Poelstra
d78ca4c1f3 Merge 374fd6fc8b into merged_master (Bitcoin PR #19189) 2020-11-26 01:09:01 +00:00
Andrew Poelstra
75d6906a08 Merge 8496dbeba6 into merged_master (Bitcoin PR #19190) 2020-11-26 01:09:00 +00:00
Andrew Poelstra
30e68e5e34 Merge 399a0d9dc7 into merged_master (Bitcoin PR #19180) 2020-11-26 01:09:00 +00:00
Andrew Poelstra
6bb4431a8f Merge 807b9f8114 into merged_master (Bitcoin PR #19188) 2020-11-26 01:09:00 +00:00
Andrew Poelstra
b4d7f5db74 Merge b3091b2be7 into merged_master (Bitcoin PR #19202) 2020-11-26 01:09:00 +00:00
Andrew Poelstra
53ee9d62fd Merge 43695b0cf8 into merged_master (Bitcoin PR #19201) 2020-11-26 01:09:00 +00:00
Andrew Poelstra
0a5760376f Merge 1b90a7b61a into merged_master (Bitcoin PR #19005) 2020-11-26 01:09:00 +00:00
Andrew Poelstra
18a2a37ece Merge b1b1739944 into merged_master (Bitcoin PR #18968) 2020-11-26 01:09:00 +00:00
Andrew Poelstra
1044c64be3 Merge 17cfa52d38 into merged_master (Bitcoin PR #19172) 2020-11-26 01:08:59 +00:00
Andrew Poelstra
067e1c3d95 Merge 0fc6ea216c into merged_master (Bitcoin PR #19096) 2020-11-26 01:08:59 +00:00
Andrew Poelstra
f97404e437 Merge aa35ea5502 into merged_master (Bitcoin PR #19173) 2020-11-26 01:08:59 +00:00
Andrew Poelstra
87dc4ce088 Merge b55b5b6c3d into merged_master (Bitcoin PR #19164) 2020-11-26 01:08:59 +00:00
Andrew Poelstra
3352f7ec0c Merge f4f2220456 into merged_master (Bitcoin PR #19132) 2020-11-26 01:08:59 +00:00
Andrew Poelstra
20efb3068b Merge 7f9800caf9 into merged_master (Bitcoin PR #15202) 2020-11-26 01:08:59 +00:00