[tor-commits] [arm/master] Shifting to a proper package layout