Merge branch 'v0.6' into main

src/network/bmobject.py

@@ -6,7 +6,7 @@
 
 import protocol
 import state
-import connectionpool
+import network.connectionpool as connectionpool
 from highlevelcrypto import calculateInventoryHash
 
 logger = logging.getLogger('default')

src/network/udp.py

@@ -8,7 +8,7 @@
 # magic imports!
 import protocol
 import state
-import connectionpool
+import network.connectionpool as connectionpool
 from queues import receiveDataQueue
 
 from .bmproto import BMProto