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