summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-11-04 21:54:19 -0500
committerNick Mathewson <nickm@torproject.org>2012-11-04 21:54:19 -0500
commit39a0a2c3ae8c93ceed42f6d2d1143002c231fc16 (patch)
tree811714428801c74087f10b86f01b5207b227a2d2
parent2b781613b07336e68d662fb9b10d2505f1e24ee1 (diff)
parent37f8a2263ec6cd890685af76926c9f8bba9921d9 (diff)
downloadtor-39a0a2c3ae8c93ceed42f6d2d1143002c231fc16.tar.gz
tor-39a0a2c3ae8c93ceed42f6d2d1143002c231fc16.zip
Merge remote-tracking branch 'asn/bug7292'
-rw-r--r--src/or/transports.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/transports.c b/src/or/transports.c
index e1ed24dbf4..a532f87502 100644
--- a/src/or/transports.c
+++ b/src/or/transports.c
@@ -964,7 +964,7 @@ parse_smethod_line(const char *line, managed_proxy_t *mp)
}
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 "
"address '%s'", addrport);
goto err;
@@ -1056,7 +1056,7 @@ parse_cmethod_line(const char *line, managed_proxy_t *mp)
}
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 "
"address '%s'", addrport);
goto err;