Merge 359f72105b into merged_master (Bitcoin PR bitcoin/bitcoin#21573)

Browse source

Just did this manually with `-s ours` to keep our current version of secp-zkp.

We should update secp-zkp, but this upstream merge doesn't have any API changes
so it's ok to skip it for now.

...

This commit is contained in:

Andrew Poelstra 2021-07-23 02:42:11 +00:00

parent fcc12d7e2a 359f72105b

commit 3c8e88e7cf

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

Diff content is not available