Merge branch 'sh/fix-proxy-leak' into sh/fix-proxy-mesh

# Conflicts:
#	tests/SMPProxyTests.hs

tests/SMPProxyTests.hs

@@ -557,7 +557,7 @@ testProxyReconnectAfterRelayRestart =
       race_ (threadDelay 1000000) requestRelaySession
     requireProxyReconnect
 
-testProxyForwardTimeoutStuckSession :: IO ()
+testProxyForwardTimeoutStuckSession :: HasTestEnv => IO ()
 testProxyForwardTimeoutStuckSession =
   withSmpServerConfigOn (transport @TLS) proxyCfgForwardTimeout testPort $ \_ -> do
     g <- C.newRandom
@@ -591,7 +591,7 @@ testProxyRelayConcurrencyLimit =
       v : _ -> readMaybe v
       [] -> Nothing
 
-testForwardOversizedNotKept :: IO ()
+testForwardOversizedNotKept :: HasTestEnv => IO ()
 testForwardOversizedNotKept =
   withSmpServerConfigOn (transport @TLS) proxyCfg testPort $ \_ -> do
     g <- C.newRandom