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

[n8fr8 at torproject.org]

commit 8f0367cd9084163e1ca8ba08ea7948ab597de078
Merge: 63ea5b12 f6cf158a
Author: n8fr8 <nathan at guardianproject.info>
Date:   Mon Feb 22 15:07:31 2021 -0500

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

 .../android/ui/v3onionservice/clientauth/ClientAuthActivity.java    | 4 ++--
 app/src/main/res/menu/v3_client_auth_menu.xml                       | 6 ++++++
 app/src/main/res/values/strings.xml                                 | 3 ++-
 orbotservice/build.gradle                                           | 3 ---
 4 files changed, 10 insertions(+), 6 deletions(-)