[tor-commits] [tor/master] merge in the changes files so far