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 7d46feaff72326b3d93535fcb34fbe0458d5afc9..4a5d26bb32aac777d0f30f5895783fb62b924401 100644 (file)
--- 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