[tor-commits] [orbot/master] Merge branch 'BjarniRunar-master'

[n8fr8 at torproject.org]

commit 792ee2b1f51185105e449e899d7217a0998cab3c
Merge: c7b14412 0d4a7358
Author: n8fr8 <nathan at freitas.net>
Date:   Thu Jan 4 17:43:03 2018 -0500

    Merge branch 'BjarniRunar-master'

 app/src/main/res/values/strings.xml                                 | 3 ++-
 app/src/main/res/xml/preferences.xml                                | 6 ++++++
 .../src/main/java/org/torproject/android/service/TorService.java    | 2 ++
 .../src/main/java/org/torproject/android/service/util/Prefs.java    | 5 +++++
 4 files changed, 15 insertions(+), 1 deletion(-)