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

moved bridge config out of torrc into applyPrefs()

This commit is contained in:
Nathan Freitas 2012-02-12 12:29:11 -05:00
parent bf92bd1cf3
commit 3f3e091a54
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
res/raw/torrc
View File

@ -11,4 +11,3 @@ TransListenAddress 127.0.0.1
TransPort 9040 TransPort 9040
DNSListenAddress 127.0.0.1 DNSListenAddress 127.0.0.1
DNSPort 5400 DNSPort 5400
ClientTransportPlugin obfs2 exec /data/data/org.torproject.android/app_bin/obfsproxy --managed

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

@ -1470,6 +1470,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst
} }
mBinder.updateConfiguration("ClientTransportPlugin","obfs2 exec /data/data/org.torproject.android/app_bin/obfsproxy --managed",false);
mBinder.updateConfiguration("UpdateBridgesFromAuthority", "0", false); mBinder.updateConfiguration("UpdateBridgesFromAuthority", "0", false);
} }

2
src/org/torproject/android/service/TorServiceConstants.java
View File

@ -77,7 +77,7 @@ public interface TorServiceConstants {
public static final int DISABLE_TOR_MSG = 3; public static final int DISABLE_TOR_MSG = 3;
public static final int LOG_MSG = 4; public static final int LOG_MSG = 4;
public static final String BINARY_TOR_VERSION = "0.2.3.10-openssl-1.0.0f"; public static final String BINARY_TOR_VERSION = "0.2.3.11-alpha-OBFS";
public static final String BINARY_PRIVOXY_VERSION = "1.4.13"; public static final String BINARY_PRIVOXY_VERSION = "1.4.13";
public static final String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INTALLED"; public static final String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INTALLED";
public static final String PREF_BINARY_PRIVOXY_VERSION_INSTALLED = "BINARY_PRIVOXY_VERSION_INTALLED"; public static final String PREF_BINARY_PRIVOXY_VERSION_INSTALLED = "BINARY_PRIVOXY_VERSION_INTALLED";