Switched from bzr to git; rearrangements tor format; minor cosmetic changes