[or-cvs] r11887: Oops; forgot the changelog for that. (tor/trunk)

[nickm@xxxxxxxx]

Author: nickm
Date: 2007-10-11 17:40:37 -0400 (Thu, 11 Oct 2007)
New Revision: 11887

Modified:
   tor/trunk/
   tor/trunk/ChangeLog
Log:
 r15704@catbus:  nickm | 2007-10-11 17:35:36 -0400
 Oops; forgot the changelog for that.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r15704] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2007-10-11 21:40:35 UTC (rev 11886)
+++ tor/trunk/ChangeLog	2007-10-11 21:40:37 UTC (rev 11887)
@@ -61,6 +61,9 @@
       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