Merge master into stable-futures#1271
Merged
Merged
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
romanb
previously approved these changes
Oct 8, 2019
Contributor
romanb
left a comment
romanb
left a comment
There was a problem hiding this comment.
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.
Member
Author
Oh. Actually no. Sorry, I might have forgotten to run a |
Member
Author
|
I fixed the forgotten conflicts. |
romanb
approved these changes
Oct 10, 2019
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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 doesn't necessarily need a review, considering that we will later need to review the
stable-futuresbranch on top of master.