[tor-commits] [tor/master] ticket21031 changes file revised.