[tor-commits] [spec/master] Merge pull request #29 from kudrom/master