Andrew Poelstra
e81fccc9a5
Merge 263f53e2d0 into merged_master (Bitcoin PR #18098 )
2020-11-26 01:07:43 +00:00
Andrew Poelstra
4f614ee4fb
Merge 94c0287aec into merged_master (Bitcoin PR #18159 )
2020-11-26 01:07:43 +00:00
Andrew Poelstra
464b206bfb
Merge 33861a8367 into merged_master (Bitcoin PR #18145 )
2020-11-26 01:07:43 +00:00
Andrew Poelstra
518f90e0bc
Merge 2a2631fb0d into merged_master (Bitcoin PR #18108 )
2020-11-26 01:07:43 +00:00
Andrew Poelstra
54b93c4315
Merge 470664f2b7 into merged_master (Bitcoin PR #17746 )
2020-11-26 01:07:43 +00:00
Andrew Poelstra
6cee14bbd6
Merge 0c20809da8 into merged_master (Bitcoin PR #18121 )
2020-11-26 01:07:43 +00:00
Andrew Poelstra
59e331ab92
Merge b6a16fa44e into merged_master (Bitcoin PR #18123 )
2020-11-26 01:07:42 +00:00
Andrew Poelstra
eb39c0e072
Merge 2bdc476d4d into merged_master (Bitcoin PR #17708 )
2020-11-26 01:07:42 +00:00
Andrew Poelstra
8fe90f58dc
Merge d4fc9aeb8b into merged_master (Bitcoin PR #18125 )
2020-11-26 01:07:42 +00:00
Andrew Poelstra
bca8bce3b7
Merge caa2f3af29 into merged_master (Bitcoin PR #12134 )
2020-11-26 01:07:42 +00:00
Andrew Poelstra
94c95f1789
Merge 73a396e028 into merged_master (Bitcoin PR #18004 )
2020-11-26 01:07:42 +00:00
Andrew Poelstra
fae78f5f1e
Merge 98264e2ccb into merged_master (Bitcoin PR #18104 )
2020-11-26 01:07:42 +00:00
Andrew Poelstra
8d6c3cd351
Merge 35b7a8e539 into merged_master (Bitcoin PR #18087 )
2020-11-26 01:07:42 +00:00
Andrew Poelstra
ee2930b3f1
Merge 646f0ada02 into merged_master (Bitcoin PR #18051 )
2020-11-26 01:07:42 +00:00
Andrew Poelstra
b734847060
Merge ceb3d45f7d into merged_master (Bitcoin PR #17947 )
2020-11-26 01:07:42 +00:00
Andrew Poelstra
dd22beb3b3
Merge e5ab941489 into merged_master (Elements PR #813 )
2020-11-26 01:07:41 +00:00
Andrew Poelstra
f11b83b6a3
Merge 4c2578706c into merged_master (Bitcoin PR #18021 )
...
Had to change the signature of VectorReader::operator>>. I think this
is a bug upstream that only affects us beacuse we are using this operator
in a couple places to deserialize Bitcoin transactions and Merkle proofs
from pegin witnesses. Upstream does not appear to use this operator at
all. I am a little nervous about PR'ing to fix upstream because I am
afraid they'll take it away, so best we keep this among ourselves.
2020-11-26 01:07:41 +00:00
Andrew Poelstra
68844be4f2
Merge b063cb690f into merged_master (Bitcoin PR #18081 )
2020-11-26 01:07:41 +00:00
Andrew Poelstra
d6af827d71
Merge ab7915f804 into merged_master (Bitcoin PR #18106 )
2020-11-26 01:07:41 +00:00
Andrew Poelstra
634674ca61
Merge 657c5e5f1c into merged_master (Bitcoin PR #18099 )
2020-11-26 01:07:41 +00:00
Andrew Poelstra
6456c59bee
Merge 9e77726fb7 into merged_master (Bitcoin PR #18101 )
2020-11-26 01:07:41 +00:00
Andrew Poelstra
0c7d2dfdb4
Merge 407d7c831a into merged_master (Bitcoin PR #18091 )
2020-11-26 01:07:41 +00:00
Andrew Poelstra
3e67027695
Merge 0193fd766b into merged_master (Bitcoin PR #18082 )
2020-11-26 01:07:41 +00:00
Andrew Poelstra
47d76259bf
Merge 22d11187ee into merged_master (Bitcoin PR #17398 )
2020-11-26 01:07:41 +00:00
Andrew Poelstra
bcf509470b
Merge 75fb37ce68 into merged_master (Bitcoin PR #18032 )
2020-11-26 01:07:40 +00:00
Andrew Poelstra
1f33ea30e7
Merge 23fab1a3df into merged_master (Bitcoin PR #18062 )
2020-11-26 01:07:40 +00:00
Andrew Poelstra
df1a5b114d
Merge 4d211c8da1 into merged_master (Bitcoin PR #18003 )
2020-11-26 01:07:40 +00:00
Andrew Poelstra
9a8c2b0e3f
Merge 8a56f79d49 into merged_master (Bitcoin PR #17482 )
2020-11-26 01:07:40 +00:00
Andrew Poelstra
d20bafff5e
Merge 712b7d9b47 into merged_master (Bitcoin PR #17804 )
2020-11-26 00:29:45 +00:00
Andrew Poelstra
3f02ec4810
Merge b30a1f3e39 into merged_master (Bitcoin PR #18052 )
2020-11-26 00:29:45 +00:00
Andrew Poelstra
5a603ed0ac
Merge c8ce2632eb into merged_master (Bitcoin PR #16392 )
2020-11-26 00:29:45 +00:00
Andrew Poelstra
618a2ba1aa
Merge 01668839de into merged_master (Bitcoin PR #17660 )
2020-11-26 00:29:45 +00:00
Andrew Poelstra
8388f8d515
Merge adea5e1b54 into merged_master (Bitcoin PR #18023 )
2020-11-26 00:29:44 +00:00
Andrew Poelstra
34033c4586
Merge bd5c4c6971 into merged_master (Bitcoin PR #18069 )
...
More diff reduction :)
2020-11-26 00:29:44 +00:00
Andrew Poelstra
375008bf68
Merge 554d89fb29 into merged_master (Bitcoin PR #18029 )
2020-11-26 00:29:44 +00:00
Andrew Poelstra
78186106c6
Merge a064e005fa into merged_master (Bitcoin PR #18059 )
2020-11-26 00:29:44 +00:00
Andrew Poelstra
8d1ab67392
Merge 8625446b4d into merged_master (Bitcoin PR #17336 )
2020-11-26 00:29:44 +00:00
Andrew Poelstra
f1406e762c
Merge f32564f0a7 into merged_master (Bitcoin PR #16681 )
...
Basically purely reduction of Core/Elements diff :) thanks jtimon
2020-11-26 00:29:44 +00:00
Andrew Poelstra
a0298bba14
Merge 02fafdd12c into merged_master (Bitcoin PR #18060 )
2020-11-26 00:29:44 +00:00
Andrew Poelstra
fdf8be76de
Merge 651e343888 into merged_master (Bitcoin PR #16974 )
2020-11-26 00:29:44 +00:00
Andrew Poelstra
070361f4af
Merge b2df21b32c into merged_master (Bitcoin PR #17925 )
2020-11-26 00:29:44 +00:00
Andrew Poelstra
c44379f5d1
Merge 365c83e6a8 into merged_master (Bitcoin PR #18054 )
2020-11-26 00:29:43 +00:00
Andrew Poelstra
ca0936ab69
Merge 6d0e532ae0 into merged_master (Bitcoin PR #17585 )
2020-11-26 00:29:43 +00:00
Andrew Poelstra
ea713d1c99
Merge f05c1ac444 into merged_master (Bitcoin PR #17937 )
2020-11-26 00:29:43 +00:00
Andrew Poelstra
33564b8849
Merge cadb9d3342 into merged_master (Bitcoin PR #18036 )
2020-11-26 00:29:43 +00:00
Andrew Poelstra
2c846f5fa3
Merge da3611a580 into merged_master (Elements PR #808 )
2020-11-26 00:29:43 +00:00
Andrew Poelstra
66981314cc
Merge d104aa0ace into merged_master (Bitcoin PR #17951 )
2020-11-14 19:20:52 +00:00
Andrew Poelstra
b6dc1e00a3
Merge 3e1bf71064 into merged_master (Bitcoin PR #18025 )
2020-11-14 19:16:33 +00:00
Andrew Poelstra
1babe7524c
Merge d176aeafde into merged_master (Bitcoin PR #18031 )
2020-11-14 19:12:08 +00:00
Andrew Poelstra
6f123becd3
Merge 1d1f8bbf57 into merged_master (Bitcoin PR #16115 )
2020-11-14 19:07:24 +00:00
