[tor-commits] [tor/master] Merge commit '741d2dc685a0e380bc4d8fbcda5a33b70272b3f7'