aboutsummaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2009-07-07 12:42:24 -0400
committerNick Mathewson <nickm@torproject.org>2009-07-07 12:42:24 -0400
commitaa0cf31c5184b3c7bba428a531c9f9632f2cf072 (patch)
tree29ff411277ccb88d524627329f526086097972e3 /ChangeLog
parent4d6af73db88e409764f43fc6cdaa432d667becf3 (diff)
parentd996b7463e8228dd6b08a28bc42cee61eeff910c (diff)
downloadtor-aa0cf31c5184b3c7bba428a531c9f9632f2cf072.tar.gz
tor-aa0cf31c5184b3c7bba428a531c9f9632f2cf072.zip
Merge commit 'origin/maint-0.2.1'
Conflicts: ChangeLog configure.in contrib/tor-mingw.nsi.in src/win32/orconfig.h
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0d5af889da..cde48ba0fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,7 +43,7 @@ Changes in version 0.2.2.1-alpha - 2009-??-??
controllers.
-Changes in version 0.2.1.17-rc - 2009-07-02
+Changes in version 0.2.1.17-rc - 2009-07-07
o Major features:
- Clients now use the bandwidth values in the consensus, rather than
the bandwidth values in each relay descriptor. This approach opens
@@ -81,6 +81,8 @@ Changes in version 0.2.1.17-rc - 2009-07-02
- When we can't find an intro key for a v2 hidden service descriptor,
fall back to the v0 hidden service descriptor and log a bug message.
Workaround for bug 1024.
+ - Fix a log message that did not respect the SafeLogging option.
+ Resolves bug 1027.
o Minor features:
- If we're a relay and we change our IP address, be more verbose