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