Merge branch 'master' of https://git.torproject.org/orbot

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"      
       >
  	    

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

external/jtorctl

@@ -1 +1 @@
-Subproject commit 319377b33117035155715b9207a7b41cbacef3a7
+Subproject commit 9f8affffbb03737b5606212c3ade9a1114df755f

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");