From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 11 Oct 2007 21:40:37 +0000 (+0000)
Subject:  r15704@catbus:  nickm | 2007-10-11 17:35:36 -0400
X-Git-Tag: tor-0.2.0.8-alpha~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b597ce2ae0a92d0648664ce806444226041eb6c1;p=thirdparty%2Ftor.git

 r15704@catbus:  nickm | 2007-10-11 17:35:36 -0400
 Oops; forgot the changelog for that.


svn:r11887
---

diff --git a/ChangeLog b/ChangeLog
index 7d46feaff7..4a5d26bb32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -61,6 +61,9 @@ Changes in version 0.2.0.8-alpha - 2007-10-12
       two Tor servers on the same IP address, except if it's the location
       of a directory authority, in which case allow five. Bugfix on
       0.2.0.3-alpha.
+    - When looking for a circuit to cannibalize, consider family as well
+      as identity.  Fixes bug 438.  Bugfix on 0.1.0.x (which introduced
+      circuit cannibalization).
 
   o Minor bugfixes (controller):
     - When sending a status event to the controller telling it that an