[tor-commits] [torbirdy/master] Merge pull request #14 from mrphs/master