[tor-commits] [orbot/master] Merge pull request #146 from bitmold/package-refactor