commit 317923b7d20e3a55a25930db20f20bc24e108826 Merge: 075c6ddf 42b65133 Author: Nathan Freitas nathan@guardianproject.info Date: Wed Nov 11 21:41:53 2020 -0500

Merge pull request #411 from guardianproject/dev_iptproxy

Switch to using IPtProxy for obfs4 and meek

app/build.gradle | 5 + app/libs/IPtProxy.aar | Bin 0 -> 29425327 bytes orbotservice/build.gradle | 15 ++- orbotservice/libs/IPtProxy.aar | Bin 0 -> 29425327 bytes .../torproject/android/service/OrbotService.java | 114 +++++++++------------ 5 files changed, 69 insertions(+), 65 deletions(-)