commit 88553b1866b6e71a0e844fdc018688b6a487ee23 Merge: 18fc0453 4f8982e0 Author: n8fr8 <nathan@guardianproject.info> Date: Mon May 24 22:11:00 2021 -0400 Merge branch 'IPtProxyPorts' of https://github.com/bitmold/orbot into bitmold-IPtProxyPorts .../android/ui/onboarding/MoatActivity.java | 6 ++-- .../torproject/android/service/OrbotService.java | 33 +++++++++------------- 2 files changed, 17 insertions(+), 22 deletions(-)