[tor-commits] [orbot/master] Merge pull request #21 from eighthave/master