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

diff --cc ChangeLog
index 3c750cdecad9c9b15886f2b9db73797d2411bd36,56c8958c9afd00296008ca89d2f343cfba5c0b8a..017eb302209b5f832165819cefe7b6c7cfb7e107
--- 1/ChangeLog
--- 2/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:

diff --cc src/or/main.c
Simple merge

diff --cc src/or/or.h
Simple merge

diff --cc src/or/rephist.c
Simple merge