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
Andrew Poelstra
f3a64d1877
Merge b5a8d0cff1 into merged_master (Bitcoin PR #15450 )
2020-11-09 21:20:22 +00:00
Andrew Poelstra
be281ea46e
Merge e4b974830e into merged_master (Bitcoin PR #16810 )
2020-11-09 21:20:22 +00:00
Andrew Poelstra
eb174d36e9
Merge 45be44cce4 into merged_master (Bitcoin PR #15257 )
2020-11-09 21:20:21 +00:00
Andrew Poelstra
7e0872f92c
Merge fc5b756bae into merged_master (Bitcoin PR #16556 )
2020-11-09 21:20:19 +00:00
Andrew Poelstra
2bc7beced3
Merge db67101c74 into merged_master (Bitcoin PR #16665 )
2020-11-09 21:20:17 +00:00
Andrew Poelstra
f9ee0ba9d8
Merge c79bf32774 into merged_master (Bitcoin PR #16625 )
2020-11-09 21:20:16 +00:00
Andrew Poelstra
a4b6f63b75
Merge 93bacb8cc9 into merged_master (Bitcoin PR #16612 )
2020-11-09 21:20:15 +00:00
Andrew Poelstra
0c510bfee4
Merge 8516285d2e into merged_master (Bitcoin PR #16615 )
2020-11-09 21:20:14 +00:00
Andrew Poelstra
53f1c56c8f
Merge 285712834e into merged_master (Elements PR #688 )
2020-11-09 21:20:13 +00:00
Andrew Poelstra
1e1d51e91d
Merge 00dad5e0e1 into merged_master (Bitcoin PR #16581 )
2020-11-09 21:20:13 +00:00
Andrew Poelstra
799f59c303
Merge e6e99d4f75 into merged_master (Bitcoin PR #16408 )
2020-11-09 21:20:07 +00:00
Andrew Poelstra
8dda4726db
Merge 3453cf26db into merged_master (Bitcoin PR #15277 )
2020-11-09 21:20:06 +00:00
Andrew Poelstra
13fa126076
Merge 1088b90cba into merged_master (Bitcoin PR #16327 )
2020-11-09 03:58:19 +00:00
Andrew Poelstra
b615fa5ad9
Merge dfdcb3dfe5 into merged_master (Bitcoin PR #16330 )
2020-11-09 03:58:19 +00:00
Andrew Poelstra
29431d0295
Merge c84349a148 into merged_master (Bitcoin PR #16314 )
2020-11-09 03:58:18 +00:00
