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