[tor-commits] [tor/master] merge changes files into upcoming changelog