diff options
| author | fanquake <fanquake@gmail.com> | 2024-02-16 13:32:17 +0000 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2024-02-16 13:37:21 +0000 |
| commit | 74df372750ceb4ccdfe310e18f14cdd3abac4a51 (patch) | |
| tree | 7d8a512ef2b4fe6109c61c9a152255c6e7fd2f5a /src/Makefile.qt_locale.include | |
| parent | 04edf9f5862c3ca2d1aed6b7a0f24b8d2914f96c (diff) | |
| parent | 11f3a7e6baf145360190635f47b1fb371fb38912 (diff) | |
Merge bitcoin/bitcoin#29209: [26.x] more backports
11f3a7e6baf145360190635f47b1fb371fb38912 Use hardened runtime on macOS release builds. (Mark Friedenbach)
ac1b9a51dbb0ac682ac04e0a2a711091d5e962d8 [test] import descriptor wallet with reorged parent + IsFromMe child in mempool (glozow)
ecb8ebc6608c71676f377398b8dd38fc484dc48e [test] rescan legacy wallet with reorged parent + IsFromMe child in mempool (Gloria Zhao)
438ac2947dd76f9abd11d73b442656d5c77754cf snapshots: don't core dump when running -checkblockindex after `loadtxoutset` (Mark Friedenbach)
7ec34554afca9159096720de36f44707a4c628ce [log] mempool loading (glozow)
fe0f8fe8aa4a8c4dddf45f4e3519a5ded8c79ad5 net: create I2P sessions with both ECIES-X25519 and ElGamal encryption (Jon Atack)
fc62271015e9585bd3a3889adac894c9ef2e2ab2 [refactor] Add helper for iterating through mempool entries (stickies-v)
Pull request description:
Backports for 26.x. Includes:
- 453b481 from #28391
- #29179
- #29200
- #29227
- #28791
- #29127
ACKs for top commit:
stickies-v:
ACK 11f3a7e6baf145360190635f47b1fb371fb38912
Tree-SHA512: 20ef871ec768f2328056d83f958e595b36ae9b8baa8a6e8b0e1f02c3df4b16965a8e05dcb4323afbcc9ecc4bdde10931232512022c39ee7e12baf9795bf25bf1
Diffstat (limited to 'src/Makefile.qt_locale.include')
0 files changed, 0 insertions, 0 deletions