Commit graph

22926 commits

Author SHA1 Message Date
Andrew Poelstra
ff55bb704c Merge 8d39c636aa into merged_master (Bitcoin PR #16952) 2020-11-09 21:20:32 +00:00
Andrew Poelstra
134e52cbed Merge ddc4e3c2d6 into merged_master (Bitcoin PR #17006) 2020-11-09 21:20:32 +00:00
Andrew Poelstra
e5deb2eb70 Merge 30c2b0b1cb into merged_master (Bitcoin PR #16849) 2020-11-09 21:20:32 +00:00
Andrew Poelstra
7f69d8993c Merge 27322cd161 into merged_master (Bitcoin PR #16999) 2020-11-09 21:20:32 +00:00
Andrew Poelstra
ccdb481c55 Merge 752debdbdb into merged_master (Bitcoin PR #13266) 2020-11-09 21:20:32 +00:00
Andrew Poelstra
24ed0f8aa7 Merge 1f40a91286 into merged_master (Bitcoin PR #17014) 2020-11-09 21:20:32 +00:00
Andrew Poelstra
c7eefa8ea4 Merge 4b51ed89cf into merged_master (Bitcoin PR #17002) 2020-11-09 21:20:32 +00:00
Andrew Poelstra
7598f940a2 Merge dab0e36652 into merged_master (Bitcoin PR #17015) 2020-11-09 21:20:31 +00:00
Andrew Poelstra
05d7c28bbc Merge 6e4f655391 into merged_master (Bitcoin PR #16984) 2020-11-09 21:20:31 +00:00
Andrew Poelstra
0f3841125e Merge 9dd99ea88e into merged_master (Bitcoin PR #17001) 2020-11-09 21:20:31 +00:00
Andrew Poelstra
debae585ae Merge 52acd24573 into merged_master (Bitcoin PR #17005) 2020-11-09 21:20:31 +00:00
Andrew Poelstra
be63d74c91 Merge cd6e9b33a6 into merged_master (Bitcoin PR #16852) 2020-11-09 21:20:31 +00:00
Andrew Poelstra
04b3db567b Merge a54e52b4ae into merged_master (Bitcoin PR #16997) 2020-11-09 21:20:31 +00:00
Andrew Poelstra
8a54dcdb44 Merge b0e268d2f6 into merged_master (Bitcoin PR #16969) 2020-11-09 21:20:31 +00:00
Andrew Poelstra
b8a1b9df4d Merge ed03bfc899 into merged_master (Elements PR #726) 2020-11-09 21:20:31 +00:00
Andrew Poelstra
87c8ca42dd Merge 696b5eb179 into merged_master (Bitcoin PR #16987) 2020-11-09 21:20:31 +00:00
Andrew Poelstra
6aeb84256a Merge c3a8e097b1 into merged_master (Bitcoin PR #16991) 2020-11-09 21:20:31 +00:00
Andrew Poelstra
6a5ea9af4e Merge 2fe6c185a6 into merged_master (Bitcoin PR #16988)
Massive automated translation-update PR. I just blindly took Core's updates for
everything. We should re-run this after the rebase to add translations for all
the new Elements stuff.
2020-11-09 21:20:30 +00:00
Andrew Poelstra
977162a889 Merge 981ec9b817 into merged_master (Bitcoin PR #15459) 2020-11-09 21:20:30 +00:00
Andrew Poelstra
081a0198bd Merge 79aeed8e76 into merged_master (Bitcoin PR #16397) 2020-11-09 21:20:30 +00:00
Andrew Poelstra
5836ff48b8 Merge b658ca71b3 into merged_master (Bitcoin PR #16931) 2020-11-09 21:20:30 +00:00
Andrew Poelstra
976eac2d81 Merge df692600c6 into merged_master (Bitcoin PR #16927) 2020-11-09 21:20:30 +00:00
Andrew Poelstra
2384f8e567 Merge bb83d23ad8 into merged_master (Bitcoin PR #16926) 2020-11-09 21:20:30 +00:00
Andrew Poelstra
9f9af7d680 Merge d6026ec874 into merged_master (Bitcoin PR #16971) 2020-11-09 21:20:30 +00:00
Andrew Poelstra
633321d927 Merge 942e275018 into merged_master (Bitcoin PR #16962) 2020-11-09 21:20:30 +00:00
Andrew Poelstra
96f3c60af2 Merge 6b9405e319 into merged_master (Bitcoin PR #16957) 2020-11-09 21:20:29 +00:00
Andrew Poelstra
c5e90d0076 Merge 26a7437045 into merged_master (Bitcoin PR #16982) 2020-11-09 21:20:29 +00:00
Andrew Poelstra
8926bc044b Merge 9edb2b6550 into merged_master (Bitcoin PR #16953) 2020-11-09 21:20:29 +00:00
Andrew Poelstra
a3139d9501 Merge 280c33f865 into merged_master (Elements PR #723) 2020-11-09 21:20:29 +00:00
Andrew Poelstra
14552b9725 Merge b1c36a8ba6 into merged_master (Elements PR #719) 2020-11-09 21:20:29 +00:00
Andrew Poelstra
d1ed1db7fc Merge 6b2210f101 into merged_master (Bitcoin PR #16713) 2020-11-09 21:20:29 +00:00
Andrew Poelstra
f2240a15bf Merge a6c8aed1f1 into merged_master (Bitcoin PR #16817) 2020-11-09 21:20:29 +00:00
Andrew Poelstra
acb351bf48 Merge 690fed668c into merged_master (Elements PR #720) 2020-11-09 21:20:29 +00:00
Andrew Poelstra
ecd17723f2 Merge 6288f15f50 into merged_master (Bitcoin PR #16968) 2020-11-09 21:20:29 +00:00
Andrew Poelstra
9b0e31e130 Merge ab765c2ec7 into merged_master (Bitcoin PR #16577) 2020-11-09 21:20:29 +00:00
Andrew Poelstra
b2076c2709 Merge 003f2d20b1 into merged_master (Bitcoin PR #16837) 2020-11-09 21:20:29 +00:00
Andrew Poelstra
f2874628b4 Merge fdfaeb67de into merged_master (Bitcoin PR #16956) 2020-11-09 21:20:28 +00:00
Andrew Poelstra
065f0f7e86 Merge 4c4ff4911a into merged_master (Bitcoin PR #16961) 2020-11-09 21:20:28 +00:00
Andrew Poelstra
1f7bfa84c8 Merge ae3902ee3f into merged_master (Bitcoin PR #16928) 2020-11-09 21:20:28 +00:00
Andrew Poelstra
dad5fd9884 Merge 1e5da20b5e into merged_master (Elements PR #717) 2020-11-09 21:20:28 +00:00
Andrew Poelstra
285f1c540f Merge 4116a50595 into merged_master (Bitcoin PR #16959) 2020-11-09 21:20:28 +00:00
Andrew Poelstra
e87be41b02 Merge 742cd77f6f into merged_master (Bitcoin PR #16929) 2020-11-09 21:20:28 +00:00
Andrew Poelstra
282b502fc2 Merge 6393da8fdc into merged_master (Bitcoin PR #16960) 2020-11-09 21:20:28 +00:00
Andrew Poelstra
52411627ed Merge 36604b4ef5 into merged_master (Bitcoin PR #16912) 2020-11-09 21:20:28 +00:00
Andrew Poelstra
f4a8c57154 Merge c838f2707a into merged_master (Bitcoin PR #16941) 2020-11-09 21:20:28 +00:00
Andrew Poelstra
efe3d4d21d Merge 3ce8298888 into merged_master (Bitcoin PR #15558) 2020-11-09 21:20:27 +00:00
Andrew Poelstra
eab90a6495 Merge 13377b7a69 into merged_master (Bitcoin PR #16918) 2020-11-09 21:20:27 +00:00
Andrew Poelstra
3dfcf985fb Merge cf57e33cc6 into merged_master (Bitcoin PR #16870) 2020-11-09 21:20:27 +00:00
Andrew Poelstra
7991670332 Merge f8b0b190aa into merged_master (Bitcoin PR #16920) 2020-11-09 21:20:27 +00:00
Andrew Poelstra
e7e7cff7c7 Merge 04321494ae into merged_master (Bitcoin PR #16921) 2020-11-09 21:20:27 +00:00