Merge branch 'poller' of github.com:spesmilo/electrum-server into poller

diff --git a/backends/irc/__init__.py b/backends/irc/__init__.py
index 2e3d563..5511d8f 100644 (file)
--- a/backends/irc/__init__.py
+++ b/backends/irc/__init__.py
@@ -78,7 +78,7 @@ class IrcThread(threading.Thread):
             try:
                 s = socket.socket()
                 s.connect(('irc.freenode.net', 6667))
-                s.settimeout(0.1)
+                s.settimeout(0.3)
             except:
                 s.close()
                 print_log("IRC: reconnect in 10 s")