clean up some log messages

svn:r17406

diff --git a/src/or/main.c b/src/or/main.c
index c40e19ec072b08e14a8f68ee651ccf6d394dab49..459d347bbd3eab9c2bcd1dca6ec4c1b92b8ddd22 100644 (file)
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -140,8 +140,8 @@ connection_add(connection_t *conn)
               conn_write_callback, conn);
   }
 
-  log_debug(LD_NET,"new conn type %s, socket %d, n_conns %d.",
-            conn_type_to_string(conn->type), conn->s,
+  log_debug(LD_NET,"new conn type %s, socket %d, address %s, n_conns %d.",
+            conn_type_to_string(conn->type), conn->s, conn->address,
             smartlist_len(connection_array));
 
   return 0;

diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index d3c8523c4ca3bee2a99d00ae036d33b8d71e0f93..3f0068cf74fe77651db3d932dbe16ab8f661547b 100644 (file)
--- a/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@ -425,7 +425,7 @@ directory_get_from_hs_dir(const char *desc_id, const rend_data_t *rend_query)
                     "directory '%s' on port %d.",
            rend_query->onion_address, desc_id_base32,
            rend_query->auth_type,
-           (rend_query->auth_type == REND_NO_AUTH ? "NULL" :
+           (rend_query->auth_type == REND_NO_AUTH ? "[none]" :
            escaped_safe_str(descriptor_cookie_base64)),
            hs_dir->nickname, hs_dir->dir_port);
   return 1;