aboutsummaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2010-04-03 22:05:02 -0400
committerRoger Dingledine <arma@torproject.org>2010-04-03 22:05:02 -0400
commit8aec982f910f918785158038e5afafe55f869372 (patch)
tree30afce1131f4b0b84645e46f8ae92de45c591676 /ChangeLog
parent7b3cd4dceb59aece863528b13d8eda19df6480a8 (diff)
parent0324d3b0ec6d8ee0ec24c2e93915c9aa70e1665d (diff)
downloadtor-8aec982f910f918785158038e5afafe55f869372.tar
tor-8aec982f910f918785158038e5afafe55f869372.tar.gz
Merge branch 'maint-0.2.1'
Conflicts: ChangeLog configure.in contrib/tor-mingw.nsi.in src/win32/orconfig.h
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c9f5f1942..b79725fe4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -164,7 +164,11 @@ Changes in version 0.2.2.9-alpha - 2010-02-22
open() without checking it.
-Changes in version 0.2.1.25 - 2010-03-??
+Changes in version 0.2.1.25 - 2010-03-16
+ Tor 0.2.1.25 fixes a regression introduced in 0.2.1.23 that could
+ prevent relays from guessing their IP address correctly. It also fixes
+ several minor potential security bugs.
+
o Major bugfixes:
- Fix a regression from our patch for bug 1244 that caused relays
to guess their IP address incorrectly if they didn't set Address