fold in changes entries

diff --git a/ChangeLog b/ChangeLog
index 73e83f0d3fcc3259315f0d7ce6ea623a5713b4fc..7f601418e9e3fbf4c52694359beec2d152254da4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+Changes in version 0.2.3.7-alpha - 2011-10-??
+  o Major bugfix:
+    - Do not process cells on a marked-for-close connection. We previously
+      avoided this by not calling read handlers on marked connections, but
+      that's not adequate for the case when cells are very small. Fixes
+      bug 4299; bugfix on 0.2.0.20-rc which first made small cells possible.
+    - 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.
+
+  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/bug4299 b/changes/bug4299
deleted file mode 100644 (file)
index c43d814..0000000
--- a/changes/bug4299
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major bugfix:
-    - Do not process cells on a marked-for-close connection. We previously
-      avoided this by not calling read handlers on marked connections, but
-      that's not adequate for the case when cells are very small. Fixes
-      bug 4299; bugfix on 0.2.0.20-rc which first made small cells possible.

diff --git a/changes/bug4331 b/changes/bug4331
deleted file mode 100644 (file)
index 011238a..0000000
--- a/changes/bug4331
+++ /dev/null
@@ -1,4 +0,0 @@
-  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".
-

diff --git a/changes/bug4340 b/changes/bug4340
deleted file mode 100644 (file)
index 08098b1..0000000
--- a/changes/bug4340
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major bugfixes:
-    - Don't crash when we're running as a relay and don't have a geoip
-    file. Bugfix on tor-0.2.2.34; fixes bug 4340. This backports a fix
-    we've had in master already.
-

diff --git a/changes/bug4343 b/changes/bug4343
deleted file mode 100644 (file)
index cee272b..0000000
--- a/changes/bug4343
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major bugfixes:
-    - 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.
-