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

[tor.git] / changes / bug9288

  o Minor bugfixes:
    - Fix an invalid memory read that occured when a pluggable
      transport proxy failed its configuration protocol.
      Fixes bug 9288.