[tor-commits] [spec/master] Merge pull request #35 from irl/master