From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 17 Dec 2009 02:59:25 +0000 (-0500)
Subject: Merge commit 'karsten/fix-cell-stats'
X-Git-Tag: tor-0.2.2.7-alpha~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62c2a5a8838ac8eb97ab967e10e7a1e99d761d94;p=thirdparty%2Ftor.git

Merge commit 'karsten/fix-cell-stats'

Conflicts:
	ChangeLog
---

62c2a5a8838ac8eb97ab967e10e7a1e99d761d94
diff --cc ChangeLog
index fe32ab1580,6fbae13203..2cb2383935
--- a/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