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

[tor.git] / changes / bug7947

  o Minor bugfixes:
    - Fix the handling of a TRUNCATE cell when it arrives while the circuit
      extension is in progress. Fixes bug 7947; bugfix on 0.0.7.1.