[tor-commits] [orbot/master] Merge branch 'master' of github.com:guardianproject/orbot

[n8fr8 at torproject.org]

commit 15b7d79b8126178d94d84b425fd13387bc96b628
Merge: 07592383 19e53226
Author: n8fr8 <nathan at guardianproject.info>
Date:   Tue Aug 4 14:18:42 2020 -0400

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

 .../org/torproject/android/OrbotMainActivity.java   | 21 +++++++++------------
 app/src/main/res/values/strings.xml                 |  2 +-
 app/src/main/res/xml/preferences.xml                |  2 +-
 3 files changed, 11 insertions(+), 14 deletions(-)