[tor-commits] [orbot/master] Merge branch 'master' into fix_519_exit_icon