Merge master
into mlabs-haskell-koz/secp256k1
and fix what got broken
#2
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This merges the recent
master
into themlabs-haskell-koz/secp256k1
branch, fixes a semantic merge conflict and fixes support forstack
. For the last two see the last commit.The tests still do not pass, but I think that's because
master
is currently broken due to another semantic merge conflict, so we'll need to wait for people to fix it.