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

[tor.git] / changes / bug2286

  o Major features (directory authority):
    - Directory authorities now support a new consensus method (17)
      where they cap the published bandwidth of servers for which
      insufficient bandwidth measurements exist. Fixes part of bug
      2286.