[tor-commits] [tor/master] Merge remote-tracking branch 'arma/feature18624'