[tor-commits] [tor/master] fold in new changes entries