Merge branch 'master' into upgrader

This commit is contained in:
Alex Haynes
2018-11-11 19:43:16 -05:00
committed by GitHub
2 changed files with 2 additions and 3 deletions

View File

@ -22,8 +22,7 @@ class TransportUpgrader(object):
"""
# For PoC, no security
# Default to mplex
# TODO do exchange to determine multiplexer
return MuxedConn(conn, initiator)