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

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

This commit is contained in:
Jordan 2014-08-13 21:31:12 -07:00
parent d02c5ea594 7d243af276
commit 3f4b76a171
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
View File

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

2
CHANGELOG
View File

@ -1,5 +1,7 @@
NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ 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 73d4297 bump to 14.0.5.4
ade6172 enable transproxy refresh feature, default off 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 0d42479 make expanded notif off by default; handle exceptions better - some devices seem to not like these new expanded/remoteviews no

2
external/jtorctl vendored

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

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

@ -1020,7 +1020,10 @@ public class TorService extends Service implements TorServiceConstants, TorConst
torConnSocket = new Socket(IP_LOCALHOST, controlPort); torConnSocket = new Socket(IP_LOCALHOST, controlPort);
torConnSocket.setSoTimeout(CONTROL_SOCKET_TIMEOUT); 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"); logNotice( "SUCCESS connected to Tor control port");