nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 12:23:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.4'

Browse Source
This commit is contained in:
Nick Mathewson 2013-05-17 14:54:19 -04:00
commit 382dbe9819
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug8846 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes:
- Give a less useless error message when the user asks for an IPv4
address on an IPv6-only port, or vice versa. Fixes bug 8846; bugfix
on 0.2.4.7-alpha.

5
src/or/connection_edge.c
View File

@ -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;