Andrew Poelstra
c8bf2c631b
Merge d1aa0ae1ad into merged_master (Bitcoin PR #18712 )
2020-11-26 01:08:29 +00:00
Andrew Poelstra
26e416f0b6
Merge 64139803f1 into merged_master (Bitcoin PR #18690 )
2020-11-26 01:08:29 +00:00
Andrew Poelstra
acdc05d56c
Merge 47b94a337e into merged_master (Bitcoin PR #18732 )
2020-11-26 01:08:28 +00:00
Andrew Poelstra
e234a42a47
Merge 9ea4d8326a into merged_master (Bitcoin PR #18704 )
2020-11-26 01:08:26 +00:00
Andrew Poelstra
042d703f0b
Merge 4ad6144ed0 into merged_master (Bitcoin PR #18672 )
2020-11-26 01:08:26 +00:00
Andrew Poelstra
3d19543983
Merge dc5da7fe7b into merged_master (Bitcoin PR #18691 )
2020-11-26 01:08:25 +00:00
Andrew Poelstra
96af3c5b23
Merge d2882a012b into merged_master (Bitcoin PR #18610 )
2020-11-26 01:08:25 +00:00
Andrew Poelstra
353b2ff233
Merge b690b24eb2 into merged_master (Bitcoin PR #18633 )
2020-11-26 01:08:24 +00:00
Andrew Poelstra
11125c2961
Merge 6ae99aab5d into merged_master (Bitcoin PR #18692 )
2020-11-26 01:08:24 +00:00
Andrew Poelstra
a9956489b2
Merge c54295c1a2 into merged_master (Bitcoin PR #18641 )
2020-11-26 01:08:24 +00:00
Andrew Poelstra
fd37b7c5d6
Merge 54f812d9d2 into merged_master (Bitcoin PR #18673 )
2020-11-26 01:08:23 +00:00
Andrew Poelstra
c67b9f0c92
Merge d9fd7b5a67 into merged_master (Bitcoin PR #18596 )
2020-11-26 01:08:18 +00:00
Andrew Poelstra
79067914d8
Merge a2b282c9d0 into merged_master (Bitcoin PR #18609 )
2020-11-26 01:08:17 +00:00
Andrew Poelstra
9146c7899d
Merge 59d6249290 into merged_master (Bitcoin PR #18593 )
2020-11-26 01:08:17 +00:00
Andrew Poelstra
8078d38fd4
Merge 081dcbde66 into merged_master (Bitcoin PR #18561 )
2020-11-26 01:08:15 +00:00
Andrew Poelstra
1ff8f7acff
Merge c0b389b335 into merged_master (Bitcoin PR #18484 )
2020-11-26 01:08:11 +00:00
Andrew Poelstra
f3f386ffee
Merge cf21293ef7 into merged_master (Bitcoin PR #18515 )
2020-11-26 01:08:10 +00:00
Andrew Poelstra
87d0e26d18
Merge 67a72466e1 into merged_master (Bitcoin PR #18247 )
2020-11-26 01:08:06 +00:00
Andrew Poelstra
15d1e10a14
Merge d2db25233c into merged_master (Bitcoin PR #18474 )
2020-11-26 01:08:06 +00:00
Andrew Poelstra
f8e3be6cb7
Merge d52ba21dff into merged_master (Bitcoin PR #18481 )
2020-11-26 01:08:06 +00:00
Andrew Poelstra
9587ad280d
Merge 7e1fc03b18 into merged_master (Bitcoin PR #18334 )
2020-11-26 01:08:05 +00:00
Andrew Poelstra
e1f1d5dc40
Merge 67de1ee8bc into merged_master (Bitcoin PR #18378 )
2020-11-26 01:07:59 +00:00
Andrew Poelstra
42372ae3a5
Merge ad04f0d8a5 into merged_master (Bitcoin PR #17319 )
2020-11-26 01:07:57 +00:00
Andrew Poelstra
7bc1e4d084
Merge 24a727e23e into merged_master (Bitcoin PR #18255 )
2020-11-26 01:07:53 +00:00
Andrew Poelstra
bca8bce3b7
Merge caa2f3af29 into merged_master (Bitcoin PR #12134 )
2020-11-26 01:07:42 +00:00
Andrew Poelstra
bcf509470b
Merge 75fb37ce68 into merged_master (Bitcoin PR #18032 )
2020-11-26 01:07:40 +00:00
Andrew Poelstra
6f123becd3
Merge 1d1f8bbf57 into merged_master (Bitcoin PR #16115 )
2020-11-14 19:07:24 +00:00
Andrew Poelstra
4c7d6ec20e
Merge 3b69310beb into merged_master (Bitcoin PR #17984 )
2020-11-14 18:40:28 +00:00
Andrew Poelstra
7c53615bb6
Merge af05bd9e1e into merged_master (Bitcoin PR #17891 )
2020-11-14 16:52:07 +00:00
Andrew Poelstra
74d2e8da1b
Merge 7ea3b85ecf into merged_master (Bitcoin PR #17578 )
2020-11-14 16:52:04 +00:00
Andrew Poelstra
009bc2fdfb
Merge 99813a9745 into merged_master (Bitcoin PR #17829 )
2020-11-14 16:52:02 +00:00
Andrew Poelstra
7187ea2de7
Merge 3f1966ead6 into merged_master (Bitcoin PR #17705 )
2020-11-14 16:51:57 +00:00
Andrew Poelstra
c9585d0fde
Merge 3d6752779f into merged_master (Bitcoin PR #17633 )
2020-11-14 16:51:56 +00:00
Andrew Poelstra
11487538e9
Merge df2b743759 into merged_master (Bitcoin PR #17675 )
2020-11-14 16:51:55 +00:00
Andrew Poelstra
5a48ca16e3
Merge fee01bb053 into merged_master (Bitcoin PR #17517 )
2020-11-14 16:51:52 +00:00
Andrew Poelstra
6a5fc1dd58
Merge d8a66626d6 into merged_master (Bitcoin PR #17283 )
2020-11-14 16:51:50 +00:00
Andrew Poelstra
4cc150cd4a
Merge e1df922132 into merged_master (Bitcoin PR #17497 )
2020-11-09 23:10:12 +00:00
Andrew Poelstra
2b6199bf17
Merge c7709cbf4c into merged_master (Bitcoin PR #17469 )
2020-11-09 23:10:11 +00:00
Andrew Poelstra
3613ae283d
Merge f60e0684d1 into merged_master (Elements PR #773 )
2020-11-09 23:10:10 +00:00
Andrew Poelstra
132dcf17c7
Merge 54a337478d into merged_master (Bitcoin PR #17378 )
2020-11-09 21:20:52 +00:00
Andrew Poelstra
7494bc176f
Merge bc38bb9a60 into merged_master (Bitcoin PR #17288 )
2020-11-09 21:20:51 +00:00
Andrew Poelstra
a19375575a
Merge 222b7d0ca7 into merged_master (Bitcoin PR #17330 )
2020-11-09 21:20:49 +00:00
Andrew Poelstra
cda20329e8
Merge cab94cc074 into merged_master (Bitcoin PR #16943 )
2020-11-09 21:20:48 +00:00
Andrew Poelstra
4f50591181
Merge 0d2832a6d1 into merged_master (Elements PR #741 )
...
To resolve the `ConstructTransaction` conflict I reverted to the existing code
then manually applied the diff (it adds a parameter then adds a giant pile of
code to the input loop).
2020-11-09 21:20:40 +00:00
Andrew Poelstra
2f310a3a3e
Merge 029c65e04c into merged_master (Bitcoin PR #17141 )
2020-11-09 21:20:39 +00:00
Andrew Poelstra
6823c31c7c
Merge d6f304a462 into merged_master (Elements PR #684 )
...
This PR reduced the minrelayfee for Elements, but also brought in some
changes from upstream which I mostly just didn't take (since we've
already brought them in, in earlier parts of this rebase).
2020-11-09 21:20:39 +00:00
Andrew Poelstra
5574cf1730
Merge 6c7da0736d into merged_master (Bitcoin PR #17108 )
2020-11-09 21:20:38 +00:00
Andrew Poelstra
55b110cabc
Merge c08bf2b574 into merged_master (Bitcoin PR #15437 )
2020-11-09 21:20:35 +00:00
Andrew Poelstra
e73c3f2c3f
Merge 866fd2888f into merged_master (Bitcoin PR #17030 )
2020-11-09 21:20:34 +00:00
Andrew Poelstra
0fbbfe35c3
Merge a689c11907 into merged_master (Bitcoin PR #16524 )
2020-11-09 21:20:33 +00:00
