[tor-commits] [spec/master] Merge pull request #43 from TheTorProject/fix/naming