Merge commit 'karsten/fix-cell-stats'

Conflicts:
	ChangeLog

diff --cc ChangeLog
index fe32ab1580828e4777ba5175a72246820611043e,6fbae13203a630a3b2a1ddfc1b41cb69b9f73747..2cb2383935cef709b5b560fd8ceba3d8296169a4
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -20,8 -15,9 +20,11 @@@ Changes in version 0.2.2.7-alpha - 2009
      - Fix an instance where a Tor directory mirror might accidentally
        log the IP address of a misbehaving Tor client. Bugfix on
        0.1.0.1-rc.
 +    - Update our OpenSSL 0.9.8l fix so that it works with OpenSSL 0.9.8m
 +      too.
+     - 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.
  
  
  Changes in version 0.2.2.6-alpha - 2009-11-19

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