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

[tor.git] / changes / feature9777

  o Minor features:
    - Avoid using circuit paths if no node in the path supports the ntor
      circuit extension handshake. Implements ticket 9777.