Merge branch 'maint-0.2.2'

2024-12-06 19:41:15 +01:00 · 2011-09-02 07:23:37 -04:00
parent f68cd4a175 e0dae64449
commit fe0fa91164
2 changed files with 15 additions and 8 deletions
@@ -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.