[tor-commits] [orbot/master] Merge branch 'main' of https://github.com/syphyr/orbot into syphyr-main

[n8fr8 at torproject.org]

commit 602d21151b4d533148c5da1c5c8530cf0ccf469c
Merge: 78f0b765 e07c3129
Author: n8fr8 <nathan at guardianproject.info>
Date:   Fri Jul 2 16:59:54 2021 -0400

    Merge branch 'main' of https://github.com/syphyr/orbot into syphyr-main

 orbotservice/src/main/jni/Android.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)