[tor-commits] [tor/master] start folding in the changes files