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