Merge remote-tracking branch 'asn/bug7292'

This commit is contained in:
Nick Mathewson 2012-11-04 21:54:19 -05:00
commit 39a0a2c3ae

View File

@ -964,7 +964,7 @@ parse_smethod_line(const char *line, managed_proxy_t *mp)
} }
addrport = smartlist_get(items, 2); addrport = smartlist_get(items, 2);
if (tor_addr_port_split(LOG_PROTOCOL_WARN, addrport, &address, &port)<0) { if (tor_addr_port_split(LOG_WARN, addrport, &address, &port)<0) {
log_warn(LD_CONFIG, "Error parsing transport " log_warn(LD_CONFIG, "Error parsing transport "
"address '%s'", addrport); "address '%s'", addrport);
goto err; goto err;
@ -1056,7 +1056,7 @@ parse_cmethod_line(const char *line, managed_proxy_t *mp)
} }
addrport = smartlist_get(items, 3); addrport = smartlist_get(items, 3);
if (tor_addr_port_split(LOG_PROTOCOL_WARN, addrport, &address, &port)<0) { if (tor_addr_port_split(LOG_WARN, addrport, &address, &port)<0) {
log_warn(LD_CONFIG, "Error parsing transport " log_warn(LD_CONFIG, "Error parsing transport "
"address '%s'", addrport); "address '%s'", addrport);
goto err; goto err;