[tor-commits] [orbot/master] Merge branch 'sisbell-sisbell_237'

[n8fr8 at torproject.org]

commit 124273fd96dba3a20a8b0f56ef56d7b313909363
Merge: 4a79476e 43d807fd
Author: n8fr8 <nathan at guardianproject.info>
Date:   Fri Jul 5 08:02:28 2019 -0400

    Merge branch 'sisbell-sisbell_237'

 build.gradle                              | 2 +-
 gradle.properties                         | 3 +--
 gradle/wrapper/gradle-wrapper.properties  | 2 +-
 orbotservice/build.gradle                 | 5 +++++
 orbotservice/src/main/AndroidManifest.xml | 1 -
 5 files changed, 8 insertions(+), 5 deletions(-)