Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rebase on upstream e541a90e #67

Merged
merged 0 commits into from
May 30, 2019
Merged

Rebase on upstream e541a90e #67

merged 0 commits into from
May 30, 2019

Conversation

apoelstra
Copy link
Contributor

PR'ing to run CI and to get an ack from @real-or-random who did this rebase in parallel (in about ten stages), confirming at each stage that our diffs were identical.

@apoelstra apoelstra mentioned this pull request May 30, 2019
Closed
@real-or-random
Copy link
Collaborator

ACK 6f3b0c0

@apoelstra
Copy link
Contributor Author

Thanks! Closing and will force-push this to secp256k1-zkp. All open PRs (which except #47 are only mine and Jonas') will need to be rebased.

@apoelstra apoelstra merged commit 6f3b0c0 into secp256k1-zkp May 30, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@apoelstra @real-or-random