[tor-commits] [tor/master] guards_choose_dirguard(): replace one XXXX with another.