[tor-commits] [stem/master] Rearranging contents