From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 15 Jan 2013 21:33:53 +0000 (-0500)
Subject: Forward-port fix for 7889
X-Git-Tag: tor-0.2.4.10-alpha~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5ce4f94c3456d81cbb340a4e20e657f5b393d99;p=thirdparty%2Ftor.git

Forward-port fix for 7889
---

diff --git a/src/or/command.c b/src/or/command.c
index ec97a78bbc..6d68c5c159 100644
--- a/src/or/command.c
+++ b/src/or/command.c
@@ -223,9 +223,9 @@ command_process_create_cell(cell_t *cell, channel_t *chan)
 
   if (cell->circ_id == 0) {
     log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
-           "Received a create cell (type %d) from %s:%d with zero circID; "
-           " ignoring.", (int)cell->command, conn->_base.address,
-           conn->_base.port);
+           "Received a create cell (type %d) from %s with zero circID; "
+           " ignoring.", (int)cell->command,
+           channel_get_actual_remote_descr(chan));
     return;
   }