fold in 0.2.2.35 items so far

diff --git a/ChangeLog b/ChangeLog
index af378f51f6445b1d50d1caea015baa4abc763d5e..0457134063c36915ee54f8a64aaac3e32be1f218 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+Changes in version 0.2.2.35 - 2011-1?-??
+  o Major bugfix:
+    - 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 crash when we're running as a relay and don't have a geoip
+      file. Bugfix on 0.2.2.34; fixes bug 4340. This backports a fix
+      we've had in the 0.2.3.x branch already.
+
+  o Trivial fixes:
+    - Fix 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.2.34 - 2011-10-26
   Tor 0.2.2.34 fixes a critical anonymity vulnerability where an attacker
   can deanonymize Tor users. Everybody should upgrade.

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.
-