From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 18 Dec 2009 19:16:41 +0000 (-0500)
Subject: Merge commit 'karsten/fix-bridge-stats-master-4'
X-Git-Tag: tor-0.2.2.7-alpha~43
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7edae5898416dbd291d9e5e9f75e0b24153e73ea;p=thirdparty%2Ftor.git

Merge commit 'karsten/fix-bridge-stats-master-4'
---

7edae5898416dbd291d9e5e9f75e0b24153e73ea
diff --cc ChangeLog
index 3c750cdeca,56c8958c9a..017eb30220
--- a/ChangeLog
+++ b/ChangeLog
@@@ -25,12 -25,10 +25,15 @@@ Changes in version 0.2.2.7-alpha - 2009
      - Do not segfault when writing buffer stats when we haven't observed
        a single circuit to report about. Found by Fabian Lanze. Bugfix on
        0.2.2.1-alpha.
+     - Fix statistics on client numbers by country as seen by bridges that
+       were broken in 0.2.2.1-alpha. Also switch to reporting full 24-hour
+       intervals instead of variable 12-to-48-hour intervals.
  
 +  o Removed features:
 +    - Remove the HSAuthorityRecordStats option that version 0 hidden
 +      service authorities could have used to track statistics of overall
 +      hidden service usage.
 +
  
  Changes in version 0.2.2.6-alpha - 2009-11-19
    o Major features: