From 05dd3317f1d32d203949cd2b3617ac0894ef0879 Mon Sep 17 00:00:00 2001
From: Nathan Freitas <nathan@freitas.net>
Date: Mon, 11 Aug 2014 16:05:08 -0400
Subject: [PATCH 1/3] 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 319377b3..9f8affff 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 2736fbe4..46d37a13 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");
 				        

From 56dfff0971cf7a26ae363fdbdf696cfbbf0d4635 Mon Sep 17 00:00:00 2001
From: Nathan Freitas <nathan@freitas.net>
Date: Mon, 11 Aug 2014 16:22:29 -0400
Subject: [PATCH 2/3] bumped to 14.0.6

---
 AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d4b5b577..1b259672 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.torproject.android" 
-      android:versionName="14.0.5.4" 
-      android:versionCode="117"
+      android:versionName="14.0.6" 
+      android:versionCode="118"
         android:installLocation="auto"      
       >
  	    

From 7d243af276590907b4e42542e0e942f27fe96b9a Mon Sep 17 00:00:00 2001
From: Nathan Freitas <nathan@freitas.net>
Date: Mon, 11 Aug 2014 16:22:53 -0400
Subject: [PATCH 3/3] update changelog

---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 289fdd95..c48a7987 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
 NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/
 
+05dd331 update to latest jtorctl with patches for thread, error handling
+
 73d4297 bump to 14.0.5.4
 ade6172 enable transproxy refresh feature, default off
 0d42479 make expanded notif off by default; handle exceptions better - some devices seem to not like these new expanded/remoteviews no