Merge remote-tracking branch 'origin/maint-0.2.3'

This commit is contained in:
Nick Mathewson
2012-07-16 11:22:41 -04:00
2 changed files with 10 additions and 4 deletions
+3
View File
@@ -0,0 +1,3 @@
o Documentation:
- Clarify the documentation for the Alternate*Authority options.
Fixes bug 6387.