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

[tor.git] / changes / bug9072

  o Critical bugfixes:
    - Disable middle relay queue overfill detection code due to possible
      guard discovery attack, pending further analysis.  Fixes bug #9072.