commit f1b001579b7d49f88afc51f64e3d12c740dcad80 Merge: 124273fd 65ee380d Author: n8fr8 nathan@guardianproject.info Date: Mon Jul 8 12:23:22 2019 -0400

Merge branch 'sisbell-sisbell_236a'

app/build.gradle | 4 +- .../java/org/torproject/android/MainConstants.java | 15 +++ .../org/torproject/android/OrbotMainActivity.java | 20 ++- .../torproject/android/ui/AppManagerActivity.java | 2 + .../ui/onboarding/BridgeWizardActivity.java | 4 +- .../torproject/android/service/OrbotConstants.java | 15 +-- .../org/torproject/android/service/TorService.java | 8 +- .../android/service/TorServiceConstants.java | 47 +------ .../android/service/util/TorServiceUtils.java | 146 +-------------------- .../android/service/vpn/OrbotVpnManager.java | 15 +-- .../android/service/vpn/PDNSDInstaller.java | 26 ++-- .../android/service/vpn/TorifiedApp.java | 6 +- .../android/service/vpn/VpnConstants.java | 14 ++ .../torproject/android/service/vpn/VpnPrefs.java | 15 +++ .../torproject/android/service/vpn/VpnUtils.java | 84 ++++++++++++ 15 files changed, 182 insertions(+), 239 deletions(-)