[tor-commits] [orbot/master] Merge pull request #266 from eighthave/clean-up-imports