[tor-commits] [spec/master] Merge pull request #52 from TheTorProject/joe/formatting-fixes