commit ef0e1c2466b4078c466cf2030b08630757271453 Merge: 65168659 ddb95c33 Author: n8fr8 <nathan@guardianproject.info> Date: Fri Jul 2 14:26:58 2021 -0400 Merge branch 'master' of github.com:guardianproject/orbot app/src/main/res/xml/preferences.xml | 2 +- .../src/main/java/org/torproject/android/service/OrbotService.java | 2 +- .../src/main/java/org/torproject/android/service/util/Prefs.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)