* merkle-tree: Harden against second pre-image attacks * core/chacha: Bump test golden hash
automerge