Commit graph

3264 commits

Author SHA1 Message Date
Thomas Trevethan
ab8e2637b1 Merge b7edd55c22 into merged_master (Bitcoin PR bitcoin/bitcoin#26899) 2025-04-11 14:48:37 +01:00
Thomas Trevethan
b49bfac365 Merge 60f142e395 into merged_master (Bitcoin PR bitcoin/bitcoin#26531) 2025-04-11 14:45:16 +01:00
Byron Hambly
9111b218a7 Merge ebb15ea75a into merged_master (Bitcoin PR bitcoin/bitcoin#26207) 2025-04-10 09:39:45 +02:00
Byron Hambly
55f7437996 Merge 3d53a85ddf into merged_master (Bitcoin PR bitcoin/bitcoin#27220) 2025-04-10 06:39:52 +02:00
Byron Hambly
26ecca6742 Merge c7f1d95f52 into merged_master (Bitcoin PR bitcoin/bitcoin#27205) 2025-04-10 06:39:49 +02:00
Tom Trevethan
a4e12fd05b Merge 1ff135ca7f into merged_master (Bitcoin PR bitcoin/bitcoin#26194) 2025-04-09 19:00:05 +00:00
Tom Trevethan
d9ae059581 Merge d5e4f9a439 into merged_master (Bitcoin PR bitcoin/bitcoin#25740) 2025-04-09 18:53:55 +00:00
Byron Hambly
57b70dff08 Merge a12b27a2a6 into merged_master (Bitcoin PR bitcoin/bitcoin#27183) 2025-04-09 13:11:25 +02:00
Byron Hambly
58ef92399f Merge be2e748f37 into merged_master (Bitcoin PR bitcoin/bitcoin#27154) 2025-04-09 06:12:15 +02:00
Tom Trevethan
c222787622 Merge b7702bd546 into merged_master (Bitcoin PR bitcoin/bitcoin#25943) 2025-04-08 20:00:25 +00:00
Tom Trevethan
e09c9ea798 Merge 832fa2d238 into merged_master (Bitcoin PR bitcoin/bitcoin#25574) 2025-04-08 17:05:26 +00:00
Tom Trevethan
cfcac64fd8 Merge 5e55534586 into merged_master (Bitcoin PR bitcoin/bitcoin#27068) 2025-04-08 13:20:17 +00:00
Byron Hambly
54025896c4 Merge fe1b325688 into merged_master (Bitcoin PR bitcoin/bitcoin#27029) 2025-04-06 21:44:29 +02:00
Byron Hambly
052e2edb96 Merge 75f0e0b607 into merged_master (Bitcoin PR bitcoin/bitcoin#26773) 2025-04-06 07:29:37 +02:00
Byron Hambly
f6fbd4846e Merge 1ad0711d7c into merged_master (Bitcoin PR bitcoin/bitcoin#27016) 2025-04-05 17:02:21 +02:00
Byron Hambly
37c49b296d Merge de1d189534 into merged_master (Bitcoin PR bitcoin/bitcoin#27056) 2025-04-05 15:24:29 +02:00
Byron Hambly
946ac7d337 Merge 8d69b614cc into merged_master (Bitcoin PR bitcoin/bitcoin#23810) 2025-04-05 15:14:49 +02:00
Byron Hambly
8df89b56d5 Merge 6e08e5cb5c into merged_master (Bitcoin PR bitcoin/bitcoin#17127) 2025-04-05 14:44:25 +02:00
Byron Hambly
b89c80d3a8 Merge e2ae5c349c into merged_master (Bitcoin PR bitcoin/bitcoin#27037) 2025-04-05 13:04:46 +02:00
Byron Hambly
a482e15e75 Merge 22ccf4e360 into merged_master (Bitcoin PR bitcoin/bitcoin#26991) 2025-04-05 10:11:03 +02:00
Tom Trevethan
3f66b4f13e Merge 79e18ebc81 into merged_master (Bitcoin PR bitcoin/bitcoin#26896) 2025-04-04 15:20:49 +00:00
Tom Trevethan
c578bcd7a0 Merge 483a4bb819 into merged_master (Bitcoin PR bitcoin/bitcoin#26834) 2025-04-04 14:23:06 +00:00
Byron Hambly
10176a3189 Merge ad09b76275 into merged_master (Bitcoin PR bitcoin/bitcoin#26471) 2025-04-04 08:55:07 +02:00
Byron Hambly
793c167756 Merge 2343886217 into merged_master (Bitcoin PR bitcoin/bitcoin#26920) 2025-04-03 11:59:00 +02:00
Byron Hambly
bf8f8812bb Merge 92dcbe9cc3 into merged_master (Bitcoin PR bitcoin/bitcoin#23395) 2025-04-03 11:51:23 +02:00
Byron Hambly
30170c6bd9 Merge aef8b4f43b into merged_master (Bitcoin PR bitcoin/bitcoin#26226) 2025-04-03 11:42:16 +02:00
Byron Hambly
443473a53e Merge b52a6c0cf9 into merged_master (Bitcoin PR bitcoin/bitcoin#26873) 2025-04-03 11:24:33 +02:00
Tom Trevethan
3857099fba Merge b55b11f92a into merged_master (Bitcoin PR bitcoin/bitcoin#25375) 2025-04-02 21:38:33 +02:00
Byron Hambly
a5e8ef3328 Merge dcae3c19b8 into merged_master (Bitcoin PR bitcoin/bitcoin#26867) 2025-04-02 07:07:00 +02:00
Byron Hambly
983cc3f3b6 Merge bd74004532 into merged_master (Bitcoin PR bitcoin/bitcoin#26877) 2025-04-01 22:04:55 +02:00
Byron Hambly
deaae283d5 Merge dbca00ef76 into merged_master (Bitcoin PR bitcoin/bitcoin#26838) 2025-04-01 20:17:02 +02:00
Byron Hambly
62a37d02d9 Merge 1aedc3b6c8 into merged_master (Bitcoin PR bitcoin/bitcoin#26618) 2025-04-01 20:15:50 +02:00
Byron Hambly
eb9095abc9 Merge 911a40ead2 into merged_master (Bitcoin PR bitcoin/bitcoin#26557) 2025-04-01 19:55:49 +02:00
Tom Trevethan
0fa67e0cb9 Merge 296e882250 into merged_master (Bitcoin PR bitcoin/bitcoin#26598) 2025-04-01 15:13:59 +00:00
Tom Trevethan
8a132ad63c Merge 2ec97825e7 into merged_master (Bitcoin PR bitcoin/bitcoin#26771) 2025-04-01 10:09:32 +00:00
Byron Hambly
1b7e6dda13 Merge f3bc1a7282 into merged_master (Bitcoin PR bitcoin/bitcoin#26265) 2025-03-31 16:29:50 +02:00
Byron Hambly
cb8fe45c9f Merge 7386da7a0b into merged_master (Bitcoin PR bitcoin/bitcoin#26709) 2025-03-31 09:11:29 +02:00
Byron Hambly
72ece14fe6 Merge 03708dac0a into merged_master (Bitcoin PR bitcoin/bitcoin#26704) 2025-03-31 09:09:01 +02:00
Tom Trevethan
be69eb05cb Merge a4baf3f177 into merged_master (Bitcoin PR bitcoin/bitcoin#26628) 2025-03-27 09:46:31 +00:00
Tom Trevethan
5baaf035fa Merge 3b5fb6e77a into merged_master (Bitcoin PR bitcoin/bitcoin#26213) 2025-03-26 12:30:53 +00:00
Tom Trevethan
69157e67bf Merge a653f4bb1f into merged_master (Bitcoin PR bitcoin/bitcoin#25934) 2025-03-25 14:14:08 +00:00
Tom Trevethan
c00c7ed977 Merge 0abb5b2dd6 into merged_master (Bitcoin PR bitcoin/bitcoin#26648) 2025-03-24 23:35:25 +00:00
Byron Hambly
f60df3b742 Merge 71abee86db into merged_master (Bitcoin PR bitcoin/bitcoin#25993) 2025-03-04 13:22:14 +02:00
Byron Hambly
b735ecc00d Merge a63192afb8 into merged_master (Bitcoin PR bitcoin/bitcoin#19762) 2025-03-04 10:44:34 +02:00
Byron Hambly
fd4160ae71
Merge b3c76ab757 into merged_master (Bitcoin PR bitcoin/bitcoin#26524) 2025-03-03 09:49:16 +02:00
Byron Hambly
d97db2851f
Merge f0c646f026 into merged_master (Bitcoin PR bitcoin/bitcoin#25730) 2025-02-28 14:25:06 +02:00
Byron Hambly
b83abdf89a
Merge UP TO e42ba134f4 into merged_master (UP TO Bitcoin PR bitcoin/bitcoin#26448)
1667577042 2022-11-04T16:50:42+01:00 e42ba134f4 Bitcoin Merge bitcoin/bitcoin#26448: test: fix intermittent failure in p2p_sendtxrcncl.py
1667576919 2022-11-04T15:48:39+00:00 83cf055bef Bitcoin Merge bitcoin/bitcoin#26443: doc: mention BIP86 in doc/bips.md
1667478613 2022-11-03T13:30:13+01:00 28653a596a Bitcoin Merge bitcoin/bitcoin#26445: .python-version: bump patch version to 3.6.15
1667471345 2022-11-03T10:29:05+00:00 2a7c9984db Bitcoin Merge bitcoin/bitcoin#25248: refactor: Add LIFETIMEBOUND / -Wdangling-gsl to Assert()
1667397640 2022-11-02T15:00:40+01:00 5274f32437 Bitcoin Merge bitcoin/bitcoin#26417: test: fix intermittent failure in feature_index_prune.py
1667372848 2022-11-02T08:07:28+01:00 39f026b1ec Bitcoin Merge bitcoin/bitcoin#26396: net: Avoid SetTxRelay for feeler connections
1667316369 2022-11-01T16:26:09+01:00 bf0cb43990 Bitcoin Merge bitcoin/bitcoin#26437: test: remove unused `CHANGE_{XPRV,XPUB}` constants
1667300957 2022-11-01T11:09:17+00:00 5668ccec1d Bitcoin Merge bitcoin/bitcoin#25548: gui: Check for readlink buffer overflow and handle gracefully
1667297563 2022-11-01T10:12:43+00:00 c041d8f2c9 Bitcoin Merge bitcoin/bitcoin#26360: build: remove threadinterrupt from libbitcoinkernel
1667297149 2022-11-01T10:05:49+00:00 27e76afe24 Bitcoin Merge bitcoin/bitcoin#26294: build: move util/url to common/url
1667291397 2022-11-01T08:29:57+00:00 d08b63baa0 Bitcoin Merge bitcoin/bitcoin#26373: Update minisketch subtree to latest upstream
1667230521 2022-10-31T15:35:21+00:00 43e813cab2 Bitcoin Merge bitcoin/bitcoin#26387: p2p: TryLowWorkHeadersSync follow-ups
1667217075 2022-10-31T11:51:15+00:00 4766cd1981 Bitcoin Merge bitcoin/bitcoin#24051: Bugfix: configure: bitcoin-{cli,tx,util} don't need UPnP, NAT-PMP, or ZMQ
1667213203 2022-10-31T11:46:43+01:00 2856dee808 Bitcoin Merge bitcoin/bitcoin#26402: doc: Fix typos
1667202170 2022-10-31T08:42:50+01:00 c75c0d8e11 Bitcoin Merge bitcoin/bitcoin#26424: doc: correct deriveaddresses RPC name
1667034850 2022-10-29T11:14:10+02:00 4f270d2b63 Bitcoin Merge bitcoin/bitcoin#26404: test: fix intermittent failure in rpc_getblockfrompeer.py
1667030363 2022-10-29T09:59:23+02:00 984a01589b Bitcoin Merge bitcoin/bitcoin#26408: test: Remove spam from debug log
1666985837 2022-10-28T15:37:17-04:00 8b050762b1 Bitcoin Merge bitcoin/bitcoin#26409: refactor: Silence GCC Wmissing-field-initializers in ChainstateManagerOpts
1666949533 2022-10-28T11:32:13+02:00 1bad29fe02 Bitcoin Merge bitcoin/bitcoin#26377: test: Make `system_tests/run_command` test locale and platform agnostic
2025-02-27 13:40:17 +02:00
Byron Hambly
ca0a68b350
Merge UP TO 551c8e9526 into merged_master (UP TO bitcoin/bitcoin#26349)
Includes FIXMEs for a few functional tests
2025-02-05 09:50:17 +02:00
Byron Hambly
b29ae90f29 Merge 27351fb915 into merged_master (Bitcoin PR bitcoin/bitcoin#26093) 2024-11-27 10:46:37 +02:00
Byron Hambly
89296b2c3f Merge c67d6f5b5f into merged_master (Bitcoin PR bitcoin/bitcoin#26079) 2024-11-26 15:33:48 +02:00