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

[tor.git] / changes / bug9337

  o Major bugfixes (DNS):
    - Avoid an assertion failure when processing DNS replies without the
      answer types we expected. Fixes bug 9337; bugfix on 0.2.4.7-alpha.