Merge remote-tracking branch 'karsten/geoip6-jul2014' into maint-0.2.4

[tor.git] / changes / bug8846

  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.