[tor-commits] [tpo/master] Merge pull request #11 from torproject/master