[tor-commits] [orbot/master] moved bridge config out of torrc into applyPrefs()

[n8fr8 at torproject.org]

commit 3f3e091a5455136a8698e75f3c4c1ee2b34addde
Author: Nathan Freitas <nathan at freitas.net>
Date:   Sun Feb 12 12:29:11 2012 -0500

    moved bridge config out of torrc into applyPrefs()
---
 res/raw/torrc                                      |    1 -
 src/org/torproject/android/service/TorService.java |    2 ++
 .../android/service/TorServiceConstants.java       |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/res/raw/torrc b/res/raw/torrc
index 93feb42..5366ce8 100644
--- a/res/raw/torrc
+++ b/res/raw/torrc
@@ -11,4 +11,3 @@ TransListenAddress 127.0.0.1
 TransPort 9040
 DNSListenAddress 127.0.0.1
 DNSPort 5400
-ClientTransportPlugin obfs2 exec /data/data/org.torproject.android/app_bin/obfsproxy --managed
diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java
index 80daaab..4f8ae73 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -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);
 			
 		}
diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java
index 8f8fc1b..ccc6c20 100644
--- a/src/org/torproject/android/service/TorServiceConstants.java
+++ b/src/org/torproject/android/service/TorServiceConstants.java
@@ -77,7 +77,7 @@ public interface TorServiceConstants {
     public static final int DISABLE_TOR_MSG = 3;
     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 PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INTALLED";
     public static final String PREF_BINARY_PRIVOXY_VERSION_INSTALLED = "BINARY_PRIVOXY_VERSION_INTALLED";