aboutsummaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-05-17 14:54:19 -0400
committerNick Mathewson <nickm@torproject.org>2013-05-17 14:54:19 -0400
commit382dbe9819367cb838f1099f5f29897f8f5f8f51 (patch)
tree541a0a6968e2c2d76faf0a0a6bade49a0d3518b4 /src/or
parentdf731bac54a8ab70084d9fc855db7c7854608f4c (diff)
parentbc56918e5abb48f67f31012838c689e9572eec69 (diff)
downloadtor-382dbe9819367cb838f1099f5f29897f8f5f8f51.tar.gz
tor-382dbe9819367cb838f1099f5f29897f8f5f8f51.zip
Merge remote-tracking branch 'origin/maint-0.2.4'
Diffstat (limited to 'src/or')
-rw-r--r--src/or/connection_edge.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 926fcab90c..4d317d0bd9 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1769,9 +1769,10 @@ connection_ap_get_begincell_flags(entry_connection_t *ap_conn)
}
if (flags == BEGIN_FLAG_IPV4_NOT_OK) {
- log_warn(LD_BUG, "Hey; I'm about to ask a node for a connection that I "
+ log_warn(LD_EDGE, "I'm about to ask a node for a connection that I "
"am telling it to fulfil with neither IPv4 nor IPv6. That's "
- "probably not going to work.");
+ "not going to work. Did you perhaps ask for an IPv6 address "
+ "on an IPv4Only port, or vice versa?");
}
return flags;