Andrew Poelstra
bf55b8fdab
Merge eca4d8ef6a into merged_master (Bitcoin PR #16562 )
2020-11-26 01:07:47 +00:00
Andrew Poelstra
862b02f20b
Merge 1a51cd1ac5 into merged_master (Bitcoin PR #17800 )
2020-11-26 01:07:47 +00:00
Andrew Poelstra
584ee38590
Merge 7a266a679d into merged_master (Bitcoin PR #18173 )
2020-11-26 01:07:47 +00:00
Andrew Poelstra
feb99445da
Merge 9aa8145bc0 into merged_master (Bitcoin PR #17959 )
2020-11-26 01:07:47 +00:00
Andrew Poelstra
871d31b516
Merge 5ad80bec3f into merged_master (Bitcoin PR #18135 )
2020-11-26 01:07:47 +00:00
Andrew Poelstra
19ec8f2bf8
Merge 73cfa070e5 into merged_master (Bitcoin PR #18195 )
2020-11-26 01:07:47 +00:00
Andrew Poelstra
4bc1e03e5d
Merge e5753fa4e8 into merged_master (Bitcoin PR #17921 )
2020-11-26 01:07:47 +00:00
Andrew Poelstra
87ff0bd466
Merge eae48ec84c into merged_master (Bitcoin PR #18209 )
2020-11-26 01:07:46 +00:00
Andrew Poelstra
ea995086f7
Merge fe63d79eab into merged_master (Bitcoin PR #18212 )
2020-11-26 01:07:46 +00:00
Andrew Poelstra
acf499a048
Merge 1615043935 into merged_master (Bitcoin PR #17461 )
2020-11-26 01:07:46 +00:00
Andrew Poelstra
1456bbe89b
Merge 324a6dfeaf into merged_master (Bitcoin PR #17771 )
2020-11-26 01:07:46 +00:00
Andrew Poelstra
5878782435
Merge 4502ed7cd1 into merged_master (Bitcoin PR #18211 )
2020-11-26 01:07:46 +00:00
Andrew Poelstra
105646a03d
Merge e5d47ed8fd into merged_master (Bitcoin PR #18167 )
2020-11-26 01:07:46 +00:00
Andrew Poelstra
dcc1b1a31e
Merge 89a97a71f2 into merged_master (Bitcoin PR #17985 )
2020-11-26 01:07:46 +00:00
Andrew Poelstra
66204f061c
Merge c0e0e0a9d5 into merged_master (Elements PR #818 )
2020-11-26 01:07:46 +00:00
Andrew Poelstra
f4a783ba0b
Merge 171540429f into merged_master (Elements PR #819 )
2020-11-26 01:07:45 +00:00
Andrew Poelstra
bb88191981
Merge c3b4715923 into merged_master (Bitcoin PR #18206 )
2020-11-26 01:07:45 +00:00
Andrew Poelstra
a0e2e69cfd
Merge 31c0006a6c into merged_master (Bitcoin PR #17264 )
2020-11-26 01:07:45 +00:00
Andrew Poelstra
f0e3e31c0d
Merge 03f98b15ad into merged_master (Bitcoin PR #17577 )
2020-11-26 01:07:45 +00:00
Andrew Poelstra
1ce4e7c713
Merge a674e89d27 into merged_master (Bitcoin PR #18162 )
2020-11-26 01:07:45 +00:00
Andrew Poelstra
8e931da20b
Merge 225aa5d6d5 into merged_master (Bitcoin PR #18193 )
2020-11-26 01:07:45 +00:00
Andrew Poelstra
2dde4faa5c
Merge a2fa6ba736 into merged_master (Elements PR #825 )
2020-11-26 01:07:45 +00:00
Andrew Poelstra
873c33754d
Merge ab9de43588 into merged_master (Bitcoin PR #18181 )
2020-11-26 01:07:44 +00:00
Andrew Poelstra
697ce68b63
Merge 36e507227e into merged_master (Bitcoin PR #18183 )
2020-11-26 01:07:44 +00:00
Andrew Poelstra
0c1829049e
Merge 9dd7bd47be into merged_master (Bitcoin PR #18034 )
2020-11-26 01:07:44 +00:00
Andrew Poelstra
1f0738f05f
Merge e9fc8f6e7f into merged_master (Bitcoin PR #18172 )
2020-11-26 01:07:44 +00:00
Andrew Poelstra
a06e42a9f1
Merge eb3c6b0912 into merged_master (Bitcoin PR #18070 )
2020-11-26 01:07:44 +00:00
Andrew Poelstra
d6ed4831e0
Merge 56fc2dfcc3 into merged_master (Bitcoin PR #18122 )
2020-11-26 01:07:44 +00:00
Andrew Poelstra
e4c8881cdd
Merge eddcbfb109 into merged_master (Bitcoin PR #18166 )
2020-11-26 01:07:44 +00:00
Andrew Poelstra
36b191b752
Merge 68e841e0af into merged_master (Bitcoin PR #18067 )
2020-11-26 01:07:44 +00:00
Andrew Poelstra
70819cbab4
Merge 36f42e1bf4 into merged_master (Bitcoin PR #18037 )
2020-11-26 01:07:43 +00:00
Andrew Poelstra
5b859b9d58
Merge 179504ccb6 into merged_master (Bitcoin PR #17948 )
2020-11-26 01:07:43 +00:00
Andrew Poelstra
947e32f011
Merge 051439813e into merged_master (Bitcoin PR #13339 )
2020-11-26 01:07:43 +00:00
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
