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

[n8fr8 at torproject.org]

commit e6fb6252f13a34913166146aca696a0ddeb05c01
Merge: 976b0340 c7bb4ec9
Author: n8fr8 <nathan at guardianproject.info>
Date:   Thu May 20 10:51:15 2021 -0400

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

 .../org/torproject/android/OrbotMainActivity.java  |   3 +-
 app/src/main/res/values-nb/strings.xml             |   5 +-
 app/src/main/res/values-pt-rBR/strings.xml         |   1 +
 app/src/main/res/values-pt-rPT/strings.xml         |  66 +++++++++---
 app/src/main/res/values-pt/strings.xml             |  54 ++++++++--
 app/src/main/res/values-vi/strings.xml             | 111 +++++++++++++++++++--
 6 files changed, 214 insertions(+), 26 deletions(-)