there will be a new alpha release today (oct 30)

diff --git a/ChangeLog b/ChangeLog
index ac23606aaa82c33d07dbc0402a13a4c4b7d8a2bd..51983503ec6ab9d3dbf60a287246c15b4450593d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,19 +1,25 @@
-Changes in version 0.2.3.7-alpha - 2011-10-??
-  o Major bugfix:
+Changes in version 0.2.3.7-alpha - 2011-10-30
+  o Major bugfixes:
     - If we mark an OR connection for close based on a cell we process,
-      don't process any further cells on it. We already avoided reading
-      on marked-for-close connections, but now we also discard the cells
-      we'd already read. Fixes bug 4299; bugfix on 0.2.0.10-alpha, which
-      was the first version where we might mark a connection for close
-      based on processing a cell on it.
+      don't process any further cells on it. We already avoid further
+      reads on marked-for-close connections, but now we also discard the
+      cells we'd already read. Fixes bug 4299; bugfix on 0.2.0.10-alpha,
+      which was the first version where we might mark a connection for
+      close based on processing a cell on it.
     - Fix a double-free bug that would occur when we received an invalid
       certificate in a CERT cell in the new v3 handshake. Fixes bug 4343;
       bugfix on 0.2.3.6-alpha.
+    - Bridges no longer include their address in NETINFO cells on outgoing
+      OR connections, to allow them to blend in better with clients.
+      Removes another avenue for enumerating bridges. Reported by
+      "troll_un". Fixes bug 4348; bugfix on 0.2.0.10-alpha, when NETINFO
+      cells were introduced.
 
   o Trivial fixes:
     - Fixed a typo in a hibernation-related log message. Fixes bug 4331;
       bugfix on 0.2.2.23-alpha; found by "tmpname0901".
 
+
 Changes in version 0.2.3.6-alpha - 2011-10-26
   Tor 0.2.3.6-alpha includes the fix from 0.2.2.34 for a critical
   anonymity vulnerability where an attacker can deanonymize Tor

diff --git a/changes/bug4348 b/changes/bug4348
deleted file mode 100644 (file)
index d2b226d..0000000
--- a/changes/bug4348
+++ /dev/null
@@ -1,7 +0,0 @@
-  Privacy fixes:
-    - Bridges no longer include their address in NETINFO cells on outgoing
-      OR connections, to allow them to blend in better with clients.
-      Removes another avenue for enumerating bridges. Reported by
-      "troll_un". Fixes bug 4348; bugfix on 0.2.0.10-alpha, when NETINFO
-      cells were introduced.
-