tor-commits October 2016

tor-commits@lists.torproject.org

18 participants
868 discussions

[orbot/master] target API 14
by n8fr8＠torproject.org 13 Oct '16

13 Oct '16

commit bab79046b2219907e13d0fa6735e0720edb1ccb6 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Sep 19 16:10:13 2016 -0400 target API 14 --- app/src/main/java/org/torproject/android/vpn/VPNEnableActivity.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/org/torproject/android/vpn/VPNEnableActivity.java b/app/src/main/java/org/torproject/android/vpn/VPNEnableActivity.java index f205673..427c937 100644 --- a/app/src/main/java/org/torproject/android/vpn/VPNEnableActivity.java +++ b/app/src/main/java/org/torproject/android/vpn/VPNEnableActivity.java @@ -25,6 +25,8 @@ import android.widget.TextView; /* * To combat background service being stopped/swiped */ + +@TargetApi(14) public class VPNEnableActivity extends Activity { private final static int REQUEST_VPN = 7777;

1 0

[orbot/master] modify imports
by n8fr8＠torproject.org 13 Oct '16

13 Oct '16

commit 90d77ce4bed7f3018846a514ee90006291c62e62 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Sep 19 16:11:44 2016 -0400 modify imports --- .../src/main/java/org/torproject/android/service/TorService.java | 1 - 1 file changed, 1 deletion(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java index c193559..c8aadb2 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -27,7 +27,6 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.net.ConnectivityManager; import android.net.NetworkInfo; -import android.net.VpnService; import android.os.Build; import android.os.IBinder; import android.os.RemoteException;

1 0

[orbot/master] update gitignores for gradle
by n8fr8＠torproject.org 13 Oct '16

13 Oct '16

commit aba7f8e40e4bb60a3b04b356ab8a1fb960cc1101 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Sep 19 16:09:58 2016 -0400 update gitignores for gradle --- .gitignore | 2 ++ orbotservice/.gitignore | 1 + 2 files changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index c9ea2c4..c3831e3 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,5 @@ builds external/patches/* obj + +app/src/main/jniLibs/ diff --git a/orbotservice/.gitignore b/orbotservice/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/orbotservice/.gitignore @@ -0,0 +1 @@ +/build

1 0

[orbot/master] update tor to 0.2.8.7
by n8fr8＠torproject.org 13 Oct '16

13 Oct '16

commit 912cb7424316dec0b95a2ccdfccff762a90b81dc Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Sep 19 16:09:10 2016 -0400 update tor to 0.2.8.7 --- external/tor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/tor b/external/tor index fa6a228..2630886 160000 --- a/external/tor +++ b/external/tor @@ -1 +1 @@ -Subproject commit fa6a228ce86c2737447f32c78eedc00083eb826c +Subproject commit 263088633a63982a8d6ddffd3ed3e3d85cffd6f1

1 0

[orbot/master] launch default activity from notification
by n8fr8＠torproject.org 13 Oct '16

13 Oct '16

commit 549399b82c40a0b3f4d50bd1d30ee2e282198ff2 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jun 29 10:48:59 2016 -0400 launch default activity from notification --- .../src/main/java/org/torproject/android/service/TorService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java index eedf682..c193559 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -207,7 +207,8 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon { //Reusable code. - Intent intent = new Intent(); + PackageManager pm = getPackageManager(); + Intent intent = pm.getLaunchIntentForPackage(getPackageName()); PendingIntent pendIntent = PendingIntent.getActivity(TorService.this, 0, intent, 0); if (mNotifyBuilder == null)

1 0

[orbot/master] udpate resource paths
by n8fr8＠torproject.org 13 Oct '16

13 Oct '16

commit 1ffea580c4e4635eea9647cc3fa21a8a2b0fc7ef Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Sep 19 16:11:30 2016 -0400 udpate resource paths --- .../android/service/TorResourceInstaller.java | 28 ++++++---------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorResourceInstaller.java b/orbotservice/src/main/java/org/torproject/android/service/TorResourceInstaller.java index 47d706f..f368326 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorResourceInstaller.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorResourceInstaller.java @@ -69,11 +69,10 @@ public class TorResourceInstaller implements TorServiceConstants { if (Build.CPU_ABI.contains("x86")) cpuPath = "x86"; - + deleteDirectory(installFolder); installFolder.mkdirs(); - is = context.getResources().openRawResource(R.raw.torrc); outFile = new File(installFolder, TORRC_ASSET_KEY); @@ -82,25 +81,12 @@ public class TorResourceInstaller implements TorServiceConstants { is = context.getResources().openRawResource(R.raw.torpolipo); outFile = new File(installFolder, POLIPOCONFIG_ASSET_KEY); streamToFile(is,outFile, false, false); - - //only install if ARM (GoLang only supports ARM for now) - if (cpuPath.equals("armeabi")) - { - cpuPath = "armeabi"; - is = context.getAssets().open(cpuPath + "/" + OBFSCLIENT_ASSET_KEY + MP3_EXT); - outFile = new File(installFolder, OBFSCLIENT_ASSET_KEY); - streamToFile(is,outFile, false, true); - setExecutable(outFile); - /** - is = context.getAssets().open(cpuPath + "/" + MEEK_ASSET_KEY + MP3_EXT); - outFile = new File(installFolder, MEEK_ASSET_KEY); - shell.add(new SimpleCommand(COMMAND_RM_FORCE + outFile.getAbsolutePath())).waitForFinish(); - streamToFile(is,outFile, false, true); - setExecutable(outFile); - */ - - } - + + is = context.getAssets().open(cpuPath + '/' + OBFSCLIENT_ASSET_KEY + MP3_EXT); + outFile = new File(installFolder, OBFSCLIENT_ASSET_KEY); + streamToFile(is,outFile, false, true); + setExecutable(outFile); + is = context.getAssets().open(cpuPath + '/' + TOR_ASSET_KEY + MP3_EXT); outFile = new File(installFolder, TOR_ASSET_KEY); streamToFile(is,outFile, false, true);

1 0

[orbot/master] move patches to external since that is what it is applied to (external code)
by n8fr8＠torproject.org 13 Oct '16

13 Oct '16

commit 0f00e12cdcbe1d0bb60d04eae0e557c6ddf21bb7 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jun 29 10:01:42 2016 -0400 move patches to external since that is what it is applied to (external code) --- external/patches/UDP-block.patch | 243 +++++++++++++ .../orbot-patch-sporkbomb-20110501/Part 1.4 | 11 + ...real_transproxy_all-use_only_new_iptables.patch | 390 +++++++++++++++++++++ .../orbot_leak_report | 110 ++++++ external/patches/transproxy.patch | 0 external/patches/udptransproxyfinal.patch | 247 +++++++++++++ .../ic_launcher_gibberbot.png | Bin 0 -> 7527 bytes .../update_GibberBot_info.diff | 285 +++++++++++++++ 8 files changed, 1286 insertions(+) diff --git a/external/patches/UDP-block.patch b/external/patches/UDP-block.patch new file mode 100644 index 0000000..e16a957 --- /dev/null +++ b/external/patches/UDP-block.patch @@ -0,0 +1,243 @@ +From c2620d6939713762e30badc3ed5da981e296b742 Mon Sep 17 00:00:00 2001 +From: patch <patrickbx(a)gmail.com> +Date: Mon, 23 Jul 2012 16:12:55 -0400 +Subject: [PATCH] Modified iptables rules for transproxying. UDP is now + blocked. Also removed some redundant rules and reordered + others. I reordered by the idea that its generally easier + to specifically allow traffic before your reject it. + +--- + .../torproject/android/service/TorTransProxy.java | 133 ++++++++++---------- + 1 file changed, 64 insertions(+), 69 deletions(-) + +diff --git a/src/org/torproject/android/service/TorTransProxy.java b/src/org/torproject/android/service/TorTransProxy.java +index 2571123..c248a9f 100644 +--- a/src/org/torproject/android/service/TorTransProxy.java ++++ b/src/org/torproject/android/service/TorTransProxy.java +@@ -224,6 +224,15 @@ public class TorTransProxy implements TorServiceConstants { + + int torUid = context.getApplicationInfo().uid; + ++ // Allow everything for Tor ++ script.append(ipTablesPath); ++ script.append(" -t filter"); ++ script.append(" -A OUTPUT"); ++ script.append(" -m owner --uid-owner "); ++ script.append(torUid); ++ script.append(" -j ACCEPT"); ++ script.append(" || exit\n"); ++ + //build up array of shell cmds to execute under one root context + for (TorifiedApp tApp:apps) + { +@@ -235,9 +244,9 @@ public class TorTransProxy implements TorServiceConstants { + { + + TorService.logMessage("enabling transproxy for app: " + tApp.getUsername() + "(" + tApp.getUid() + ")"); +- +- // Set up port redirection +- script.append(ipTablesPath); ++ ++ // Set up port redirection ++ script.append(ipTablesPath); + script.append(" -t nat"); + script.append(" -A OUTPUT -p tcp"); + script.append(" ! -d 127.0.0.1"); //allow access to localhost +@@ -251,14 +260,28 @@ public class TorTransProxy implements TorServiceConstants { + // Same for DNS + script.append(ipTablesPath); + script.append(" -t nat"); +- script.append(" -A OUTPUT -p udp -m owner --uid-owner "); ++ script.append(" -A OUTPUT -p udp"); ++ script.append(" -m owner --uid-owner "); + script.append(tApp.getUid()); + script.append(" -m udp --dport "); + script.append(STANDARD_DNS_PORT); + script.append(" -j REDIRECT --to-ports "); + script.append(TOR_DNS_PORT); + script.append(" || exit\n"); +- ++ ++ // Allow loopback ++ script.append(ipTablesPath); ++ script.append(" -t filter"); ++ script.append(" -A OUTPUT"); ++ script.append(" -m owner --uid-owner "); ++ script.append(tApp.getUid()); ++ script.append(" -o lo"); ++ script.append(" -j ACCEPT"); ++ script.append(" || exit\n"); ++ ++ /* ++ //Outgoing loopback already allowed (23/7/12) ++ + int[] ports = {TOR_DNS_PORT,TOR_TRANSPROXY_PORT,PORT_SOCKS,PORT_HTTP}; + + for (int port : ports) +@@ -276,53 +299,32 @@ public class TorTransProxy implements TorServiceConstants { + script.append(" -j ACCEPT"); + script.append(" || exit\n"); + } +- +- // Allow loopback ++ */ ++ ++ // Reject all other outbound TCP packets + script.append(ipTablesPath); + script.append(" -t filter"); + script.append(" -A OUTPUT"); + script.append(" -m owner --uid-owner "); + script.append(tApp.getUid()); + script.append(" -p tcp"); +- script.append(" -o lo"); +- script.append(" -j ACCEPT"); +- script.append(" || exit\n"); +- +- // Reject DNS that is not from Tor (order is important - first matched rule counts!) +- script.append(ipTablesPath); +- script.append(" -t filter"); +- script.append(" -A OUTPUT"); +- script.append(" -m owner --uid-owner "); +- script.append(tApp.getUid()); +- script.append(" -p udp"); +- script.append(" --dport "); +- script.append(STANDARD_DNS_PORT); + script.append(" -j REJECT"); + script.append(" || exit\n"); +- +- // Reject all other outbound TCP packets ++ ++ // Reject all other outbound UDP packets + script.append(ipTablesPath); + script.append(" -t filter"); + script.append(" -A OUTPUT"); + script.append(" -m owner --uid-owner "); + script.append(tApp.getUid()); +- script.append(" -p tcp"); ++ script.append(" -p udp"); + script.append(" -j REJECT"); + script.append(" || exit\n"); ++ + + } + } +- + +- // Allow everything for Tor +- script.append(ipTablesPath); +- script.append(" -t filter"); +- script.append(" -A OUTPUT"); +- script.append(" -m owner --uid-owner "); +- script.append(torUid); +- script.append(" -j ACCEPT"); +- script.append(" || exit\n"); +- + String[] cmdAdd = {script.toString()}; + + code = TorServiceUtils.doShellCommand(cmdAdd, res, runRoot, waitFor); +@@ -450,8 +452,8 @@ public class TorTransProxy implements TorServiceConstants { + + int torUid = context.getApplicationInfo().uid; + +- // Set up port redirection +- script.append(ipTablesPath); ++ // Set up port redirection ++ script.append(ipTablesPath); + script.append(" -t nat"); + script.append(" -A OUTPUT -p tcp"); + script.append(" ! -d 127.0.0.1"); //allow access to localhost +@@ -465,14 +467,36 @@ public class TorTransProxy implements TorServiceConstants { + // Same for DNS + script.append(ipTablesPath); + script.append(" -t nat"); +- script.append(" -A OUTPUT -p udp -m owner ! --uid-owner "); ++ script.append(" -A OUTPUT -p udp"); ++ script.appent(" -m owner ! --uid-owner "); + script.append(torUid); + script.append(" -m udp --dport "); + script.append(STANDARD_DNS_PORT); + script.append(" -j REDIRECT --to-ports "); + script.append(TOR_DNS_PORT); + script.append(" || exit\n"); ++ ++ // Allow loopback ++ script.append(ipTablesPath); ++ script.append(" -t filter"); ++ script.append(" -A OUTPUT"); ++ script.append(" -o lo"); ++ script.append(" -j ACCEPT"); ++ script.append(" || exit\n"); + ++ // Allow everything for Tor ++ script.append(ipTablesPath); ++ script.append(" -t filter"); ++ script.append(" -A OUTPUT"); ++ script.append(" -m owner --uid-owner "); ++ script.append(torUid); ++ script.append(" -j ACCEPT"); ++ script.append(" || exit\n"); ++ ++ ++ /* ++ //Outgoing loopback already allowed (23/7/12) ++ + int[] ports = {TOR_DNS_PORT,TOR_TRANSPROXY_PORT,PORT_SOCKS,PORT_HTTP}; + + for (int port : ports) +@@ -490,25 +514,8 @@ public class TorTransProxy implements TorServiceConstants { + script.append(" -j ACCEPT"); + script.append(" || exit\n"); + +- } +- +- // Allow loopback +- script.append(ipTablesPath); +- script.append(" -t filter"); +- script.append(" -A OUTPUT"); +- script.append(" -p tcp"); +- script.append(" -o lo"); +- script.append(" -j ACCEPT"); +- script.append(" || exit\n"); ++ } */ + +- // Allow everything for Tor +- script.append(ipTablesPath); +- script.append(" -t filter"); +- script.append(" -A OUTPUT"); +- script.append(" -m owner --uid-owner "); +- script.append(torUid); +- script.append(" -j ACCEPT"); +- script.append(" || exit\n"); + + if (TorService.ENABLE_DEBUG_LOG) + { +@@ -532,23 +539,11 @@ public class TorTransProxy implements TorServiceConstants { + script.append(" --log-uid"); + script.append(" || exit\n"); + } +- +- // Reject DNS that is not from Tor (order is important - first matched rule counts!) +- script.append(ipTablesPath); +- script.append(" -t filter"); +- script.append(" -A OUTPUT"); +- script.append(" -p udp"); +- script.append(" --dport "); +- script.append(STANDARD_DNS_PORT); +- script.append(" -j REJECT"); +- script.append(" || exit\n"); +- +- // Reject all other outbound TCP packets ++ ++ // Reject all other outbound packets by default + script.append(ipTablesPath); + script.append(" -t filter"); +- script.append(" -A OUTPUT"); +- script.append(" -p tcp"); +- script.append(" -j REJECT"); ++ script.append(" -P OUTPUT DROP"); + script.append(" || exit\n"); + + String[] cmdAdd = {script.toString()}; +-- +1.7.9.5 + diff --git a/external/patches/orbot-patch-sporkbomb-20110501/Part 1.4 b/external/patches/orbot-patch-sporkbomb-20110501/Part 1.4 new file mode 100644 index 0000000..002bdb9 --- /dev/null +++ b/external/patches/orbot-patch-sporkbomb-20110501/Part 1.4 @@ -0,0 +1,11 @@ +_______________________________________________ +Guardian-dev mailing list + +Post: Guardian-dev(a)lists.mayfirst.org +List info: https://lists.mayfirst.org/mailman/listinfo/guardian-dev + +To Unsubscribe + Send email to: Guardian-dev-unsubscribe(a)lists.mayfirst.org + Or visit: https://lists.mayfirst.org/mailman/options/guardian-dev/nathan%40guardianpr… + +You are subscribed as: nathan(a)guardianproject.info diff --git a/external/patches/orbot-patch-sporkbomb-20110501/orbot-real_transproxy_all-use_only_new_iptables.patch b/external/patches/orbot-patch-sporkbomb-20110501/orbot-real_transproxy_all-use_only_new_iptables.patch new file mode 100644 index 0000000..60635b4 --- /dev/null +++ b/external/patches/orbot-patch-sporkbomb-20110501/orbot-real_transproxy_all-use_only_new_iptables.patch @@ -0,0 +1,390 @@ +Index: src/org/torproject/android/service/TorService.java +=================================================================== +--- src/org/torproject/android/service/TorService.java (revision 24697) ++++ src/org/torproject/android/service/TorService.java (working copy) +@@ -710,10 +710,36 @@ + + if (enableTransparentProxy) + { +- showAlert("Status", "Setting up transparent proxying..."); +- +- //TorTransProxy.setDNSProxying(); +- int code = TorTransProxy.setTransparentProxyingByApp(this,AppManager.getApps(this),transProxyAll); ++ //TODO: Find a nice place for the next (commented) line ++ //TorTransProxy.setDNSProxying(); ++ ++ int code = 0; // Default state is "okay" ++ ++ if(transProxyPortFallback) ++ { ++ showAlert("Status", "Setting up port-based transparent proxying..."); ++ StringTokenizer st = new StringTokenizer(portProxyList, ","); ++ int status = code; ++ while (st.hasMoreTokens()) ++ { ++ status = TorTransProxy.setTransparentProxyingByPort(this, Integer.parseInt(st.nextToken())); ++ if(status != 0) ++ code = status; ++ } ++ } ++ else ++ { ++ if(transProxyAll) ++ { ++ showAlert("Status", "Setting up full transparent proxying..."); ++ code = TorTransProxy.setTransparentProxyingAll(this); ++ } ++ else ++ { ++ showAlert("Status", "Setting up app-based transparent proxying..."); ++ code = TorTransProxy.setTransparentProxyingByApp(this,AppManager.getApps(this),transProxyAll); ++ } ++ } + + TorService.logMessage ("TorTransProxy resp code: " + code); + +@@ -725,17 +751,7 @@ + { + showAlert("Status", "WARNING: error starting transparent proxying!"); + } +- +- //this is for Androids w/o owner module support as a circumvention only fallback +- if (transProxyPortFallback) +- { +- StringTokenizer st = new StringTokenizer(portProxyList, ","); +- +- while (st.hasMoreTokens()) +- TorTransProxy.setTransparentProxyingByPort(this, Integer.parseInt(st.nextToken())); +- +- } +- ++ + return true; + + } +Index: src/org/torproject/android/service/TorTransProxy.java +=================================================================== +--- src/org/torproject/android/service/TorTransProxy.java (revision 24697) ++++ src/org/torproject/android/service/TorTransProxy.java (working copy) +@@ -136,8 +136,6 @@ + //redirectDNSResolvConf(); //not working yet + + String ipTablesPath = new File(context.getDir("bin", 0),"iptables").getAbsolutePath(); +- +- boolean ipTablesOld = false; + + StringBuilder script = new StringBuilder(); + +@@ -145,14 +143,12 @@ + int code = -1; + + purgeIptables(context); +- +- script = new StringBuilder(); +- ++ + //build up array of shell cmds to execute under one root context + for (int i = 0; i < apps.length; i++) + { + +- if (forceAll || apps[i].isTorified()) //if "Tor Everything" on or app is set to true ++ if (apps[i].isTorified()) //if app is set to true + { + + if (apps[i].getUsername().equals(TorServiceConstants.TOR_APP_USERNAME)) +@@ -170,14 +166,8 @@ + script.append(" -m owner --uid-owner "); + script.append(apps[i].getUid()); + script.append(" -m tcp --syn"); +- +- if (ipTablesOld) +- script.append(" -j DNAT --to 127.0.0.1:"); +- else +- script.append(" -j REDIRECT --to-ports "); +- ++ script.append(" -j REDIRECT --to-ports "); + script.append(TOR_TRANSPROXY_PORT); +- + script.append(" || exit\n"); + + //DNS +@@ -187,57 +177,37 @@ + script.append(apps[i].getUid()); + script.append(" -m udp --dport "); + script.append(STANDARD_DNS_PORT); ++ script.append(" -j REDIRECT --to-ports "); ++ script.append(TOR_DNS_PORT); ++ script.append(" || exit\n"); + +- if (ipTablesOld) +- script.append(" -j DNAT --to 127.0.0.1:"); +- else +- script.append(" -j REDIRECT --to-ports "); ++ script.append(ipTablesPath); ++ script.append(" -t filter"); ++ script.append(" -A OUTPUT -p tcp"); ++ script.append(" -m owner --uid-owner "); ++ script.append(apps[i].getUid()); ++ script.append(" -m tcp --dport "); ++ script.append(TOR_TRANSPROXY_PORT); ++ script.append(" -j ACCEPT"); ++ script.append(" || exit\n"); + ++ script.append(ipTablesPath); ++ script.append(" -t filter"); ++ script.append(" -A OUTPUT -p udp"); ++ script.append(" -m owner --uid-owner "); ++ script.append(apps[i].getUid()); ++ script.append(" -m udp --dport "); + script.append(TOR_DNS_PORT); +- ++ script.append(" -j ACCEPT"); + script.append(" || exit\n"); ++ ++ script.append(ipTablesPath); ++ script.append(" -t filter -A OUTPUT -m owner --uid-owner "); ++ script.append(apps[i].getUid()); ++ script.append(" -j DROP"); //drop all other packets as Tor won't handle them ++ script.append(" || exit\n"); + + +- if (ipTablesOld) //for some reason this doesn't work on iptables 1.3.7 +- { +- script.append(ipTablesPath); +- script.append(" -t nat"); +- script.append(" -A OUTPUT -m owner --uid-owner "); +- script.append(apps[i].getUid()); +- script.append(" -j DROP"); +- script.append(" || exit\n"); +- } +- else +- { +- script.append(ipTablesPath); +- script.append(" -t filter"); +- script.append(" -A OUTPUT -p tcp"); +- script.append(" -m owner --uid-owner "); +- script.append(apps[i].getUid()); +- script.append(" -m tcp --dport "); +- script.append(TOR_TRANSPROXY_PORT); +- script.append(" -j ACCEPT"); +- script.append(" || exit\n"); +- +- script.append(ipTablesPath); +- script.append(" -t filter"); +- script.append(" -A OUTPUT -p udp"); +- script.append(" -m owner --uid-owner "); +- script.append(apps[i].getUid()); +- script.append(" -m udp --dport "); +- script.append(TOR_DNS_PORT); +- script.append(" -j ACCEPT"); +- script.append(" || exit\n"); +- +- script.append(ipTablesPath); +- script.append(" -t filter -A OUTPUT -m owner --uid-owner "); +- script.append(apps[i].getUid()); +- script.append(" -j DROP"); //drop all other packets as Tor won't handle them +- script.append(" || exit\n"); +- +- } +- +- + } + } + +@@ -260,20 +230,13 @@ + + //String baseDir = context.getDir("bin",0).getAbsolutePath() + '/'; + String ipTablesPath = new File(context.getDir("bin", 0),"iptables").getAbsolutePath(); +- +- boolean ipTablesOld = false; + + StringBuilder script = new StringBuilder(); + + StringBuilder res = new StringBuilder(); + int code = -1; +- +- String[] cmdFlush = {script.toString()}; +- code = TorServiceUtils.doShellCommand(cmdFlush, res, true, true); +- //String msg = res.toString(); //get stdout from command ++ purgeIptables(context); + +- script = new StringBuilder(); +- + //TCP + //iptables -t nat -A PREROUTING -i eth0 -p tcp --dport $srcPortNumber -j REDIRECT --to-port $dstPortNumbe + +@@ -283,14 +246,8 @@ + script.append(" --dport "); + script.append(port); + //script.append(" -m tcp --syn"); +- +- if (ipTablesOld) +- script.append(" -j DNAT --to 127.0.0.1:"); +- else +- script.append(" -j REDIRECT --to-ports "); +- ++ script.append(" -j REDIRECT --to-ports "); + script.append(TOR_TRANSPROXY_PORT); +- + script.append(" || exit\n"); + + script.append(ipTablesPath); +@@ -298,14 +255,8 @@ + script.append(" -A OUTPUT -p udp"); + script.append(" --dport "); + script.append(port); +- +- if (ipTablesOld) +- script.append(" -j DNAT --to 127.0.0.1:"); +- else +- script.append(" -j REDIRECT --to-ports "); +- ++ script.append(" -j REDIRECT --to-ports "); + script.append(TOR_TRANSPROXY_PORT); +- + script.append(" || exit\n"); + + //DNS +@@ -314,24 +265,134 @@ + script.append(" -A OUTPUT -p udp "); + script.append(" -m udp --dport "); + script.append(STANDARD_DNS_PORT); ++ script.append(" -j REDIRECT --to-ports "); ++ script.append(TOR_DNS_PORT); ++ script.append(" || exit\n"); + +- if (ipTablesOld) +- script.append(" -j DNAT --to 127.0.0.1:"); +- else +- script.append(" -j REDIRECT --to-ports "); ++ ++ String[] cmdAdd = {script.toString()}; ++ code = TorServiceUtils.doShellCommand(cmdAdd, res, true, true); ++ String msg = res.toString(); ++ TorService.logMessage(cmdAdd[0] + ";errCode=" + code + ";resp=" + msg); + ++ return code; ++ } ++ ++ public static int setTransparentProxyingAll(Context context) throws Exception { ++ boolean runRoot = true; ++ boolean waitFor = true; ++ ++ //android.os.Debug.waitForDebugger(); ++ ++ //redirectDNSResolvConf(); //not working yet ++ ++ String ipTablesPath = new File(context.getDir("bin", 0),"iptables").getAbsolutePath(); ++ ++ StringBuilder script = new StringBuilder(); ++ ++ StringBuilder res = new StringBuilder(); ++ int code = -1; ++ ++ purgeIptables(context); ++ ++ int torUid = context.getApplicationInfo().uid; ++ ++ // Set up port redirection ++ script.append(ipTablesPath); ++ script.append(" -t nat"); ++ script.append(" -A OUTPUT -p tcp"); ++ script.append(" -m owner ! --uid-owner "); ++ script.append(torUid); ++ script.append(" -m tcp --syn"); ++ script.append(" -j REDIRECT --to-ports "); ++ script.append(TOR_TRANSPROXY_PORT); ++ script.append(" || exit\n"); ++ ++ // Same for DNS ++ script.append(ipTablesPath); ++ script.append(" -t nat"); ++ script.append(" -A OUTPUT -p udp -m owner ! --uid-owner "); ++ script.append(torUid); ++ script.append(" -m udp --dport "); ++ script.append(STANDARD_DNS_PORT); ++ script.append(" -j REDIRECT --to-ports "); + script.append(TOR_DNS_PORT); ++ script.append(" || exit\n"); + ++ // Allow packets to localhost (contains all the port-redirected ones) ++ script.append(ipTablesPath); ++ script.append(" -t filter"); ++ script.append(" -A OUTPUT"); ++ script.append(" -p tcp"); ++ script.append(" -d 127.0.0.1"); ++ script.append(" -j ACCEPT"); + script.append(" || exit\n"); + ++ // Allow loopback ++ script.append(ipTablesPath); ++ script.append(" -t filter"); ++ script.append(" -A OUTPUT"); ++ script.append(" -p tcp"); ++ script.append(" -o lo"); ++ script.append(" -j ACCEPT"); ++ script.append(" || exit\n"); ++ ++ // Allow everything for Tor ++ script.append(ipTablesPath); ++ script.append(" -t filter"); ++ script.append(" -A OUTPUT"); ++ script.append(" -m owner --uid-owner "); ++ script.append(torUid); ++ script.append(" -j ACCEPT"); ++ script.append(" || exit\n"); ++ ++ //XXX: Comment the following rules for non-debug builds ++ script.append(ipTablesPath); ++ script.append(" -t filter"); ++ script.append(" -A OUTPUT"); ++ script.append(" -p udp"); ++ script.append(" --dport "); ++ script.append(STANDARD_DNS_PORT); ++ script.append(" -j LOG"); ++ script.append(" --log-prefix='ORBOT_DNSLEAK_PROTECTION'"); ++ script.append(" --log-uid"); ++ script.append(" || exit\n"); ++ script.append(ipTablesPath); ++ script.append(" -t filter"); ++ script.append(" -A OUTPUT"); ++ script.append(" -p tcp"); ++ script.append(" -j LOG"); ++ script.append(" --log-prefix='ORBOT_TCPLEAK_PROTECTION'"); ++ script.append(" --log-uid"); ++ script.append(" || exit\n"); ++ ++ ++ // Reject DNS that is not from Tor (order is important - first matched rule counts!) ++ script.append(ipTablesPath); ++ script.append(" -t filter"); ++ script.append(" -A OUTPUT"); ++ script.append(" -p udp"); ++ script.append(" --dport "); ++ script.append(STANDARD_DNS_PORT); ++ script.append(" -j REJECT"); ++ script.append(" || exit\n"); ++ ++ // Reject all other outbound TCP packets ++ script.append(ipTablesPath); ++ script.append(" -t filter"); ++ script.append(" -A OUTPUT"); ++ script.append(" -p tcp"); ++ script.append(" -j REJECT"); ++ script.append(" || exit\n"); ++ ++ String[] cmdAdd = {script.toString()}; + +- String[] cmdAdd = {script.toString()}; +- code = TorServiceUtils.doShellCommand(cmdAdd, res, true, true); ++ code = TorServiceUtils.doShellCommand(cmdAdd, res, runRoot, waitFor); + String msg = res.toString(); + TorService.logMessage(cmdAdd[0] + ";errCode=" + code + ";resp=" + msg); + +- return code; +- } ++ return code; ++ } + + + } diff --git a/external/patches/orbot-patch-sporkbomb-20110501/orbot_leak_report b/external/patches/orbot-patch-sporkbomb-20110501/orbot_leak_report new file mode 100644 index 0000000..8f61a1f --- /dev/null +++ b/external/patches/orbot-patch-sporkbomb-20110501/orbot_leak_report @@ -0,0 +1,110 @@ +<4>[ 115.319671] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=52 TOS=0x00 PREC=0x00 TTL=64 ID=9997 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK URGP=0 UID=10035 GID=10035 +<4>[ 115.482788] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=64 TOS=0x00 PREC=0x00 TTL=64 ID=9998 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK URGP=0 UID=10035 GID=10035 +<4>[ 116.037658] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=64 TOS=0x00 PREC=0x00 TTL=64 ID=9999 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK URGP=0 UID=10035 GID=10035 +<4>[ 116.699127] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10000 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10035 GID=10035 +<4>[ 116.724517] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10001 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 UID=10035 GID=10035 +<4>[ 116.922515] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=91 TOS=0x00 PREC=0x00 TTL=64 ID=10002 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 117.330810] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10003 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 118.150726] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10004 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 118.903320] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=91 TOS=0x00 PREC=0x00 TTL=64 ID=10005 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 119.310729] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10006 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 120.130737] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10007 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 121.770690] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10008 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 122.695465] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=91 TOS=0x00 PREC=0x00 TTL=64 ID=10009 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 123.100708] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10010 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 123.920684] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10011 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 125.565673] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10012 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 128.840789] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10013 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 130.366333] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=91 TOS=0x00 PREC=0x00 TTL=64 ID=10014 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 130.785339] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10015 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 131.600799] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10016 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 132.835144] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50247 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 +<4>[ 133.240753] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10017 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 133.410705] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50248 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 +<4>[ 133.443481] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=261 TOS=0x00 PREC=0x00 TTL=64 ID=50249 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 +<4>[ 134.031341] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50250 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 +<4>[ 134.782196] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=261 TOS=0x00 PREC=0x00 TTL=64 ID=50251 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 +<4>[ 135.360778] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50252 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 +<4>[ 136.520782] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10018 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 136.526306] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50253 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 +<4>[ 137.334716] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=261 TOS=0x00 PREC=0x00 TTL=64 ID=50254 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 +<4>[ 137.915832] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50255 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 +<4>[ 139.075378] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50256 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 +<4>[ 140.435913] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=91 TOS=0x00 PREC=0x00 TTL=64 ID=10019 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 140.850799] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10020 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 141.395019] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50257 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 +<4>[ 141.675140] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10021 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 142.455352] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=261 TOS=0x00 PREC=0x00 TTL=64 ID=50258 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 +<4>[ 143.030792] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50259 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 +<4>[ 143.310852] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10022 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 144.190734] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50260 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 +<4>[ 146.510803] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50261 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 +<4>[ 146.590789] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10023 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 151.150726] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50262 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 +<4>[ 151.166290] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=91 TOS=0x00 PREC=0x00 TTL=64 ID=10024 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 151.570739] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10025 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 152.390686] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10026 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 152.694427] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=261 TOS=0x00 PREC=0x00 TTL=64 ID=50263 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 +<4>[ 153.270721] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50264 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 +<4>[ 154.030731] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10027 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 154.430694] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50265 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 +<4>[ 156.750701] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50266 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 +<4>[ 157.310699] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10028 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 160.383117] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=91 TOS=0x00 PREC=0x00 TTL=64 ID=10029 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 160.790832] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10030 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 161.390716] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50267 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 +<4>[ 161.610717] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10031 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 163.250701] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10032 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 166.531494] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10033 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 170.670715] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50268 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 +<4>[ 170.842285] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=91 TOS=0x00 PREC=0x00 TTL=64 ID=10034 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 171.250732] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10035 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 172.070800] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10036 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 173.309783] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=261 TOS=0x00 PREC=0x00 TTL=64 ID=50269 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 +<4>[ 173.710784] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10037 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 173.880828] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50270 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 +<4>[ 175.040710] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50271 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 +<4>[ 176.990692] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10038 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 177.360687] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50272 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 +<4>[ 181.682952] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=91 TOS=0x00 PREC=0x00 TTL=64 ID=10039 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 182.000701] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50273 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 +<4>[ 182.090698] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10040 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 182.910797] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10041 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 184.550689] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10042 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 187.830749] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10043 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 191.280700] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50274 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 +<4>[ 193.917053] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=91 TOS=0x00 PREC=0x00 TTL=64 ID=10044 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 194.330749] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10045 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 195.150695] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10046 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 196.790679] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10047 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 200.070709] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10048 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 201.567718] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=91 TOS=0x00 PREC=0x00 TTL=64 ID=10049 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 201.970703] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10050 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 202.790771] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10051 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 204.430816] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10052 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 207.710693] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10053 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 209.840789] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50275 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 +<4>[ 212.362884] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=91 TOS=0x00 PREC=0x00 TTL=64 ID=10054 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 212.770812] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10055 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 213.590698] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10056 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 215.235809] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10057 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 217.285766] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=261 TOS=0x00 PREC=0x00 TTL=64 ID=50276 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 +<4>[ 217.860687] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50277 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 +<4>[ 218.510803] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10058 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 219.020721] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50278 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 +<4>[ 220.840667] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.101 LEN=40 TOS=0x00 PREC=0x00 TTL=64 ID=0 DF PROTO=TCP SPT=40218 DPT=80 WINDOW=0 RES=0x00 RST URGP=0 +<4>[ 220.842559] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.101 LEN=40 TOS=0x00 PREC=0x00 TTL=64 ID=0 DF PROTO=TCP SPT=40218 DPT=80 WINDOW=0 RES=0x00 RST URGP=0 +<4>[ 220.844512] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.101 LEN=40 TOS=0x00 PREC=0x00 TTL=64 ID=0 DF PROTO=TCP SPT=40218 DPT=80 WINDOW=0 RES=0x00 RST URGP=0 +<4>[ 221.340820] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50279 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 +<4>[ 221.478881] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=91 TOS=0x00 PREC=0x00 TTL=64 ID=10059 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 221.890777] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10060 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 221.898010] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.101 LEN=40 TOS=0x00 PREC=0x00 TTL=64 ID=0 DF PROTO=TCP SPT=40218 DPT=80 WINDOW=0 RES=0x00 RST URGP=0 +<4>[ 222.710754] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10061 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 224.350677] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10062 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 225.617523] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.101 LEN=40 TOS=0x00 PREC=0x00 TTL=64 ID=0 DF PROTO=TCP SPT=40218 DPT=80 WINDOW=0 RES=0x00 RST URGP=0 +<4>[ 225.980743] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=87.238.52.70 LEN=249 TOS=0x00 PREC=0x00 TTL=64 ID=50280 DF PROTO=TCP SPT=53939 DPT=993 WINDOW=32044 RES=0x00 ACK PSH URGP=0 UID=10053 GID=10053 +<4>[ 227.630798] ORBOT_TCPLEAK_PROTECTIONIN= OUT=eth0 SRC=192.168.0.14 DST=74.125.39.139 LEN=79 TOS=0x00 PREC=0x00 TTL=64 ID=10063 DF PROTO=TCP SPT=53388 DPT=443 WINDOW=32044 RES=0x00 ACK PSH FIN URGP=0 +<4>[ 241.522155] ORBOT_TCPLEAK_PROTECTIONIN= OUT=rmnet0 SRC=46.206.239.134 DST=84.22.122.5 LEN=52 TOS=0x00 PREC=0x00 TTL=64 ID=20341 DF PROTO=TCP SPT=49138 DPT=9001 WINDOW=32044 RES=0x00 ACK URGP=0 +<4>[ 241.792358] ORBOT_TCPLEAK_PROTECTIONIN= OUT=rmnet0 SRC=46.206.239.134 DST=84.22.122.5 LEN=52 TOS=0x00 PREC=0x00 TTL=64 ID=0 DF PROTO=TCP SPT=49138 DPT=9001 WINDOW=32044 RES=0x00 ACK URGP=0 +<4>[ 242.362335] ORBOT_TCPLEAK_PROTECTIONIN= OUT=rmnet0 SRC=46.206.239.134 DST=84.22.122.5 LEN=52 TOS=0x00 PREC=0x00 TTL=64 ID=0 DF PROTO=TCP SPT=49138 DPT=9001 WINDOW=32044 RES=0x00 ACK URGP=0 +<4>[ 243.452331] ORBOT_TCPLEAK_PROTECTIONIN= OUT=rmnet0 SRC=46.206.239.134 DST=84.22.122.5 LEN=52 TOS=0x00 PREC=0x00 TTL=64 ID=0 DF PROTO=TCP SPT=49138 DPT=9001 WINDOW=32044 RES=0x00 ACK URGP=0 diff --git a/external/patches/transproxy.patch b/external/patches/transproxy.patch new file mode 100644 index 0000000..e69de29 diff --git a/external/patches/udptransproxyfinal.patch b/external/patches/udptransproxyfinal.patch new file mode 100644 index 0000000..32cc0e2 --- /dev/null +++ b/external/patches/udptransproxyfinal.patch @@ -0,0 +1,247 @@ +From a81741afe06ac2309b4306dedbd5a0ebf755b7e1 Mon Sep 17 00:00:00 2001 +From: patch <patrickbx(a)gmail.com> +Date: Fri, 31 Aug 2012 17:25:52 -0400 +Subject: [PATCH] Addendum to the last commit on UDP transproxy rules. Trying + to simplfy the iptables rules didn't work out so this is a + minimal change from the original TorTransProxy.java file. + UDP is blocked and tested as working. + +--- + .../torproject/android/service/TorTransProxy.java | 144 ++++++++++++-------- + 1 file changed, 84 insertions(+), 60 deletions(-) + +diff --git a/src/org/torproject/android/service/TorTransProxy.java b/src/org/torproject/android/service/TorTransProxy.java +index c248a9f..90bdc34 100644 +--- a/src/org/torproject/android/service/TorTransProxy.java ++++ b/src/org/torproject/android/service/TorTransProxy.java +@@ -224,15 +224,6 @@ public class TorTransProxy implements TorServiceConstants { + + int torUid = context.getApplicationInfo().uid; + +- // Allow everything for Tor +- script.append(ipTablesPath); +- script.append(" -t filter"); +- script.append(" -A OUTPUT"); +- script.append(" -m owner --uid-owner "); +- script.append(torUid); +- script.append(" -j ACCEPT"); +- script.append(" || exit\n"); +- + //build up array of shell cmds to execute under one root context + for (TorifiedApp tApp:apps) + { +@@ -244,9 +235,9 @@ public class TorTransProxy implements TorServiceConstants { + { + + TorService.logMessage("enabling transproxy for app: " + tApp.getUsername() + "(" + tApp.getUid() + ")"); +- +- // Set up port redirection +- script.append(ipTablesPath); ++ ++ // Set up port redirection ++ script.append(ipTablesPath); + script.append(" -t nat"); + script.append(" -A OUTPUT -p tcp"); + script.append(" ! -d 127.0.0.1"); //allow access to localhost +@@ -260,28 +251,14 @@ public class TorTransProxy implements TorServiceConstants { + // Same for DNS + script.append(ipTablesPath); + script.append(" -t nat"); +- script.append(" -A OUTPUT -p udp"); +- script.append(" -m owner --uid-owner "); ++ script.append(" -A OUTPUT -p udp -m owner --uid-owner "); + script.append(tApp.getUid()); + script.append(" -m udp --dport "); + script.append(STANDARD_DNS_PORT); + script.append(" -j REDIRECT --to-ports "); + script.append(TOR_DNS_PORT); + script.append(" || exit\n"); +- +- // Allow loopback +- script.append(ipTablesPath); +- script.append(" -t filter"); +- script.append(" -A OUTPUT"); +- script.append(" -m owner --uid-owner "); +- script.append(tApp.getUid()); +- script.append(" -o lo"); +- script.append(" -j ACCEPT"); +- script.append(" || exit\n"); +- +- /* +- //Outgoing loopback already allowed (23/7/12) +- ++ + int[] ports = {TOR_DNS_PORT,TOR_TRANSPROXY_PORT,PORT_SOCKS,PORT_HTTP}; + + for (int port : ports) +@@ -299,8 +276,30 @@ public class TorTransProxy implements TorServiceConstants { + script.append(" -j ACCEPT"); + script.append(" || exit\n"); + } +- */ +- ++ ++ // Allow loopback ++ script.append(ipTablesPath); ++ script.append(" -t filter"); ++ script.append(" -A OUTPUT"); ++ script.append(" -m owner --uid-owner "); ++ script.append(tApp.getUid()); ++ script.append(" -p tcp"); ++ script.append(" -o lo"); ++ script.append(" -j ACCEPT"); ++ script.append(" || exit\n"); ++ ++ // Reject DNS that is not from Tor (order is important - first matched rule counts!) ++ script.append(ipTablesPath); ++ script.append(" -t filter"); ++ script.append(" -A OUTPUT"); ++ script.append(" -m owner --uid-owner "); ++ script.append(tApp.getUid()); ++ script.append(" -p udp"); ++ script.append(" --dport "); ++ script.append(STANDARD_DNS_PORT); ++ script.append(" -j REJECT"); ++ script.append(" || exit\n"); ++ + // Reject all other outbound TCP packets + script.append(ipTablesPath); + script.append(" -t filter"); +@@ -321,10 +320,19 @@ public class TorTransProxy implements TorServiceConstants { + script.append(" -j REJECT"); + script.append(" || exit\n"); + +- + } + } ++ + ++ // Allow everything for Tor ++ script.append(ipTablesPath); ++ script.append(" -t filter"); ++ script.append(" -A OUTPUT"); ++ script.append(" -m owner --uid-owner "); ++ script.append(torUid); ++ script.append(" -j ACCEPT"); ++ script.append(" || exit\n"); ++ + String[] cmdAdd = {script.toString()}; + + code = TorServiceUtils.doShellCommand(cmdAdd, res, runRoot, waitFor); +@@ -452,8 +460,8 @@ public class TorTransProxy implements TorServiceConstants { + + int torUid = context.getApplicationInfo().uid; + +- // Set up port redirection +- script.append(ipTablesPath); ++ // Set up port redirection ++ script.append(ipTablesPath); + script.append(" -t nat"); + script.append(" -A OUTPUT -p tcp"); + script.append(" ! -d 127.0.0.1"); //allow access to localhost +@@ -467,36 +475,14 @@ public class TorTransProxy implements TorServiceConstants { + // Same for DNS + script.append(ipTablesPath); + script.append(" -t nat"); +- script.append(" -A OUTPUT -p udp"); +- script.appent(" -m owner ! --uid-owner "); ++ script.append(" -A OUTPUT -p udp -m owner ! --uid-owner "); + script.append(torUid); + script.append(" -m udp --dport "); + script.append(STANDARD_DNS_PORT); + script.append(" -j REDIRECT --to-ports "); + script.append(TOR_DNS_PORT); + script.append(" || exit\n"); +- +- // Allow loopback +- script.append(ipTablesPath); +- script.append(" -t filter"); +- script.append(" -A OUTPUT"); +- script.append(" -o lo"); +- script.append(" -j ACCEPT"); +- script.append(" || exit\n"); + +- // Allow everything for Tor +- script.append(ipTablesPath); +- script.append(" -t filter"); +- script.append(" -A OUTPUT"); +- script.append(" -m owner --uid-owner "); +- script.append(torUid); +- script.append(" -j ACCEPT"); +- script.append(" || exit\n"); +- +- +- /* +- //Outgoing loopback already allowed (23/7/12) +- + int[] ports = {TOR_DNS_PORT,TOR_TRANSPROXY_PORT,PORT_SOCKS,PORT_HTTP}; + + for (int port : ports) +@@ -514,8 +500,25 @@ public class TorTransProxy implements TorServiceConstants { + script.append(" -j ACCEPT"); + script.append(" || exit\n"); + +- } */ ++ } ++ ++ // Allow loopback ++ script.append(ipTablesPath); ++ script.append(" -t filter"); ++ script.append(" -A OUTPUT"); ++ script.append(" -p tcp"); ++ script.append(" -o lo"); ++ script.append(" -j ACCEPT"); ++ script.append(" || exit\n"); + ++ // Allow everything for Tor ++ script.append(ipTablesPath); ++ script.append(" -t filter"); ++ script.append(" -A OUTPUT"); ++ script.append(" -m owner --uid-owner "); ++ script.append(torUid); ++ script.append(" -j ACCEPT"); ++ script.append(" || exit\n"); + + if (TorService.ENABLE_DEBUG_LOG) + { +@@ -539,13 +542,34 @@ public class TorTransProxy implements TorServiceConstants { + script.append(" --log-uid"); + script.append(" || exit\n"); + } +- +- // Reject all other outbound packets by default ++ ++ // Reject DNS that is not from Tor (order is important - first matched rule counts!) + script.append(ipTablesPath); + script.append(" -t filter"); +- script.append(" -P OUTPUT DROP"); ++ script.append(" -A OUTPUT"); ++ script.append(" -p udp"); ++ script.append(" --dport "); ++ script.append(STANDARD_DNS_PORT); ++ script.append(" -j REJECT"); + script.append(" || exit\n"); + ++ // Reject all other outbound TCP packets ++ script.append(ipTablesPath); ++ script.append(" -t filter"); ++ script.append(" -A OUTPUT"); ++ script.append(" -p tcp"); ++ script.append(" -j REJECT"); ++ script.append(" || exit\n"); ++ ++ // Reject all other outbound UDP packets ++ script.append(ipTablesPath); ++ script.append(" -t filter"); ++ script.append(" -A OUTPUT"); ++ script.append(" -p udp"); ++ script.append(" -j REJECT"); ++ script.append(" || exit\n"); ++ ++ + String[] cmdAdd = {script.toString()}; + + code = TorServiceUtils.doShellCommand(cmdAdd, res, runRoot, waitFor); +-- +1.7.9.5 + diff --git a/external/patches/update_GibberBot_info/ic_launcher_gibberbot.png b/external/patches/update_GibberBot_info/ic_launcher_gibberbot.png new file mode 100644 index 0000000..e409910 Binary files /dev/null and b/external/patches/update_GibberBot_info/ic_launcher_gibberbot.png differ diff --git a/external/patches/update_GibberBot_info/update_GibberBot_info.diff b/external/patches/update_GibberBot_info/update_GibberBot_info.diff new file mode 100644 index 0000000..404b524 --- /dev/null +++ b/external/patches/update_GibberBot_info/update_GibberBot_info.diff @@ -0,0 +1,285 @@ +Index: res/values-ca/strings.xml +=================================================================== +--- res/values-ca/strings.xml (revision 24406) ++++ res/values-ca/strings.xml (working copy) +@@ -97,7 +97,7 @@ + + <string name="wizard_tips_tricks">Aplicacions per a usar-se amb Orbot</string> + <string name="wizard_tips_msg">T\'animem a descarregar-te & utilitza aplicacions que sàpiguen com connectar-se directament a Orbot. Fes clic als botons de sota per instal·lar.</string> +- <string name="wizard_tips_otrchat">OTRCHAT - Client de missatgeria instantània segura per a Android</string> ++ <string name="wizard_tips_otrchat">GibberBot - Client de missatgeria instantània segura per a Android</string> + <string name="wizard_tips_orweb">ORWEB (Només Android 1.x) - Navegador dissenyat per la privacitat & per a Orbot</string> + <string name="wizard_tips_proxy">Coniguració de Proxy - Aprèn a configurar aplicacions per a què funcionin amb Orbot</string> + +@@ -115,7 +115,7 @@ + <string name="wizard_final">Orbot és a punt!</string> + <string name="wizard_final_msg">Centenars de milers de persones arreu del món utilitzen Tor per un gran ventall de raons: periodistes i blocaires, treballadors pels drets humans, agents de l\'autoritat, soldats, corporacions, ciutadans de règims opressors, i ciutadans qualssevol... I ara tu també ho pots fer!</string> + +- <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string> ++ <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> + <string name="orweb_apk_url">https://guardianproject.info/getorweb</string> + +  +Index: res/drawable/icon_otrchat.png +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: res/drawable/ic_launcher_gibberbot.png +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream + +Property changes on: res/drawable/ic_launcher_gibberbot.png +___________________________________________________________________ +Added: svn:mime-type + + application/octet-stream + +Index: res/values-fa/strings.xml +=================================================================== +--- res/values-fa/strings.xml (revision 24406) ++++ res/values-fa/strings.xml (working copy) +@@ -95,7 +95,7 @@ + + <string name="wizard_tips_tricks">اپلیکیشن هایی که برای اوربات تنظیم شده اند</string> + <string name="wizard_tips_msg">توصیه می کنیم داون لود و فعال کنید؛ اپلیکیشن هایی را استفاده کنید که مستقیم به اوربات وصل می شوند. دکمه های زیر را فشار دهید تا نصب شود. </string> +- <string name="wizard_tips_otrchat">OTRCHAT - کاربر ایمن انتقال پیام فوری برای آندروید</string> ++ <string name="wizard_tips_otrchat">GibberBot - کاربر ایمن انتقال پیام فوری برای آندروید</string> + <string name="wizard_tips_orweb">ORWEB (فقط آندروید 1.x) - مرورگر طراحی شده برای حفظ حریم خصوصی و افزونساز اوربات</string> + <string name="wizard_tips_proxy">تنظیمات پروکسی - یادگیری تنظیم اپلیکیشن ها برای کار با اوربات</string> + +@@ -105,7 +105,7 @@ + <string name="wizard_final">اوربات آماده استفاده میباشد!</string> + <string name="wizard_final_msg">صدها هزار نفر در سراسر جهان به دلایل گوناگون از Tor استفاده می کنند: روزنامه نویسها و بلاگرها، کارکنان حقوق بشر، ماموران انتظامی، سربازان، شرکتها، شهروندان دولتهای سرکوبگر، و شهروندان عادی، و حالا شما نیز آماده استفاده از آن هستید!</string> + +- <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string> ++ <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> + <string name="orweb_apk_url">https://guardianproject.info/getorweb</string> + +  +Index: res/values-ru/strings.xml +=================================================================== +--- res/values-ru/strings.xml (revision 24406) ++++ res/values-ru/strings.xml (working copy) +@@ -95,7 +95,7 @@ + + <string name="wizard_tips_tricks">Orbot-задействованные приложения</string> + <string name="wizard_tips_msg">Мы советуем вам скачать и использовать приложения, которые умеют работать напрямую через Orbot. Нажмите на кнопки ниже, чтобы запустить процесс установки.</string> +- <string name="wizard_tips_otrchat">OTRCHAT - Обезопасте обмен мгновенными сообщениями для клиентов в Android</string> ++ <string name="wizard_tips_otrchat">GibberBot - Обезопасте обмен мгновенными сообщениями для клиентов в Android</string> + <string name="wizard_tips_orweb">ORWEB (Только для версии Android 1.x) - Браузер, разработанный для обеспечения безопасности и для Orbot</string> + <string name="wizard_tips_proxy">Настройки прокси - узнайте как настроить приложения для работы с Orbot</string> + +@@ -109,7 +109,7 @@ + <string name="wizard_final">Программа Orbot готова к использованию!</string> + <string name="wizard_final_msg">Сотни тысяч людей по всему миру используют Tor по различным причинам: журналисты и блоггеры, активисты организаций, выступающих в защиту прав человека, судебные исполнители, солдаты, корпорации, граждане стран с репрессивным режимом, и простые люди... а теперь готовы и вы!</string> + +- <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string> ++ <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> + <string name="orweb_apk_url">https://guardianproject.info/getorweb</string> + +  +Index: res/values-de/strings.xml +=================================================================== +--- res/values-de/strings.xml (revision 24406) ++++ res/values-de/strings.xml (working copy) +@@ -97,7 +97,7 @@ + + <string name="wizard_tips_tricks">Programme, für die Orbot aktiviert ist</string> + <string name="wizard_tips_msg">Wir raten Ihnen Programme herunterzuladen & zu nutzen, die wissen, wie sie sich direkt mit Orbot verbinden. Klicken Sie zum Installieren auf den Knopf unten.</string> +- <string name="wizard_tips_otrchat">OTRCHAT - Ein sicheres Instant-Messaging-Programm für Android</string> ++ <string name="wizard_tips_otrchat">GibberBot - Ein sicheres Instant-Messaging-Programm für Android</string> + <string name="wizard_tips_orweb">ORWEB (Nur Android 1.x) - Ein für Privatsphäre & Orbot entworfener Browser</string> + <string name="wizard_tips_proxy">Proxy-Einstellungen - Lernen Sie Anwendungen so zu konfigurieren, dass sie mit Orbot zusammenarbeiten.</string> + +@@ -115,7 +115,7 @@ + <string name="wizard_final">Orbot ist bereit!</string> + <string name="wizard_final_msg">Hunderttausende Menschen auf der ganzen Welt nutzen Tor aus einer Vielzahl von Gründen: Journalisten und Blogger, Menschenrechtsaktivisten, Strafverfolgungsbehörden, Soldaten, Unternehmen, Bürger repressiver Regime und ganz normale Menschen... und sind Sie ebenfalls bereit!</string> + +- <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string> ++ <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> + <string name="orweb_apk_url">https://guardianproject.info/getorweb</string> + +  +Index: res/values/strings.xml +=================================================================== +--- res/values/strings.xml (revision 24406) ++++ res/values/strings.xml (working copy) +@@ -94,7 +94,7 @@ + + <string name="wizard_tips_tricks">Orbot-enabled Apps</string> + <string name="wizard_tips_msg">We encourage you to download & use apps that know how to connect directly to Orbot. Click on the buttons below to install.</string> +- <string name="wizard_tips_otrchat">OTRCHAT - Secure instant messaging client for Android</string> ++ <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string> + <string name="wizard_tips_orweb">ORWEB (Android 1.x Only) - Browser designed for privacy & for Orbot</string> + <string name="wizard_tips_proxy">Proxy Settings - Learn how to configure apps to work with Orbot</string> + +@@ -108,7 +108,7 @@ + <string name="wizard_final">Orbot is ready!</string> + <string name="wizard_final_msg">Hundreds of thousands of people around the world use Tor for a wide variety of reasons: journalists and bloggers, human rights workers, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens... and now you are ready to, as well!</string> + +- <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string> ++ <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> + <string name="orweb_apk_url">https://guardianproject.info/getorweb</string> + +  +Index: res/values-ar/strings.xml +=================================================================== +--- res/values-ar/strings.xml (revision 24406) ++++ res/values-ar/strings.xml (working copy) +@@ -97,7 +97,7 @@ + + <string name="wizard_tips_tricks">تطبيقات مهيئة لأوربوت</string> + <string name="wizard_tips_msg">نشجعكم على تحميل واستخدام التطبيقات التي تعرف كيفية الاتصال مباشرة بأوربوت. اضغط على الأزرار في الأسفل للتثبيت.</string> +- <string name="wizard_tips_otrchat">OTRCHAT - عميل التراسل الفوري الآمن للأندرويد</string> ++ <string name="wizard_tips_otrchat">GibberBot - عميل التراسل الفوري الآمن للأندرويد</string> + <string name="wizard_tips_orweb">ORWEB (أندرويد 1.x فقط) - متصفح مصمّم للخصوصية لأوربوت </string> + <string name="wizard_tips_proxy">إعدادات الوكيل - تعلم كيفية تكوين التطبيقات لتعمل مع أوربوت</string> + +@@ -115,7 +115,7 @@ + <string name="wizard_final">أوربوت جاهز!</string> + <string name="wizard_final_msg">مئات الآلاف من الناس في جميع أنحاء العالم يستخدمون تور لأسباب عديدة: الصحفيين والمدونين، والعاملين في مجال حقوق الإنسان، والجنود والشركات والمواطنين من الأنظمة القمعية، والمواطنين العاديين ... والآن أنت مستعد لأن تستخدمه كذلك!</string> + +- <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string> ++ <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> + <string name="orweb_apk_url">https://guardianproject.info/getorweb</string> + +  +Index: res/values-es/strings.xml +=================================================================== +--- res/values-es/strings.xml (revision 24406) ++++ res/values-es/strings.xml (working copy) +@@ -97,7 +97,7 @@ + + <string name="wizard_tips_tricks">Aplicaciones activas en Orbot</string> + <string name="wizard_tips_msg">Le invitamos a descargar y utilizar aplicaciones que saben cómo conectarse directamente a Orbot. Haga clic en los botones a continuación para Instalar.</string> +- <string name="wizard_tips_otrchat">OTRCHAT - Cliente de mensajería instantánea seguro para Android</string> ++ <string name="wizard_tips_otrchat">GibberBot - Cliente de mensajería instantánea seguro para Android</string> + <string name="wizard_tips_orweb">ORWEB (Sólo Android 1.x) - Navegador diseñado para la privacidad y para Orbot</string> + <string name="wizard_tips_proxy">Configuraciones Proxy - Aprenda cómo configurar aplicaciones para que trabajen con Orbot</string> + +@@ -115,7 +115,7 @@ + <string name="wizard_final">¡Orbot está listo!</string> + <string name="wizard_final_msg">Cientos de miles de personas alrededor del mundo usan Tor por una amplia variedad de razones: periodistas y bloggers, trabajadores de los derechos humanos, oficiales de policía, soldados, corporaciones, ciudadanos de regímenes represivos y ciudadanos ordinarios... ¡y ahora también lo estás!</string> + +- <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string> ++ <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> + <string name="orweb_apk_url">https://guardianproject.info/getorweb</string> + +  +Index: res/values-mk/strings.xml +=================================================================== +--- res/values-mk/strings.xml (revision 24406) ++++ res/values-mk/strings.xml (working copy) +@@ -95,7 +95,7 @@ + + <string name="wizard_tips_tricks">Орбот-вклучени апликации</string> + <string name="wizard_tips_msg">Ви препорачуваме да презимате и користите апликации кои што знаат како директно да се поврзат со Орбот. Притиснете на копчињата подолу за инсталирање.</string> +- <string name="wizard_tips_otrchat">OTRCHAT - Безбеден клиент за инстант-пораки за Андроид</string> ++ <string name="wizard_tips_otrchat">GibberBot - Безбеден клиент за инстант-пораки за Андроид</string> + <string name="wizard_tips_orweb">ORWEB (само Андроид 1.x) - Браусер дизајниран за приватност и за Орбот</string> + <string name="wizard_tips_proxy">Подесувања на прокси - Научете како да ги конфигурирате апликациите да работат со Орбот</string> + +@@ -109,7 +109,7 @@ + <string name="wizard_final">Орбот е спремен!</string> + <string name="wizard_final_msg">Стотици илјади луѓе низ целиот Свет го користат Тор од многу различни причини: новинари и блогери, борци за човекови права, полицајци, војници, корпорации, граѓани на репресивни режими, и обични граѓани... а сега и Вие сте спремин да го користите!</string> + +- <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string> ++ <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> + <string name="orweb_apk_url">https://guardianproject.info/getorweb</string> + +  +Index: res/values-nl/strings.xml +=================================================================== +--- res/values-nl/strings.xml (revision 24406) ++++ res/values-nl/strings.xml (working copy) +@@ -97,7 +97,7 @@ + + <string name="wizard_tips_tricks">Orbot-beschikbare Apps</string> + <string name="wizard_tips_msg">We raden u aan om te apps te downloaden welke zich zich automatisch verbinden met Orbot. Klik op de buttons hier beneden om te installeren.</string> +- <string name="wizard_tips_otrchat">OTRCHAT - Veilige instant message programma voor Android</string> ++ <string name="wizard_tips_otrchat">GibberBot - Veilige instant message programma voor Android</string> + <string name="wizard_tips_orweb">ORWEB (Alleen Android 1.x) - Browser gemaakt voor privacy & voor Orbot</string> + <string name="wizard_tips_proxy">Proxy Instellingen - Leer hoe u uw apps kunt configureren voor Orbot</string> + +@@ -114,7 +114,7 @@ + <string name="wizard_final">Orbot is klaar!</string> + <string name="wizard_final_msg">Honderdduizenden verschillende mensen over de wereld gebruiken Tor, zoals: journalisten, bloggers, mensen rechten medewerkers, soldaten, bedrijven, burgers met onderdrukte religies, en natuurlijk normale mensen... En nu bent u ook klaar om te gaan!</string> + +- <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string> ++ <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> + <string name="orweb_apk_url">https://guardianproject.info/getorweb</string> + +  +Index: res/values-pl/strings.xml +=================================================================== +--- res/values-pl/strings.xml (revision 24406) ++++ res/values-pl/strings.xml (working copy) +@@ -95,7 +95,7 @@ + + <string name="wizard_tips_tricks">Aplikacje skonfigurowane dla Orbota</string> + <string name="wizard_tips_msg">Zachęcamy do pobierania i używania aplikacji, które wiedzą, jak łączyć się bezpośrednio z Orbotem. Kliknij na poniższe przyciski, by zainstalować.</string> +- <string name="wizard_tips_otrchat">OTRCHAT - Bezpieczny klieny rozmów dla Androida</string> ++ <string name="wizard_tips_otrchat">GibberBot - Bezpieczny klieny rozmów dla Androida</string> + <string name="wizard_tips_orweb">ORWEB (tylko Android 1.x) - Przeglądarka zaprojektowana do prywatności i dla Orbota</string> + <string name="wizard_tips_proxy">Ustawienia Proxy - NDowiedz się, jak konfiguroać aplikacje do współpracy z Orbotem</string> + +@@ -109,7 +109,7 @@ + <string name="wizard_final">Orbot jest gotowy!</string> + <string name="wizard_final_msg">Setki tysięcy ludzi na całym świecie używają Tora z różnych powodów: dziennikarze i blogerzy, działacze na rzecz praw człowieka, stróże prawa, żołnierze, korporacje, obywatele represyjnych reżimów i zwykli obywatele... teraz Ty też możesz!</string> + +- <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string> ++ <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> + <string name="orweb_apk_url">https://guardianproject.info/getorweb</string> + +  +Index: res/layout/layout_wizard_tips.xml +=================================================================== +--- res/layout/layout_wizard_tips.xml (revision 24406) ++++ res/layout/layout_wizard_tips.xml (working copy) +@@ -17,7 +17,7 @@ + + <TextView android:text="@string/wizard_tips_msg" android:layout_gravity="left" android:textColor="#ffffff" android:id="@+id/TextView01" android:layout_width="wrap_content" android:layout_height="wrap_content"></TextView> + +-<Button android:text="@string/wizard_tips_otrchat" android:layout_gravity="left" android:drawableLeft="@drawable/icon_otrchat" android:layout_marginTop="10px" android:id="@+id/WizardRootButtonInstallOtrchat" android:layout_width="wrap_content" android:layout_height="wrap_content"/> ++<Button android:text="@string/wizard_tips_otrchat" android:layout_gravity="left" android:drawableLeft="@drawable/ic_launcher_gibberbot" android:layout_marginTop="10px" android:id="@+id/WizardRootButtonInstallOtrchat" android:layout_width="wrap_content" android:layout_height="wrap_content"/> + + <Button android:text="@string/wizard_tips_orweb" android:drawableLeft="@drawable/icon_orweb" android:layout_marginTop="10px" android:id="@+id/WizardRootButtonInstallOrweb" android:layout_width="wrap_content" android:layout_height="wrap_content"/> + +Index: res/values-zh/strings.xml +=================================================================== +--- res/values-zh/strings.xml (revision 24406) ++++ res/values-zh/strings.xml (working copy) +@@ -95,7 +95,7 @@ + + <string name="wizard_tips_tricks">可用 Orbot 的应用程序</string> + <string name="wizard_tips_msg">我们建议您下载和使用能直接连接到 Orbot 的应用程序。点击以下按钮安装。</string> +- <string name="wizard_tips_otrchat">OTRCHAT - Android 上的安全即时消息客户端</string> ++ <string name="wizard_tips_otrchat">GibberBot - Android 上的安全即时消息客户端</string> + <string name="wizard_tips_orweb">ORWEB (仅 Android 1.x) - 着重隐私设计的浏览器</string> + <string name="wizard_tips_proxy">代理设置 - 学习如何配置应用程序使用 Orbot</string> + +@@ -108,7 +108,7 @@ + <string name="wizard_final">Orbot 已就绪！</string> + <string name="wizard_final_msg">数以万计的各国人们因为各种原因使用 Tor：记者、人权工作者、法律工作者、士兵、公司、迫于实际情况使用的市民，当然也有普通的市民。现在你也即将成为其中的一员！</string> + +- <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string> ++ <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> + <string name="orweb_apk_url">https://guardianproject.info/getorweb</string> + +  +Index: .classpath +=================================================================== +--- .classpath (revision 24406) ++++ .classpath (working copy) +@@ -1,9 +1,9 @@ + <?xml version="1.0" encoding="UTF-8"?> + <classpath> +- <classpathentry kind="src" path="src"/> +- <classpathentry kind="src" path="gen"/> + <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/> + <classpathentry kind="lib" path="libs/asocks.jar"/> + <classpathentry kind="lib" path="libs/jtorctrl.jar"/> ++ <classpathentry kind="src" path="src"/> ++ <classpathentry kind="src" path="gen"/> + <classpathentry kind="output" path="bin"/> + </classpath>

1 0

[orbot/master] remove old binaries
by n8fr8＠torproject.org 13 Oct '16

13 Oct '16

commit ecf90235af326897337de90f29acb9b51391a99b Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Sep 19 16:08:15 2016 -0400 remove old binaries --- .../src/main/assets/pie/armeabi/obfs4proxy.mp3 | Bin 1696016 -> 0 bytes orbotservice/src/main/assets/pie/armeabi/pdnsd.mp3 | Bin 91798 -> 0 bytes orbotservice/src/main/assets/pie/armeabi/polipo.mp3 | Bin 124034 -> 0 bytes orbotservice/src/main/assets/pie/armeabi/tor.mp3 | Bin 2024713 -> 0 bytes orbotservice/src/main/assets/pie/armeabi/xtables.mp3 | Bin 160648 -> 0 bytes orbotservice/src/main/assets/pie/x86/obfs4proxy.mp3 | Bin 2098769 -> 0 bytes orbotservice/src/main/assets/pie/x86/pdnsd.mp3 | Bin 93726 -> 0 bytes orbotservice/src/main/assets/pie/x86/polipo.mp3 | Bin 122933 -> 0 bytes orbotservice/src/main/assets/pie/x86/tor.mp3 | Bin 2044512 -> 0 bytes orbotservice/src/main/assets/pie/x86/xtables.mp3 | Bin 180332 -> 0 bytes 10 files changed, 0 insertions(+), 0 deletions(-) diff --git a/orbotservice/src/main/assets/pie/armeabi/obfs4proxy.mp3 b/orbotservice/src/main/assets/pie/armeabi/obfs4proxy.mp3 deleted file mode 100644 index 173ee5c..0000000 Binary files a/orbotservice/src/main/assets/pie/armeabi/obfs4proxy.mp3 and /dev/null differ diff --git a/orbotservice/src/main/assets/pie/armeabi/pdnsd.mp3 b/orbotservice/src/main/assets/pie/armeabi/pdnsd.mp3 deleted file mode 100644 index 7218241..0000000 Binary files a/orbotservice/src/main/assets/pie/armeabi/pdnsd.mp3 and /dev/null differ diff --git a/orbotservice/src/main/assets/pie/armeabi/polipo.mp3 b/orbotservice/src/main/assets/pie/armeabi/polipo.mp3 deleted file mode 100644 index 6170bd8..0000000 Binary files a/orbotservice/src/main/assets/pie/armeabi/polipo.mp3 and /dev/null differ diff --git a/orbotservice/src/main/assets/pie/armeabi/tor.mp3 b/orbotservice/src/main/assets/pie/armeabi/tor.mp3 deleted file mode 100644 index b6d71e2..0000000 Binary files a/orbotservice/src/main/assets/pie/armeabi/tor.mp3 and /dev/null differ diff --git a/orbotservice/src/main/assets/pie/armeabi/xtables.mp3 b/orbotservice/src/main/assets/pie/armeabi/xtables.mp3 deleted file mode 100644 index 7d0d284..0000000 Binary files a/orbotservice/src/main/assets/pie/armeabi/xtables.mp3 and /dev/null differ diff --git a/orbotservice/src/main/assets/pie/x86/obfs4proxy.mp3 b/orbotservice/src/main/assets/pie/x86/obfs4proxy.mp3 deleted file mode 100644 index c196c4a..0000000 Binary files a/orbotservice/src/main/assets/pie/x86/obfs4proxy.mp3 and /dev/null differ diff --git a/orbotservice/src/main/assets/pie/x86/pdnsd.mp3 b/orbotservice/src/main/assets/pie/x86/pdnsd.mp3 deleted file mode 100644 index ba423f3..0000000 Binary files a/orbotservice/src/main/assets/pie/x86/pdnsd.mp3 and /dev/null differ diff --git a/orbotservice/src/main/assets/pie/x86/polipo.mp3 b/orbotservice/src/main/assets/pie/x86/polipo.mp3 deleted file mode 100644 index 6eaccfa..0000000 Binary files a/orbotservice/src/main/assets/pie/x86/polipo.mp3 and /dev/null differ diff --git a/orbotservice/src/main/assets/pie/x86/tor.mp3 b/orbotservice/src/main/assets/pie/x86/tor.mp3 deleted file mode 100644 index a6762a1..0000000 Binary files a/orbotservice/src/main/assets/pie/x86/tor.mp3 and /dev/null differ diff --git a/orbotservice/src/main/assets/pie/x86/xtables.mp3 b/orbotservice/src/main/assets/pie/x86/xtables.mp3 deleted file mode 100644 index 55b3830..0000000 Binary files a/orbotservice/src/main/assets/pie/x86/xtables.mp3 and /dev/null differ

1 0

[orbot/master] we don't need a separate service for the VPN
by n8fr8＠torproject.org 13 Oct '16

13 Oct '16

commit 7c3a16f86f4915fd38cd4156e5a1ca013cb71118 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sun Sep 25 19:10:01 2016 -0400 we don't need a separate service for the VPN --- app/src/main/AndroidManifest.xml | 10 +--------- app/src/main/java/org/torproject/android/OnBootReceiver.java | 9 ++++++--- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ba3a0da..038ee1e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -120,14 +120,6 @@ <category android:name="android.intent.category.HOME" /> </intent-filter> </receiver> - -  + </application> </manifest> diff --git a/app/src/main/java/org/torproject/android/OnBootReceiver.java b/app/src/main/java/org/torproject/android/OnBootReceiver.java index c5a3ff4..7b77c0b 100644 --- a/app/src/main/java/org/torproject/android/OnBootReceiver.java +++ b/app/src/main/java/org/torproject/android/OnBootReceiver.java @@ -11,18 +11,21 @@ import org.torproject.android.service.TorServiceConstants; import org.torproject.android.vpn.VPNEnableActivity; public class OnBootReceiver extends BroadcastReceiver { - + + private static boolean sReceivedBoot = false; + @Override public void onReceive(Context context, Intent intent) { Prefs.setContext(context); - if (Prefs.startOnBoot()) + if (Prefs.startOnBoot() && (!sReceivedBoot)) { if (Prefs.useVpn()) startVpnService(context); //VPN will start Tor once it is done else startService(TorServiceConstants.ACTION_START, context); - + + sReceivedBoot = true; } }

1 0

[orbot/master] update gitignore for gradle project
by n8fr8＠torproject.org 13 Oct '16

13 Oct '16

commit 6d0fdbba1040ecc4a78fddca2455cbcf43f90948 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jun 29 10:10:14 2016 -0400 update gitignore for gradle project --- .gitignore | 57 +++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 45 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 0098ce3..c9ea2c4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,47 @@ +# auto-generated files from Android builds +build.xml +ant.properties +default.properties +proguard.cfg +proguard-project.txt +# +releases +docs +doc +.directory + +#built application files +*.apk +*.ap_ + +# files for the dex VM +*.dex + +# Java class files +*.class + +# subdirs for generated files +bin/ +gen/ + +# Local configuration file (sdk path, etc) +local.properties + +# Windows thumbnail db +Thumbs.db + +# OSX files +.DS_Store + +# Android Studio +*.iml +.idea/ +.gradle/ +build/ + +#tfx +.transifexrc + /external/appcompat/bin/ /external/appcompat/gen/ /external/bin/ @@ -14,17 +58,6 @@ native libs/jtorctl.jar local.properties builds -/patches/* +external/patches/* obj -releases -.transifexrc - -# native build products -*.so -pdnsd -*.mp3 -# ant build products -build.xml -proguard-project.txt -ant.properties \ No newline at end of file

1 0

← Newer
1
...
43
44
45
46
47
48
49
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits October 2016