dan
/
tor-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of github.com:n8fr8/orbot

This commit is contained in:
Nathan Freitas 2016-03-22 16:20:26 -04:00
parent 8e7a8111a9 6e45c07c7d
commit 40233543d3
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/org/torproject/android/service/TorService.java
View File

@ -1920,7 +1920,7 @@ public class TorService extends VpnService implements TorServiceConstants, Orbot
{
//check if any PT bridges are needed
boolean obfsBridges = bridgeList.contains("obfs3")||bridgeList.contains("obfs4")||bridgeList.contains("scramblesuit")||bridgeList.contains("meek");
boolean obfsBridges = bridgeList.contains("obfs3")||bridgeList.contains("obfs4")||bridgeList.contains("scramblesuit");
if (obfsBridges)
{
@ -1929,6 +1929,12 @@ public class TorService extends VpnService implements TorServiceConstants, Orbot
extraLines.append("ClientTransportPlugin scramblesuit exec " + OrbotApp.fileObfsclient.getCanonicalPath()).append('\n');
}
boolean meekBridges = bridgeList.contains("meek");
if (meekBridges)
{
extraLines.append("ClientTransportPlugin meek_lite exec " + OrbotApp.fileObfsclient.getCanonicalPath()).append('\n');
}
String[] bridgeListLines = bridgeList.split("\\r?\\n");
for (String bridgeConfigLine : bridgeListLines)