Commit 382dbe98 authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

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

parents df731bac bc56918e

changes/bug8846

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  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.

src/or/connection_edge.c

+3 −2
Original line number Diff line number Diff line
@@ -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;