[or-cvs] r10801: Backport r10495: change an assert into a tor_assert(). (in tor/branches/tor-0_1_2-patches: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-07-12 12:17:05 -0400 (Thu, 12 Jul 2007)
New Revision: 10801

Modified:
   tor/branches/tor-0_1_2-patches/
   tor/branches/tor-0_1_2-patches/src/or/connection.c
Log:
 r13702 at catbus:  nickm | 2007-07-12 11:35:51 -0400
 Backport r10495: change an assert into a tor_assert().



Property changes on: tor/branches/tor-0_1_2-patches
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r9724] on 55e972cd-5a19-0410-ae62-a4d7a52db4cd
 svk:merge ticket from /tor/012 [r13702] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/branches/tor-0_1_2-patches/src/or/connection.c
===================================================================
--- tor/branches/tor-0_1_2-patches/src/or/connection.c	2007-07-12 15:58:03 UTC (rev 10800)
+++ tor/branches/tor-0_1_2-patches/src/or/connection.c	2007-07-12 16:17:05 UTC (rev 10801)
@@ -404,7 +404,7 @@
   edge_connection_t *edge_conn;
   time_t now = time(NULL);
 
-  assert(conn->marked_for_close);
+  tor_assert(conn->marked_for_close);
 
   if (CONN_IS_EDGE(conn)) {
     if (!conn->edge_has_sent_end) {