[tor-commits] [tor/master] Merge branch 'authdir_quick_fix'