commit be6feea87941aec8bce9c0a848904a7eab3869f2 Merge: d2005234 c7e9b01f Author: n8fr8 nathan@guardianproject.info Date: Wed Jul 31 13:01:08 2019 -0400
Merge branch 'master' of github.com:n8fr8/orbot
.../org/torproject/android/OrbotMainActivity.java | 30 ++++++++++++++++------ .../torproject/android/ui/AppManagerActivity.java | 15 +++-------- .../android/service/vpn/TorifiedApp.java | 3 ++- 3 files changed, 28 insertions(+), 20 deletions(-)