The changelog changes in this PR had a non-merge conflict with #363, because this PR was implemented as if it would be part of 0.3.0 but was in fact merged just afterwards. We need to fix the changelog to move the entries added by this PR into the 0.4.0 section.
Originally posted by @str4d in https://github.com/zcash/orchard/issues/362#issuecomment-1505929607