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.

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 of #116 and #111 #117

Merged
merged 38 commits into from Mar 7, 2018
Merged

Conversation

tomaka
Copy link
Member

@tomaka tomaka commented Jan 30, 2018

Since the conflicts between the two branches were tricky to resolve, I opened this PR with #116 and #111 merged together.

@tomaka tomaka mentioned this pull request Feb 8, 2018
11 tasks
@eira-fransham
Copy link
Contributor

I'll leave comments on the respective PRs instead of here, since it's easier to review these independently.

@tomaka tomaka force-pushed the identify-merge-connec-reuse branch from 43d8d69 to 03c4c8f Compare March 7, 2018 10:08
@tomaka tomaka merged commit 22a7159 into libp2p:master Mar 7, 2018
@tomaka tomaka deleted the identify-merge-connec-reuse branch March 7, 2018 10:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants