Roger Dingledine fe0fa91164 Merge branch 'maint-0.2.2' 14 lat temu
..
bug3898a e0dae64449 Correct man page: multiple control auth styles can be set at once 14 lat temu