[tor-commits] [tor/master] fold 17148 into changelog