[tor-commits] [orbot/master] Merge branch 'bitmold-missing_vpn_icons'

[n8fr8 at torproject.org]

commit 822d3582fa462a243d4f11d20206c87c281a4f9b
Merge: 9376a33f 91f0fc4c
Author: n8fr8 <nathan at guardianproject.info>
Date:   Mon Aug 9 14:09:20 2021 -0400

    Merge branch '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(-)