[tor-commits] [tor/master] Merge commit '13298d90a90dc62d21d38f910171c9b57a8f0273'