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

[tor.git] / changes / bug10485

  o Minor bugfixes:
    - Move message about circuit handshake counts into the heartbeat
      message where it belongs, instead of logging it once per hour
      unconditionally. Fixes bug 10485; bugfix on 0.2.4.17-rc.