Andrew Poelstra
6e9028ff6e
Merge a3d198c93c into merged_master (Bitcoin PR #17863 )
2020-11-14 16:52:11 +00:00
Andrew Poelstra
c3f29355e6
Merge 1ae46dce60 into merged_master (Bitcoin PR #17754 )
2020-11-14 16:52:10 +00:00
Andrew Poelstra
5833cf8c89
Merge 53e1771cd8 into merged_master (Elements PR #807 )
...
This brings Steven's key into SECURITY.md so we now have an Elements
security policy again :)
2020-11-14 16:52:10 +00:00
Andrew Poelstra
b00e322143
Merge 04f78b818f into merged_master (Bitcoin PR #17887 )
2020-11-14 16:52:10 +00:00
Andrew Poelstra
8327c392a0
Merge 0038e536de into merged_master (Bitcoin PR #17965 )
2020-11-14 16:52:10 +00:00
Andrew Poelstra
66c9110f08
Merge 0a8b68cdf7 into merged_master (Bitcoin PR #17483 )
2020-11-14 16:52:10 +00:00
Andrew Poelstra
25582da1e5
Merge a51aa2880d into merged_master (Bitcoin PR #17897 )
2020-11-14 16:52:10 +00:00
Andrew Poelstra
ec7afc81d7
Merge e45463a06a into merged_master (Bitcoin PR #17980 )
2020-11-14 16:52:10 +00:00
Andrew Poelstra
4a32fbbd14
Merge 742f84d0de into merged_master (Bitcoin PR #17492 )
2020-11-14 16:52:10 +00:00
Andrew Poelstra
20f6587a3b
Merge 631df3ee87 into merged_master (Bitcoin PR #17916 )
2020-11-14 16:52:09 +00:00
Andrew Poelstra
6f1d11cd82
Merge daae6403d8 into merged_master (Bitcoin PR #17777 )
2020-11-14 16:52:09 +00:00
Andrew Poelstra
65f6fc64e9
Merge 5d2ff75e20 into merged_master (Bitcoin PR #17945 )
2020-11-14 16:52:09 +00:00
Andrew Poelstra
e072562a08
Merge 7e841f3f9b into merged_master (Bitcoin PR #17823 )
2020-11-14 16:52:09 +00:00
Andrew Poelstra
447512a836
Merge a654626f07 into merged_master (Bitcoin PR #17896 )
...
This PR (and some surrounding ones) const-correct the serialization macros,
which doesn't play nicely with our hackery to mask in a hardfork bit to
indicate dynafed blocks. I found a simple way using const-overloading to
keep the logic fairly localized/simple without doing anything nasty.
2020-11-14 16:52:09 +00:00
Andrew Poelstra
2af7289594
Merge 0deba68064 into merged_master (Bitcoin PR #17943 )
2020-11-14 16:52:09 +00:00
Andrew Poelstra
7051c1095c
Merge c20fbb7be8 into merged_master (Bitcoin PR #17939 )
2020-11-14 16:52:09 +00:00
Andrew Poelstra
b984b72d2c
Merge 2ddf041a8d into merged_master (Bitcoin PR #17928 )
2020-11-14 16:52:09 +00:00
Andrew Poelstra
04f4f87466
Merge 7fb94c0ed4 into merged_master (Bitcoin PR #17889 )
2020-11-14 16:52:08 +00:00
Andrew Poelstra
1b7df1d514
Merge 95ca6aeec7 into merged_master (Bitcoin PR #17691 )
2020-11-14 16:52:08 +00:00
Andrew Poelstra
be24656ac4
Merge 2aaeca50b2 into merged_master (Bitcoin PR #17900 )
...
travis again..
2020-11-14 16:52:08 +00:00
Andrew Poelstra
b5dd54f5cd
Merge ec9b964cc9 into merged_master (Bitcoin PR #17541 )
2020-11-14 16:52:08 +00:00
Andrew Poelstra
5423251ff0
Merge 218274de7d into merged_master (Bitcoin PR #17819 )
2020-11-14 16:52:08 +00:00
Andrew Poelstra
f1535dde72
Merge f018d0c9cd into merged_master (Bitcoin PR #17924 )
2020-11-14 16:52:08 +00:00
Andrew Poelstra
9c2f0984e3
Merge a9c789ed96 into merged_master (Bitcoin PR #17935 )
2020-11-14 16:52:08 +00:00
Andrew Poelstra
d308abd052
Merge 4e8b564df0 into merged_master (Bitcoin PR #17931 )
2020-11-14 16:52:07 +00:00
Andrew Poelstra
c00da34db0
Merge c7ee0ac906 into merged_master (Elements PR #803 )
2020-11-14 16:52:07 +00:00
Andrew Poelstra
8bbbb28dae
Merge ac61ec9da6 into merged_master (Bitcoin PR #17843 )
2020-11-14 16:52:07 +00:00
Andrew Poelstra
45942316be
Merge 002f9e9b40 into merged_master (Bitcoin PR #17923 )
2020-11-14 16:52:07 +00:00
Andrew Poelstra
7c53615bb6
Merge af05bd9e1e into merged_master (Bitcoin PR #17891 )
2020-11-14 16:52:07 +00:00
Andrew Poelstra
a16766d528
Merge ceb789cf3a into merged_master (Bitcoin PR #17873 )
2020-11-14 16:52:07 +00:00
Andrew Poelstra
c86fef7cf6
Merge a4a93a0bad into merged_master (Bitcoin PR #17906 )
2020-11-14 16:52:06 +00:00
Andrew Poelstra
964e4aef5f
Merge 7754cd3848 into merged_master (Elements PR #797 )
2020-11-14 16:52:06 +00:00
Andrew Poelstra
3f3d6f9c98
Merge 2ed74a43a0 into merged_master (Bitcoin PR #16945 )
2020-11-14 16:52:06 +00:00
Andrew Poelstra
55d131b9ad
Merge f2f9fdf579 into merged_master (Bitcoin PR #17910 )
2020-11-14 16:52:06 +00:00
Andrew Poelstra
89471dda35
Merge e258ce792a into merged_master (Bitcoin PR #17907 )
2020-11-14 16:52:06 +00:00
Andrew Poelstra
eb8d73022f
Merge f8c69677a1 into merged_master (Bitcoin PR #17893 )
2020-11-14 16:52:06 +00:00
Andrew Poelstra
cc8ef0f28a
Merge 62b189b91d into merged_master (Bitcoin PR #17899 )
2020-11-14 16:52:06 +00:00
Andrew Poelstra
bf82cc6a32
Merge e7f8450357 into merged_master (Bitcoin PR #16688 )
2020-11-14 16:52:06 +00:00
Andrew Poelstra
bf7738a5c8
Merge 6196e93001 into merged_master (Bitcoin PR #16963 )
2020-11-14 16:52:05 +00:00
Andrew Poelstra
32b9383743
Merge 295211e668 into merged_master (Bitcoin PR #17445 )
2020-11-14 16:52:05 +00:00
Andrew Poelstra
29b2c68c8b
Merge 7f3675b3ce into merged_master (Bitcoin PR #17696 )
2020-11-14 16:52:05 +00:00
Andrew Poelstra
75726e3bc3
Merge 40a495a38a into merged_master (Bitcoin PR #16975 )
2020-11-14 16:52:05 +00:00
Andrew Poelstra
ef2713e142
Merge b065df803c into merged_master (Bitcoin PR #17880 )
2020-11-14 16:52:05 +00:00
Andrew Poelstra
e3f76a1543
Merge 07efb3fe2b into merged_master (Bitcoin PR #17826 )
2020-11-14 16:52:05 +00:00
Andrew Poelstra
722a9b575c
Merge 6dd982aa9e into merged_master (Bitcoin PR #17886 )
2020-11-14 16:52:05 +00:00
Andrew Poelstra
5ad4206904
Merge fcef6dbc15 into merged_master (Bitcoin PR #17452 )
2020-11-14 16:52:05 +00:00
Andrew Poelstra
a5c0140923
Merge cab3859a35 into merged_master (Bitcoin PR #17677 )
2020-11-14 16:52:04 +00:00
Andrew Poelstra
74d2e8da1b
Merge 7ea3b85ecf into merged_master (Bitcoin PR #17578 )
2020-11-14 16:52:04 +00:00
Andrew Poelstra
c0f55c006c
Merge 45f151913e into merged_master (Bitcoin PR #16373 )
2020-11-14 16:52:04 +00:00
Andrew Poelstra
4f611f400d
Merge bcb4cdcca3 into merged_master (Bitcoin PR #17621 )
2020-11-14 16:52:04 +00:00
