summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2011-09-02 07:23:37 -0400
committerRoger Dingledine <arma@torproject.org>2011-09-02 07:23:37 -0400
commitfe0fa91164bf1f8f305fc048b472fb6445551533 (patch)
treedb56d10ec88f85f0301cb2f411e6b386af6b6eb8 /changes
parentf68cd4a175b696d61bf9473466e871c6075b01fe (diff)
parente0dae64449958f4c80e6da1ee6a336a60ffc21d5 (diff)
downloadtor-fe0fa91164bf1f8f305fc048b472fb6445551533.tar.gz
tor-fe0fa91164bf1f8f305fc048b472fb6445551533.zip
Merge branch 'maint-0.2.2'
Diffstat (limited to 'changes')
-rw-r--r--changes/bug3898a6
1 files changed, 6 insertions, 0 deletions
diff --git a/changes/bug3898a b/changes/bug3898a
new file mode 100644
index 0000000000..d40445e340
--- /dev/null
+++ b/changes/bug3898a
@@ -0,0 +1,6 @@
+ 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.