Andrew Poelstra
74c41d1142
Merge 0101110f9b into merged_master (Bitcoin PR #19322 )
2020-11-26 01:09:08 +00:00
Andrew Poelstra
34f4c80e84
Merge 057bd3189f into merged_master (Bitcoin PR #19197 )
2020-11-26 01:09:08 +00:00
Andrew Poelstra
b99679fa3c
Merge dbd7a91fdf into merged_master (Bitcoin PR #19310 )
2020-11-26 01:09:08 +00:00
Andrew Poelstra
bc28bc22ab
Merge c2bcb99c1d into merged_master (Bitcoin PR #19071 )
2020-11-26 01:09:08 +00:00
Andrew Poelstra
c3b6bbba4a
Merge 0865a8881d into merged_master (Bitcoin PR bitcoin-core/gui#3 )
2020-11-26 01:09:08 +00:00
Andrew Poelstra
888295ecc9
Merge c7ebab12f9 into merged_master (Bitcoin PR #19292 )
2020-11-26 01:09:08 +00:00
Andrew Poelstra
2468108f7b
Merge b8740d6737 into merged_master (Bitcoin PR #18468 )
2020-11-26 01:09:07 +00:00
Andrew Poelstra
40b150a590
Merge 343c0bfbf1 into merged_master (Bitcoin PR #19304 )
2020-11-26 01:09:07 +00:00
Andrew Poelstra
d9dfab5f35
Merge 931035b608 into merged_master (Bitcoin PR #19301 )
2020-11-26 01:09:07 +00:00
Andrew Poelstra
a922c8f530
Merge 35ed88f187 into merged_master (Bitcoin PR #19298 )
2020-11-26 01:09:07 +00:00
Andrew Poelstra
99d485db22
Merge 39bd9ddb87 into merged_master (Bitcoin PR #19295 )
2020-11-26 01:09:07 +00:00
Andrew Poelstra
38b86cf63f
Merge 38389dd3a0 into merged_master (Bitcoin PR #19252 )
2020-11-26 01:09:07 +00:00
Andrew Poelstra
6f90ae4b2a
Merge 9a482d3604 into merged_master (Bitcoin PR #19249 )
2020-11-26 01:09:07 +00:00
Andrew Poelstra
b5d56ca95c
Merge 62d863f915 into merged_master (Bitcoin PR #19290 )
2020-11-26 01:09:06 +00:00
Andrew Poelstra
b00b4d3083
Merge 09da0e46bf into merged_master (Bitcoin PR #19287 )
2020-11-26 01:09:06 +00:00
Andrew Poelstra
235e1f0ec5
Merge 3faf3429e9 into merged_master (Bitcoin PR #19299 )
2020-11-26 01:09:06 +00:00
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