Commit graph

25521 commits

Author SHA1 Message Date
Andrew Poelstra
61ff799bb3 Merge 94d3063c93 into merged_master (Bitcoin PR #18412) 2020-11-26 01:08:02 +00:00
Andrew Poelstra
7485279a6a Merge 23991ee53a into merged_master (Bitcoin PR #15600) 2020-11-26 01:08:02 +00:00
Andrew Poelstra
0e2b0efe75 Merge f3a91ab0ed into merged_master (Bitcoin PR #18438) 2020-11-26 01:08:02 +00:00
Andrew Poelstra
68e01e1444 Merge e99ca783cd into merged_master (Bitcoin PR #18429) 2020-11-26 01:08:02 +00:00
Andrew Poelstra
c74bac6499 Merge d8ce27ff9f into merged_master (Bitcoin PR #18397) 2020-11-26 01:08:02 +00:00
Andrew Poelstra
5b3e849748 Merge 2e97d80017 into merged_master (Bitcoin PR #18134) 2020-11-26 01:08:02 +00:00
Andrew Poelstra
bf3d25155f Merge 7c94225026 into merged_master (Bitcoin PR #18430) 2020-11-26 01:08:01 +00:00
Andrew Poelstra
be1fc184a0 Merge 60a39a96fc into merged_master (Bitcoin PR #18425) 2020-11-26 01:08:01 +00:00
Andrew Poelstra
837b054f39 Merge 3c029f42bd into merged_master (Elements PR #840) 2020-11-26 01:08:01 +00:00
Andrew Poelstra
1956e464aa Merge 3e50fdbe4e into merged_master (Bitcoin PR #18395) 2020-11-26 01:08:01 +00:00
Andrew Poelstra
20b2abaa42 Merge 244e88e6b5 into merged_master (Bitcoin PR #18402) 2020-11-26 01:08:01 +00:00
Andrew Poelstra
fa89f6d1e3 Merge baa72cd9a2 into merged_master (Bitcoin PR #18331) 2020-11-26 01:08:01 +00:00
Andrew Poelstra
0f324860f0 Merge 3f5107d008 into merged_master (Bitcoin PR #18423) 2020-11-26 01:08:01 +00:00
Andrew Poelstra
6f9ed6addc Merge 5b4a9f4bdf into merged_master (Bitcoin PR #18342) 2020-11-26 01:08:01 +00:00
Andrew Poelstra
477c4a5c58 Merge ac5a435247 into merged_master (Elements PR #838) 2020-11-26 01:08:00 +00:00
Andrew Poelstra
026d7eeb7c Merge 5236b2e267 into merged_master (Bitcoin PR #18417) 2020-11-26 01:08:00 +00:00
Andrew Poelstra
612c8361d0 Merge 98fbb2a184 into merged_master (Bitcoin PR #17720) 2020-11-26 01:08:00 +00:00
Andrew Poelstra
90c7d5774a Merge ac579ada7e into merged_master (Bitcoin PR #18278) 2020-11-26 01:08:00 +00:00
Andrew Poelstra
87601efae8 Merge 97b0687501 into merged_master (Bitcoin PR #18393) 2020-11-26 01:08:00 +00:00
Andrew Poelstra
ff1454245a Merge d478a737db into merged_master (Bitcoin PR #18392) 2020-11-26 01:08:00 +00:00
Andrew Poelstra
169fbf8221 Merge 57a8fa9c3b into merged_master (Bitcoin PR #18406) 2020-11-26 01:08:00 +00:00
Andrew Poelstra
a4a5149034 Merge 5504703a9f into merged_master (Bitcoin PR #18396) 2020-11-26 01:07:59 +00:00
Andrew Poelstra
0d3a838936 Merge 5bf45fe2a9 into merged_master (Bitcoin PR #18386) 2020-11-26 01:07:59 +00:00
Andrew Poelstra
cf93edb0be Merge 312d27b11c into merged_master (Bitcoin PR #17477) 2020-11-26 01:07:59 +00:00
Andrew Poelstra
1ac4e4f54b Merge 527c3989e7 into merged_master (Bitcoin PR #18340) 2020-11-26 01:07:59 +00:00
Andrew Poelstra
59abbbdd3a Merge 3d3d834324 into merged_master (Bitcoin PR #18359) 2020-11-26 01:07:59 +00:00
Andrew Poelstra
e1f1d5dc40 Merge 67de1ee8bc into merged_master (Bitcoin PR #18378) 2020-11-26 01:07:59 +00:00
Andrew Poelstra
266e2a127b Merge a421e0a22f into merged_master (Bitcoin PR #18376) 2020-11-26 01:07:59 +00:00
Andrew Poelstra
acec4e75af Merge 5c9d408b2d into merged_master (Bitcoin PR #18300) 2020-11-26 01:07:58 +00:00
Andrew Poelstra
f0feab3ce6 Merge e83a1de4c0 into merged_master (Bitcoin PR #18155) 2020-11-26 01:07:58 +00:00
Andrew Poelstra
5718ad9505 Merge dbb067da38 into merged_master (Bitcoin PR #18379) 2020-11-26 01:07:58 +00:00
Andrew Poelstra
f1d8503046 Merge 3a8d25064e into merged_master (Bitcoin PR #18371) 2020-11-26 01:07:58 +00:00
Andrew Poelstra
72cf6e58ca Merge ce87d5613a into merged_master (Bitcoin PR #18289) 2020-11-26 01:07:58 +00:00
Andrew Poelstra
76d5966b9d Merge 39497d1f32 into merged_master (Bitcoin PR #15283) 2020-11-26 01:07:58 +00:00
Andrew Poelstra
fc64d8f534 Merge 95602ec21f into merged_master (Elements PR #834)
Hadta bump the fee test in feature_confidential_transactions.py since our default
rangeproofs are now bigger.
2020-11-26 01:07:58 +00:00
Andrew Poelstra
42372ae3a5 Merge ad04f0d8a5 into merged_master (Bitcoin PR #17319) 2020-11-26 01:07:57 +00:00
Andrew Poelstra
cc259f1835 Merge 71d00ba8df into merged_master (Elements PR #835) 2020-11-26 01:07:57 +00:00
Andrew Poelstra
e20f8c85a5 Merge d2d0a04a66 into merged_master (Bitcoin PR #18353) 2020-11-26 01:07:57 +00:00
Andrew Poelstra
73c05b4416 Merge f6748b39a6 into merged_master (Elements PR #795) 2020-11-26 01:07:57 +00:00
Andrew Poelstra
aa81dd6cf2 Merge ad27fddd1f into merged_master (Elements PR #796) 2020-11-26 01:07:57 +00:00
Andrew Poelstra
a6dc11ab7a Merge 1d64dfe4fa into merged_master (Bitcoin PR #18364) 2020-11-26 01:07:57 +00:00
Andrew Poelstra
526b571c9e Merge 8fc5f2bdf0 into merged_master (Bitcoin PR #18366) 2020-11-26 01:07:57 +00:00
Andrew Poelstra
a2b9606552 Merge 7060d2d97a into merged_master (Bitcoin PR #18350) 2020-11-26 01:07:56 +00:00
Andrew Poelstra
80db97d6db Merge 25424cf57e into merged_master (Bitcoin PR #18346) 2020-11-26 01:07:56 +00:00
Andrew Poelstra
665487ce94 Merge bef78a0447 into merged_master (Elements PR #828) 2020-11-26 01:07:56 +00:00
Andrew Poelstra
5aa6af6fa3 Merge 8662387309 into merged_master (Bitcoin PR #17997) 2020-11-26 01:07:56 +00:00
Andrew Poelstra
1f5486574f Merge a64e5bed6b into merged_master (Bitcoin PR #18344) 2020-11-26 01:07:56 +00:00
Andrew Poelstra
c718f86e8f Merge 9ed429c50a into merged_master (Bitcoin PR #18341) 2020-11-26 01:07:56 +00:00
Andrew Poelstra
47d3708950 Merge 69f4f2c433 into merged_master (Bitcoin PR #18357) 2020-11-26 01:07:55 +00:00
Andrew Poelstra
f0e15e5470 Merge d31f92586a into merged_master (Bitcoin PR #18360) 2020-11-26 01:07:55 +00:00