commit 99620a0bc03e7ef30c5568d9a9d748a76c01862e Merge: 74b9d2f5 ce3f265d Author: n8fr8 nathan@guardianproject.info Date: Mon Apr 5 15:33:30 2021 -0400

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

.../clientauth/ClientAuthActivity.java | 20 +++++++-- .../clientauth/ClientAuthBackupDialogFragment.java | 47 ++++++++++++++++++++-- 2 files changed, 60 insertions(+), 7 deletions(-)