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