[tor-commits] [arm/master] Setup changes to reflect stem and the gui