1 files changed, 3 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index ef866292f9..541d7808e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@ Changes in version 0.2.2.10-alpha - 2010-??-??
   o Minor bugfixes:
     - Fix a memleak in the EXTENDCIRCUIT logic. Spotted by coverity.
       Bugfix on 0.2.2.9-alpha.
+    - Fix a dereference-then-NULL-check sequence when publishing
+      descriptors. Bugfix on tor-0.2.1.5-alpha. Discovered by ekir,
+      fixes bug 1255.
 
 Changes in version 0.2.2.9-alpha - 2010-02-22
   o Directory authority changes: