commit 91f0fc4c5bb36528500e2c49db813ffcf6acd6f9 Merge: 9376a33f c1fdff65 Author: n8fr8 nathan@guardianproject.info Date: Mon Aug 9 14:07:39 2021 -0400

Merge branch 'missing_vpn_icons' of https://github.com/bitmold/orbot into bitmold-missing_vpn_icons

.../org/torproject/android/OrbotMainActivity.java | 118 ++++++++++----------- .../torproject/android/ui/AppManagerActivity.java | 30 ++---- app/src/main/res/layout/layout_main.xml | 38 ++++++- .../android/service/vpn/OrbotVpnManager.java | 1 - .../android/service/vpn/TorifiedApp.java | 15 ++- 5 files changed, 111 insertions(+), 91 deletions(-)