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