Merge branch 'master' into upgrader

This commit is contained in:
Alex Haynes 2018-11-11 19:43:16 -05:00 committed by GitHub
commit d149bfb0d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions

View File

@ -26,4 +26,3 @@ class TransportUpgrader(object):
# TODO do exchange to determine multiplexer
return MuxedConn(conn, initiator)