Merge branch 'master' into upgrader

muxer/mplex/smux_multiplex.py

@@ -8,7 +8,7 @@ class Multiplex(object):
     def __init__(self, conn, initiator):
         """
         :param conn: an instance of raw connection
-    :    param initiator: boolean to prevent multiplex with self
+        :param initiator: boolean to prevent multiplex with self
         """
         self.muxed_conn = MuxedConn(conn, initiator)
 

transport/upgrader.py

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