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

[tor.git] / changes / bug8273

  o Critical bugfixes:
    - When dirserv.c computes flags and thresholds, use measured bandwidths
      in preference to advertised ones.