[tor-commits] [orbot/master] Merge branch 'eighthave-rename-to-OrbotService'

[n8fr8 at torproject.org]

commit ca7394f2f409df2ce9f6072d153a432f3b530de6
Merge: 200c4045 b3d747e4
Author: n8fr8 <nathan at guardianproject.info>
Date:   Tue Dec 17 16:16:42 2019 -0500

    Merge branch 'eighthave-rename-to-OrbotService'

 app-mini/src/debug/AndroidManifest.xml             |  2 +-
 app-mini/src/main/AndroidManifest.xml              |  2 +-
 .../torproject/android/mini/MiniMainActivity.java  | 54 +++++++++++-----------
 .../torproject/android/mini/OnBootReceiver.java    | 12 ++---
 .../android/mini/vpn/VPNEnableActivity.java        | 12 ++---
 app/src/main/AndroidManifest.xml                   |  2 +-
 .../org/torproject/android/OnBootReceiver.java     | 12 ++---
 .../org/torproject/android/OrbotMainActivity.java  | 50 ++++++++++----------
 .../torproject/android/ui/VPNEnableActivity.java   | 12 ++---
 .../service/{TorService.java => OrbotService.java} | 10 ++--
 .../android/service/StartTorReceiver.java          |  6 +--
 .../android/service/TorEventHandler.java           |  4 +-
 .../android/service/vpn/OrbotVpnManager.java       |  6 +--
 .../android/service/vpn/TorVpnService.java         |  4 +-
 14 files changed, 94 insertions(+), 94 deletions(-)