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

[n8fr8 at torproject.org]

commit 5a1e7a9c0b24ca3c40cf33412b4d68610e340cc9
Merge: c208274e f1f4750c
Author: n8fr8 <nathan at guardianproject.info>
Date:   Wed Dec 22 16:49:46 2021 -0500

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

 .../android/ui/v3onionservice/OnionServiceDeleteDialogFragment.java   | 4 +++-
 .../src/main/java/org/torproject/android/service/OrbotService.java    | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)