summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--changes/bug3898a6
2 files changed, 5 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 7084a0f3ac..1e0f85014f 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
diff --git a/changes/bug3898a b/changes/bug3898a
deleted file mode 100644
index d40445e340..0000000000
--- a/changes/bug3898a
+++ /dev/null
@@ -1,6 +0,0 @@
- o Minor bugfixes:
- - 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.