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