Merge origin/main and resolve test_tcp conflict

Co-authored-by: ihalatci <10450368+ihalatci@users.noreply.github.com>

Author: Copilot

test/mitmproxy/proxy/layers/test_tcp.py

@@ -5,6 +5,7 @@
 from ..tutils import reply
 from mitmproxy import connection
 from mitmproxy import options
+from mitmproxy.proxy import context as proxy_context
 from mitmproxy.proxy.commands import CloseConnection
 from mitmproxy.proxy.commands import CloseTcpConnection
 from mitmproxy.proxy.commands import OpenConnection
@@ -13,7 +14,6 @@
 from mitmproxy.proxy.events import DataReceived
 from mitmproxy.proxy.layers import tcp
 from mitmproxy.proxy.layers.tcp import TcpMessageInjected
-from mitmproxy.proxy import context as proxy_context
 from mitmproxy.tcp import TCPFlow
 from mitmproxy.tcp import TCPMessage