commit 65bf007a77be579a05e2bbc4fdcdea3741439f3e Author: Roger Dingledine <arma@torproject.org> Date: Mon Mar 26 22:12:52 2012 -0400 merge the change that 2f3ec43e5b4e wanted to merge --- ChangeLog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3f2ccf1..d6cc6d6 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