merge-script 8985c9e5c4 Merge rust-bitcoin/rust-bitcoin#4522: fix(taproot): raname `from_key_and_tweak` to `from_key_and_merkle_root` ... d74eede260 fix(taproot): raname `from_key_and_tweak` to `from_key_and_merkle_root` (Luis Schwab) Pull request description: Closes #4236. ### Changelog - Rename `TapTweakHash::from_key_and_tweak` to `TapTweakHash::from_key_and_merkle_root`. The naming was just wrong, since a TapTweak takes in a public key and a Merkle root to produce a tweak. ACKs for top commit: apoelstra: ACK d74eede26064a40d70c7aeb3335b9a4a28eb6bd9; successfully ran local tests tcharding: ACK d74eede260 Tree-SHA512: 03fdb73758f965290c083165b23a0345325e475f159aa76ff141a9aa3251960041366ddf195b74cada7b289d4493190cf9b17130736002d48b6fac68941012fb		2025-05-17 11:54:47 +00:00
..
contrib	Remove rust-ordered dependency	2025-02-18 13:36:07 +11:00
embedded	chore: remove unused cortex-m dependency from embedded Cargo.toml files in bitcoin and hashes modules.	2025-04-05 18:25:41 +08:00
examples	Finalize the script hex APIs	2025-05-08 15:12:05 +10:00
src	Merge rust-bitcoin/rust-bitcoin#4522: fix(taproot): raname `from_key_and_tweak` to `from_key_and_merkle_root`	2025-05-17 11:54:47 +00:00
tests	Merge rust-bitcoin/rust-bitcoin#4410: Wrap secp256k1::XOnlyPublicKey to improve error handling	2025-05-07 17:01:31 +00:00
CHANGELOG.md	Fix broken changelog links	2025-05-05 12:19:13 +03:00
Cargo.toml	bitcoin: Add a script encoding example	2025-04-28 13:38:12 +10:00