-
Notifications
You must be signed in to change notification settings - Fork 881
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.
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
Merge master into stable-futures #1271
Conversation
…#1245) Make the multistream-select protocol (version) configurable on transport upgrades as well as for individual substreams. Add a "lazy" variant of multistream-select 1.0 that delays sending of negotiation protocol frames as much as possible but is only safe to use under additional assumptions that go beyond what is required by the multistream-select v1 specification.
* Print Rust version on CI * Don't print where not appropriate * Change caching strategy * Remove win32 build * Remove win32 from list
* Update libsecp256k1 dep to 0.3.0 * Sign now cannot fail
* Upgrade percent-encoding dep to 2.1.0 * Upgrade url dep to 2.1.0
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I assume it is intentional that you want to merge with conflicts / conflict markers as well as with the change to the NULL
cipher in secio for now.
Oh. Actually no. Sorry, I might have forgotten to run a |
I fixed the forgotten conflicts. |
This doesn't necessarily need a review, considering that we will later need to review the
stable-futures
branch on top of master.