commit e81e50cd38d6d79fe9fdd6fb5372a7c12b20a40d Merge: 3afa7612 4a39df4e Author: n8fr8 nathan@guardianproject.info Date: Mon Nov 16 11:42:54 2020 -0500

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

app/src/main/AndroidManifest.xml | 5 +++-- app/src/main/java/org/torproject/android/MainConstants.java | 2 -- .../main/java/org/torproject/android/OrbotMainActivity.java | 11 +++-------- .../java/org/torproject/android/service/OrbotService.java | 8 -------- 4 files changed, 6 insertions(+), 20 deletions(-)