commit 36e2eb6775a2f52d34423f1319a0be1472506649 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Feb 11 13:05:27 2013 -0500 Avoid generating extra spaces when explaining how we guessed our address --- src/or/config.c | 8 ++++---- src/or/router.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 3d054e6..0f8441b 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2073,18 +2073,18 @@ resolve_my_address(int warn_severity, const or_options_t *options, * at least until dynamic IP address support becomes bulletproof. */ log_notice(LD_NET, "Your IP address seems to have changed to %s " - "(METHOD=%s %s%s). Updating.", + "(METHOD=%s%s%s). Updating.", addr_string, method_used, - hostname_used ? "HOSTNAME=" : "", + hostname_used ? " HOSTNAME=" : "", hostname_used ? hostname_used : ""); ip_address_changed(0); } if (last_resolved_addr != *addr_out) { control_event_server_status(LOG_NOTICE, - "EXTERNAL_ADDRESS ADDRESS=%s METHOD=%s %s%s", + "EXTERNAL_ADDRESS ADDRESS=%s METHOD=%s%s%s", addr_string, method_used, - hostname_used ? "HOSTNAME=" : "", + hostname_used ? " HOSTNAME=" : "", hostname_used ? hostname_used : ""); } last_resolved_addr = *addr_out; diff --git a/src/or/router.c b/src/or/router.c index 735b579..f336f12 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2111,8 +2111,8 @@ check_descriptor_ipaddress_changed(time_t now) tor_addr_from_ipv4h(&tmp_prev, prev); tor_addr_from_ipv4h(&tmp_cur, cur); - tor_asprintf(&source, "METHOD=%s %s%s", method, - hostname ? "HOSTNAME=" : "", + tor_asprintf(&source, "METHOD=%s%s%s", method, + hostname ? " HOSTNAME=" : "", hostname ? hostname : ""); log_addr_has_changed(LOG_NOTICE, &tmp_prev, &tmp_cur, source);