Roger Dingledine fe0fa91164 Merge branch 'maint-0.2.2' %!s(int64=15) %!d(string=hai) anos
..
bug3898a e0dae64449 Correct man page: multiple control auth styles can be set at once %!s(int64=15) %!d(string=hai) anos