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