Merge 36d4bd7fe3 into merged_master (Bitcoin PR bitcoin/bitcoin#31997)

This commit is contained in:
ivanlele 2026-04-16 13:47:26 +00:00
commit c49f9d595c
No known key found for this signature in database
2 changed files with 2 additions and 2 deletions

View file

@ -1230,7 +1230,7 @@ Current subtrees include:
- Upstream at https://github.com/bitcoin-core/ctaes ; maintained by Core contributors.
- src/minisketch
- Upstream at https://github.com/sipa/minisketch ; maintained by Core contributors.
- Upstream at https://github.com/bitcoin-core/minisketch ; maintained by Core contributors.
Upgrading LevelDB
---------------------

View file

@ -96,7 +96,7 @@ maintained:
* for `src/leveldb`: https://github.com/bitcoin-core/leveldb-subtree.git (branch bitcoin-fork)
* for `src/crypto/ctaes`: https://github.com/bitcoin-core/ctaes.git (branch master)
* for `src/crc32c`: https://github.com/bitcoin-core/crc32c-subtree.git (branch bitcoin-fork)
* for `src/minisketch`: https://github.com/sipa/minisketch.git (branch master)
* for `src/minisketch`: https://github.com/bitcoin-core/minisketch.git (branch master)
To do so, add the upstream repository as remote: