commit 05dd3317f1d32d203949cd2b3617ac0894ef0879 Author: Nathan Freitas nathan@freitas.net Date: Mon Aug 11 16:05:08 2014 -0400

update to latest jtorctl with patches for thread, error handling --- external/jtorctl | 2 +- src/org/torproject/android/service/TorService.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/external/jtorctl b/external/jtorctl index 319377b..9f8afff 160000 --- a/external/jtorctl +++ b/external/jtorctl @@ -1 +1 @@ -Subproject commit 319377b33117035155715b9207a7b41cbacef3a7 +Subproject commit 9f8affffbb03737b5606212c3ade9a1114df755f diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 2736fbe..46d37a1 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -1020,7 +1020,10 @@ public class TorService extends Service implements TorServiceConstants, TorConst torConnSocket = new Socket(IP_LOCALHOST, controlPort); torConnSocket.setSoTimeout(CONTROL_SOCKET_TIMEOUT); - conn = TorControlConnection.getConnection(torConnSocket); + boolean oo = true; + + conn = new TorControlConnection(torConnSocket); + conn.launchThread(true);//is daemon logNotice( "SUCCESS connected to Tor control port");