commit e64d34a9fa7ad099b78b54521b290653ad978fa0 Merge: 888f836a 135a94dc Author: n8fr8 nathan@guardianproject.info Date: Tue Oct 29 09:41:58 2019 -0400

Merge branch 'master' of github.com:guardianproject/orbot

FUNDING.yml | 4 +++ .../torproject/android/mini/MiniMainActivity.java | 16 ++++----- .../android/mini/ui/AppConfigActivity.java | 4 +-- .../android/mini/ui/AppManagerActivity.java | 4 +-- .../android/mini/vpn/VPNEnableActivity.java | 6 ++-- .../org/torproject/android/OrbotMainActivity.java | 15 +++----- .../torproject/android/ui/AppManagerActivity.java | 4 +-- .../torproject/android/ui/VPNEnableActivity.java | 5 +-- .../android/service/StartTorReceiver.java | 11 +++--- .../org/torproject/android/service/TorService.java | 40 ++++------------------ .../android/service/TorServiceConstants.java | 5 --- .../org/torproject/android/service/util/Prefs.java | 7 +++- .../android/service/util/TorServiceUtils.java | 4 --- .../android/service/vpn/TorVpnService.java | 27 +++++++++++++-- 14 files changed, 71 insertions(+), 81 deletions(-)