[tor-commits] [snowflake/master] additional proxy timeout check

[serene at torproject.org]

commit 0ae71952d2d482f5f2de6855d22c76cc9b212564
Author: Serene H <git at keroserene.net>
Date:   Mon Jul 25 15:28:10 2016 -0700

    additional proxy timeout check
---
 proxy/proxypair.coffee | 1 +
 1 file changed, 1 insertion(+)

diff --git a/proxy/proxypair.coffee b/proxy/proxypair.coffee
index e6ab563..9fe2012 100644
--- a/proxy/proxypair.coffee
+++ b/proxy/proxypair.coffee
@@ -107,6 +107,7 @@ class ProxyPair
     @relay.onmessage = @onRelayToClientMessage
     # TODO: Better websocket timeout handling.
     @timer = setTimeout((=>
+      return if 0 == @timer
       log @relay.label + ' timed out connecting.'
       @relay.onclose()), 5000)