aboutsummaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2011-09-02 07:24:25 -0400
committerRoger Dingledine <arma@torproject.org>2011-09-02 07:24:25 -0400
commit01357d6b163b1823811435871c92d6972b4eb65d (patch)
tree9bb6242573d8ca1189a3bb6b69f1c5bd269e7a32 /ChangeLog
parentfe0fa91164bf1f8f305fc048b472fb6445551533 (diff)
downloadtor-01357d6b163b1823811435871c92d6972b4eb65d.tar
tor-01357d6b163b1823811435871c92d6972b4eb65d.tar.gz
merge in one more
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 7084a0f3a..1e0f85014 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -95,6 +95,11 @@ Changes in version 0.2.3.3-alpha - 2011-09-01
non-errors. Fixes bug 3700; bugfix on 0.2.3.1-alpha.
o Minor bugfixes (on 2.2.x and earlier):
+ - Correct the man page to explain that HashedControlPassword and
+ CookieAuthentication can both be set, in which case either method
+ is sufficient to authenticate to Tor. Bugfix on 0.2.0.7-alpha,
+ when we decided to allow these config options to both be set. Issue
+ raised by bug 3898.
- The "--quiet" and "--hush" options now apply not only to Tor's
behavior before logs are configured, but also to Tor's behavior in
the absense of configured logs. Fixes bug 3550; bugfix on