commit 45369a2adba0e0b2d15b5a8ee73a8e99a6cf575e Merge: 4a79476e 8c232f73 Author: n8fr8 nathan@guardianproject.info Date: Fri Jul 5 07:26:35 2019 -0400

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

build.gradle | 2 +- gradle.properties | 3 +-- gradle/wrapper/gradle-wrapper.properties | 2 +- orbotservice/build.gradle | 5 +++++ 4 files changed, 8 insertions(+), 4 deletions(-)