aboutsummaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2012-03-26 22:12:52 -0400
committerRoger Dingledine <arma@torproject.org>2012-03-26 22:12:52 -0400
commit65bf007a77be579a05e2bbc4fdcdea3741439f3e (patch)
treeac0f295ddc7bf63beccb686383c40ae108778f06 /ChangeLog
parent5a2d0fbe64eda754a87ec35cfbd5d49c91ebc4b2 (diff)
downloadtor-65bf007a77be579a05e2bbc4fdcdea3741439f3e.tar
tor-65bf007a77be579a05e2bbc4fdcdea3741439f3e.tar.gz
merge the change that 2f3ec43e5b4e wanted to merge
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 2 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3f2ccf1fe..d6cc6d646 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -47,8 +47,8 @@ Changes in version 0.2.3.13-alpha - 2012-03-26
control port. Bug found by Esteban Manchado Velázquez, and
independently by Robert Connolly from Matta Consulting who further
noted that it allows a post-authentication heap overflow. Patch
- by "flupzor". Fixes bugs 5090 and 5402 (CVE 2012-1668); bugfix
- on 0.2.0.16-alpha.
+ by Alexander Schrijver. Fixes bugs 5090 and 5402 (CVE 2012-1668);
+ bugfix on 0.2.0.16-alpha.
- Fix a compile warning when using the --enable-openbsd-malloc
configure option. Fixes bug 5340; bugfix on 0.2.0.20-rc.
- Directory caches no longer refuse to clean out descriptors because