[tor-commits] [orbot/master] Merge branch 'sisbell_236a' of https://github.com/sisbell/orbot into sisbell-sisbell_236a

[n8fr8 at torproject.org]

commit b61353867a4cc392a91aa1ea77fa10625279925d
Merge: 124273fd f3211aca
Author: n8fr8 <nathan at guardianproject.info>
Date:   Fri Jul 5 08:05:01 2019 -0400

    Merge branch 'sisbell_236a' of https://github.com/sisbell/orbot into sisbell-sisbell_236a

 .../java/org/torproject/android/MainConstants.java |  17 +++
 .../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       |  45 +------
 .../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 ++++++++++++
 14 files changed, 182 insertions(+), 235 deletions(-)