[tor-commits] [orbot/master] Merge branch 'bitmold-IPtProxyPorts'

[n8fr8 at torproject.org]

commit 5fc9f8724a9081980e9cdcc99540d758faaae45c
Merge: 0d950796 99f2aa53
Author: n8fr8 <nathan at guardianproject.info>
Date:   Thu May 27 11:08:38 2021 -0400

    Merge branch 'bitmold-IPtProxyPorts'

 app/build.gradle                                   |  2 +-
 .../android/ui/onboarding/MoatActivity.java        |  6 ++--
 orbotservice/build.gradle                          |  2 +-
 .../torproject/android/service/OrbotService.java   | 33 +++++++++-------------
 orbotservice/src/main/res/raw/bridges.txt          |  2 +-
 5 files changed, 20 insertions(+), 25 deletions(-)