summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2011-10-29 15:10:37 -0400
committerRoger Dingledine <arma@torproject.org>2011-10-29 15:10:37 -0400
commitcbdefc70fc617a1f9d3731e3c35afebbc32923e6 (patch)
tree70d7fba2417eb24c4e5f22889d5fa739f74f8243
parent6be596e2dc04a736221b573f73a6324352f8538a (diff)
downloadtor-cbdefc70fc617a1f9d3731e3c35afebbc32923e6.tar.gz
tor-cbdefc70fc617a1f9d3731e3c35afebbc32923e6.zip
fold in changes entries
-rw-r--r--ChangeLog14
-rw-r--r--changes/bug42995
-rw-r--r--changes/bug43314
-rw-r--r--changes/bug43405
-rw-r--r--changes/bug43435
5 files changed, 14 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog
index 73e83f0d3f..7f601418e9 100644
--- 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
index c43d81460a..0000000000
--- 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
index 011238a962..0000000000
--- 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
index 08098b1cd5..0000000000
--- 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
index cee272b976..0000000000
--- 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.
-