diff --git a/src/comm.c b/src/comm.c
index 4fe277b..a77b756 100644
--- a/src/comm.c
+++ b/src/comm.c
@@ -4016,9 +4016,12 @@ new_player ( object_t *ob, SOCKET_T new_socket
 # ifdef HAS_PSYC
 	 /* give TLS 4 seconds to start. in fact even 1 second should
 	  * be enough as the TLS init packet is sent immediately with
-	  * the TCP 3-way handshake completion.
+	  * the TCP 3-way handshake completion. Is it different for
+	  * Tor? When connections are coming from a Tor exit node
+	  * they may need more than 4 seconds to fire up TLS. We
+	  * should discontinue unencrypted protocols entirely...
 	  */
-    new_interactive->tls_autodetect = ob == NULL? 4 : 0;
+    new_interactive->tls_autodetect = ob == NULL? 9 : 0;
 # endif
     new_interactive->tls_want_peer_cert = MY_FALSE;
 #endif