Andrew Poelstra
eea9d51786
Merge 4c42a13205 into merged_master (Bitcoin PR #18320 )
2020-11-26 01:07:54 +00:00
Andrew Poelstra
5b859b9d58
Merge 179504ccb6 into merged_master (Bitcoin PR #17948 )
2020-11-26 01:07:43 +00:00
Andrew Poelstra
bca8bce3b7
Merge caa2f3af29 into merged_master (Bitcoin PR #12134 )
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
47d76259bf
Merge 22d11187ee into merged_master (Bitcoin PR #17398 )
2020-11-26 01:07:41 +00:00
Andrew Poelstra
5a603ed0ac
Merge c8ce2632eb into merged_master (Bitcoin PR #16392 )
2020-11-26 00:29:45 +00:00
Andrew Poelstra
8d1ab67392
Merge 8625446b4d into merged_master (Bitcoin PR #17336 )
2020-11-26 00:29:44 +00:00
Andrew Poelstra
77cefac5f9
Merge 2755b2b109 into merged_master (Bitcoin PR #18010 )
2020-11-14 16:52:12 +00:00
Andrew Poelstra
eb32a5b379
Merge 3774281327 into merged_master (Bitcoin PR #17933 )
2020-11-14 16:52:12 +00:00
Andrew Poelstra
17a72c9c14
Merge c26b05c2b7 into merged_master (Bitcoin PR #17770 )
2020-11-14 16:52:11 +00:00
Andrew Poelstra
6e9028ff6e
Merge a3d198c93c into merged_master (Bitcoin PR #17863 )
2020-11-14 16:52:11 +00:00
Andrew Poelstra
66c9110f08
Merge 0a8b68cdf7 into merged_master (Bitcoin PR #17483 )
2020-11-14 16:52:10 +00:00
Andrew Poelstra
e072562a08
Merge 7e841f3f9b into merged_master (Bitcoin PR #17823 )
2020-11-14 16:52:09 +00:00
Andrew Poelstra
1b7df1d514
Merge 95ca6aeec7 into merged_master (Bitcoin PR #17691 )
2020-11-14 16:52:08 +00:00
Andrew Poelstra
7c53615bb6
Merge af05bd9e1e into merged_master (Bitcoin PR #17891 )
2020-11-14 16:52:07 +00:00
Andrew Poelstra
8f67b81eb9
Merge b949ac9697 into merged_master (Bitcoin PR #17393 )
2020-11-14 16:52:04 +00:00
Andrew Poelstra
2048abd5df
Merge 0655c7a94c into merged_master (Bitcoin PR #17787 )
2020-11-14 16:52:02 +00:00
Andrew Poelstra
009bc2fdfb
Merge 99813a9745 into merged_master (Bitcoin PR #17829 )
2020-11-14 16:52:02 +00:00
Andrew Poelstra
7eea796ee9
Merge b931f61b9a into merged_master (Bitcoin PR #17801 )
...
Sets the "is this a release" flag off which apparently it was on Elements
master, and has been since the last rebase .... oops.
2020-11-14 16:52:02 +00:00
Andrew Poelstra
ce1aa041cb
Merge 890eac8f82 into merged_master (Bitcoin PR #17725 )
...
Another travis mess
2020-11-14 16:52:00 +00:00
Andrew Poelstra
7579079b64
Merge ac09180128 into merged_master (Bitcoin PR #17680 )
2020-11-14 16:51:55 +00:00
Andrew Poelstra
02ef3faa7a
Merge 5622d8f315 into merged_master (Bitcoin PR #17671 )
2020-11-14 16:51:54 +00:00
Andrew Poelstra
4522262447
Merge e354db7877 into merged_master (Bitcoin PR #17637 )
2020-11-14 16:51:52 +00:00
Andrew Poelstra
b4d7d9d503
Merge 1f59885d27 into merged_master (Bitcoin PR #17361 )
2020-11-14 16:51:50 +00:00
Andrew Poelstra
e281d39855
Merge e6f167bfdf into merged_master (Bitcoin PR #17569 )
2020-11-14 16:51:49 +00:00
Andrew Poelstra
434dfec482
Merge 7463181798 into merged_master (Bitcoin PR #17538 )
2020-11-14 16:51:49 +00:00
Andrew Poelstra
810568e0fa
Merge a6f5b6f47d into merged_master (Bitcoin PR #17550 )
2020-11-14 16:51:48 +00:00
Andrew Poelstra
bbc86542de
Merge 03f6f408ab into merged_master (Bitcoin PR #17545 )
2020-11-09 23:10:14 +00:00
Andrew Poelstra
cc8547e53a
Merge fe27ef834e into merged_master (Elements PR #786 )
2020-11-09 23:10:13 +00:00
Andrew Poelstra
a6974cb1af
Merge 6fde676f64 into merged_master (Bitcoin PR #16669 )
2020-11-09 23:10:12 +00:00
Andrew Poelstra
7d48dceb4a
Merge 94f0749f91 into merged_master (Bitcoin PR #17436 )
2020-11-09 23:10:11 +00:00
Andrew Poelstra
2037872d1e
Merge 1ed3e071df into merged_master (Bitcoin PR #17455 )
2020-11-09 23:10:11 +00:00
Andrew Poelstra
fc31e197f3
Merge cd6cb9745e into merged_master (Bitcoin PR #17409 )
2020-11-09 23:10:10 +00:00
Andrew Poelstra
1d3555cdaf
Merge b05b28183c into merged_master (Bitcoin PR #16899 )
2020-11-09 21:20:53 +00:00
Andrew Poelstra
c82f65f262
Merge 73b26e38d7 into merged_master (Bitcoin PR #17351 )
2020-11-09 21:20:50 +00:00
Andrew Poelstra
5a1affb94d
Merge feb1a8c03a into merged_master (Bitcoin PR #17308 )
2020-11-09 21:20:48 +00:00
Andrew Poelstra
dae1f5cf3c
Merge 6daddc4495 into merged_master (Bitcoin PR #17282 )
2020-11-09 21:20:47 +00:00
Andrew Poelstra
466ecf5506
Merge d91af4768c into merged_master (Bitcoin PR #17165 )
...
This commit removes BIP70 support. Since this was the only thing our
payment sernver supported (we had previously dropped support for
bitcoin: urls) I also dropped all the paymentrequest logic.
2020-11-09 21:20:45 +00:00
Andrew Poelstra
b225da5c58
Merge c787556403 into merged_master (Bitcoin PR #17142 )
2020-11-09 21:20:39 +00:00
Andrew Poelstra
05b5eb683c
Merge 4765b91f50 into merged_master (Bitcoin PR #16667 )
2020-11-09 21:20:38 +00:00
Andrew Poelstra
d15922961c
Merge 9b4dfec831 into merged_master (Bitcoin PR #17029 )
2020-11-09 21:20:35 +00:00
Andrew Poelstra
aac4628c61
Merge d93e27ef93 into merged_master (Elements PR #733 )
2020-11-09 21:20:35 +00:00
Andrew Poelstra
e9bafa83f9
Merge 99cebc922c into merged_master (Bitcoin PR #16569 )
2020-11-09 21:20:34 +00:00
Andrew Poelstra
371d58de2f
Merge df50fd194f into merged_master (Bitcoin PR #16802 )
2020-11-09 21:20:34 +00:00
Andrew Poelstra
00fe4348f7
Merge 7b701fef58 into merged_master (Bitcoin PR #17049 )
2020-11-09 21:20:34 +00:00
Andrew Poelstra
78df750e14
Merge 917d3d9052 into merged_master (Bitcoin PR #17052 )
2020-11-09 21:20:34 +00:00
Andrew Poelstra
8dd598464d
Merge f1f284aa75 into merged_master (Bitcoin PR #17042 )
2020-11-09 21:20:33 +00:00
Andrew Poelstra
7f69d8993c
Merge 27322cd161 into merged_master (Bitcoin PR #16999 )
2020-11-09 21:20:32 +00:00
Andrew Poelstra
7f749bf004
Merge f18a9065e9 into merged_master (Bitcoin PR #16812 )
2020-11-09 21:20:25 +00:00
Andrew Poelstra
9b5f3303ae
Merge 59681beb89 into merged_master (Bitcoin PR #16477 )
2020-11-09 21:20:23 +00:00
