diff --git a/src/or/main.c b/src/or/main.c index bc81b3746b..347b0e5a5a 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1316,7 +1316,7 @@ dumpstats(int severity) (int)(now - conn->timestamp_created)); if (!connection_is_listener(conn)) { log(severity,LD_GENERAL, - "Conn %d is to '%s:%d'.", i, + "Conn %d is to %s:%d.", i, safe_str(conn->address), conn->port); log(severity,LD_GENERAL, "Conn %d: %d bytes waiting on inbuf (len %d, last read %d secs ago)", diff --git a/src/or/router.c b/src/or/router.c index 896ff527fa..7cd7255b67 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -760,10 +760,9 @@ router_get_my_routerinfo(void) if (!server_mode(get_options())) return NULL; - if (!desc_routerinfo || !desc_clean_since) { + if (!desc_routerinfo || !desc_clean_since) if (router_rebuild_descriptor(!desc_routerinfo)) return NULL; - } return desc_routerinfo; }