[or-cvs] r11216: Add a changelog entry for last commit. (tor/trunk)

[nickm at seul.org]

Author: nickm
Date: 2007-08-20 10:59:08 -0400 (Mon, 20 Aug 2007)
New Revision: 11216

Modified:
   tor/trunk/
   tor/trunk/ChangeLog
Log:
 r14723 at catbus:  nickm | 2007-08-20 10:57:52 -0400
 Add a changelog entry for last commit.



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

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2007-08-20 14:59:05 UTC (rev 11215)
+++ tor/trunk/ChangeLog	2007-08-20 14:59:08 UTC (rev 11216)
@@ -1,8 +1,12 @@
 Changes in version 0.2.0.6-alpha - 2007-??-??
 
   o Minor bugfixes (bridges):
-    - Do not intermix bridge routers with controller-added routers.
+    - Do not intermix bridge routers with controller-added routers. (Bugfix
+      on 0.2.0.x)
 
+  o Minor bugfixes (network):
+    - Do not fail with an assert when accept() returns an unexpected address
+      family.  Addresses but does not wholly fix bug 483. (Bugfix on 0.2.0.x)
 
 Changes in version 0.2.0.5-alpha - 2007-08-19
   o Removed features: