From: Roger Dingledine <arma@torproject.org>
Date: Wed, 23 Mar 2005 22:11:59 +0000 (+0000)
Subject: fix an over-eager assert, to make httpsproxy get a little farther
X-Git-Tag: tor-0.1.0.1-rc~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb8a319ffe2d699aa1ba8234017e11fe68f92253;p=thirdparty%2Ftor.git

fix an over-eager assert, to make httpsproxy get a little farther


svn:r3846
---

diff --git a/src/or/connection.c b/src/or/connection.c
index 1a9afcf6b2..b45c0bd475 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -1597,7 +1597,7 @@ void assert_connection_ok(connection_t *conn, time_t now)
     }
 //    tor_assert(conn->addr && conn->port);
     tor_assert(conn->address);
-    if (conn->state != OR_CONN_STATE_CONNECTING)
+    if (conn->state > OR_CONN_STATE_PROXY_READING)
       tor_assert(conn->tls);
   }