The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Reviews

See the guideline for information on the review process.

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

Conflicts

Reviewers, this pull request conflicts with the following ones:

• #27479 (BIP324: ElligatorSwift integrations by sipa)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

Note that this conflicts with #27479, however it's a single-line change, and 27479 will have to be rebased again after the secp changes are pulled into our tree, so I think we can go ahead and merge this in the interim. cc @sipa.

ACK
I noticed when switching locally between old and new branches that some untracked files got left over:

--> git status
On branch master
Your branch is up to date with 'origin/master'.

Untracked files:
  (use "git add <file>..." to include in what will be committed)
	src/secp256k1/src/libsecp256k1-config.h
	src/secp256k1/src/libsecp256k1-config.h.in
	src/secp256k1/src/stamp-h1

nothing added to commit but untracked files present (use "git add" to track)

Actually I still get the untracked files warning after merge -- am i doing something wrong? Or would it make any sense to add these to gitignore?

@pinheadmz

Actually I still get the untracked files warning after merge -- am i doing something wrong?

Try to clean your local repo first. For example, git clean -xdff.