diff --git a/ChangeLog b/ChangeLog
index 9866f593f0..05ce2861b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@ Changes in version 0.2.1.5-alpha - 2008-08-??
       Christopher Davis.  Bugfix on 0.1.2.1-alpha.
     - Correctly detect the presence of the linux/netfilter_ipv4.h header
       when building against recent kernels.  Bugfix on 0.1.2.1-alpha.
+    - Add a missing safe_str() call for a debug log message.
 
 
 Changes in version 0.2.1.4-alpha - 2008-08-04
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 6c08a4e77f..f67f4768b3 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -837,7 +837,7 @@ connection_tls_finish_handshake(or_connection_t *conn)
   int started_here = connection_or_nonopen_was_started_here(conn);
 
   log_debug(LD_OR,"tls handshake with %s done. verifying.",
-            conn->_base.address);
+            safe_str(conn->_base.address));
 
   directory_set_dirty();