August 2013 - tor-commits - lists.torproject.org

[ooni-probe/master] Cleanup after your mess
by art＠torproject.org 19 Aug '13

19 Aug '13

commit 2bb434e8193180d6ffaa601eec6ee60819774137 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Aug 15 21:12:28 2013 +0200 Cleanup after your mess --- inputs/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/inputs/Makefile b/inputs/Makefile index 015a991..ff74cf6 100644 --- a/inputs/Makefile +++ b/inputs/Makefile @@ -4,6 +4,7 @@ all: whatheaders lists lists: curl -O https://ooni.torproject.org/inputs/input-pack.tar.gz tar xzf input-pack.tar.gz + rm input-pack.tar.gz whatheaders: wget http://s3.amazonaws.com/data.whatheaders.com/whatheaders-latest.xml.zip

1 0

[ooni-probe/master] Cast factor to float.
by art＠torproject.org 19 Aug '13

19 Aug '13

commit 200610c60f3ce800158b495b05d1c195c9cf133d Author: Arturo Filastò <art(a)fuffa.org> Date: Sun Aug 18 18:54:51 2013 +0200 Cast factor to float. This was a problem in the web GUI --- data/nettests/blocking/http_requests.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/nettests/blocking/http_requests.py b/data/nettests/blocking/http_requests.py index 9208739..a9eb77c 100644 --- a/data/nettests/blocking/http_requests.py +++ b/data/nettests/blocking/http_requests.py @@ -69,8 +69,8 @@ class HTTPRequestsTest(httpt.HTTPTest): rel = 1/rel self.report['body_proportion'] = rel - self.report['factor'] = self.factor - if rel > self.factor: + self.report['factor'] = float(self.factor) + if rel > float(self.factor): log.msg("The two body lengths appear to match") log.msg("censorship is probably not happening") self.report['body_length_match'] = True

1 0

[ooni-probe/master] Fix some crucial bugs in ooni.
by art＠torproject.org 19 Aug '13

19 Aug '13

commit b4ff20a2af67ca11ede6464777885a5547a155fd Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Aug 19 17:32:21 2013 +0200 Fix some crucial bugs in ooni. * We were not properly reading the response body * We were no longer supporting Nettest.inputs API --- ooni/nettest.py | 5 ++++- ooni/utils/net.py | 6 +++--- ooni/utils/txscapy.py | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ooni/nettest.py b/ooni/nettest.py index 10eacd3..4c1c6fa 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -565,7 +565,7 @@ class NetTestCase(object): version = "0.0.0" description = "Sorry, this test has no description :(" - inputs = [None] + inputs = None inputFile = None inputFilename = None @@ -664,6 +664,9 @@ class NetTestCase(object): a generator that will yield one item from the file based on the inputProcessor. """ + if self.inputs: + return self.inputs + if self.inputFileSpecified: self.inputFilename = self.localOptions[self.inputFile[0]] return self.inputProcessor(self.inputFilename) diff --git a/ooni/utils/net.py b/ooni/utils/net.py index 67a98c2..e97d8c3 100644 --- a/ooni/utils/net.py +++ b/ooni/utils/net.py @@ -67,13 +67,13 @@ class BodyReceiver(protocol.Protocol): self.data = "" self.bytes_remaining = content_length - def dataReceived(self, bytes): + def dataReceived(self, b): + self.data += b if self.bytes_remaining: if self.bytes_remaining == 0: self.connectionLost(None) else: - self.bytes_remaining -= len(bytes) - self.data += bytes + self.bytes_remaining -= len(b) def connectionLost(self, reason): self.finished.callback(self.data) diff --git a/ooni/utils/txscapy.py b/ooni/utils/txscapy.py index aaadbe7..a5bb841 100644 --- a/ooni/utils/txscapy.py +++ b/ooni/utils/txscapy.py @@ -109,7 +109,7 @@ def hasRawSocketPermission(): try: send(IP(src="1.2.3.4", dst="127.0.0.1")) return True - except (socket.error, OSError): + except Exception: return False class ProtocolNotRegistered(Exception):

1 0

[orbot/master] change default "disable network" pref to true
by n8fr8＠torproject.org 19 Aug '13

19 Aug '13

commit 1bc97c6cc6bcfbd23e91c941a21f2aad56bbb8cf Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Aug 19 11:24:43 2013 -0400 change default "disable network" pref to true --- res/xml/preferences.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index dd0e49a..5c310c4 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -218,7 +218,7 @@ android:title="@string/pref_use_sys_iptables_title"/> <CheckBoxPreference -android:defaultValue="false" +android:defaultValue="true" android:key="pref_disable_network" android:summary="@string/pref_disable_network_summary" android:enabled="true"

1 0

[orbot/master] 12.0.3 0.2.4.16-rc
by n8fr8＠torproject.org 19 Aug '13

19 Aug '13

commit 38e2f49c9f7d86acde5231d15742dbe69ac2c2ef Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Aug 19 11:26:17 2013 -0400 12.0.3 0.2.4.16-rc --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 85370a9..5d7a573 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="12.0.2" - android:versionCode="58" + android:versionName="12.0.3" + android:versionCode="59" android:installLocation="auto" > <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>

1 0

[orbot/master] update the readme copyright
by n8fr8＠torproject.org 19 Aug '13

19 Aug '13

commit 5bcb607391e2849650c111b653dbf476bdb24d06 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Aug 19 11:18:11 2013 -0400 update the readme copyright --- README | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README b/README index f50831a..129ea42 100644 --- a/README +++ b/README @@ -22,6 +22,9 @@ Tor Frequently Asked Questions: https://www.torproject.org/faq.html.en *********************************************** - -/* Copyright (c) 2009-2012, Nathan Freitas, The Guardian Project +/* Copyright (c) 2009-2013, Nathan Freitas, The Guardian Project * https://guardianproject.info/ */ + + ***** + +

1 0

[orbot/master] update manifest to 12.0.2
by n8fr8＠torproject.org 19 Aug '13

19 Aug '13

commit a97432c6e70035359ca0c5051eb82db98c0b7a07 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Aug 19 11:20:38 2013 -0400 update manifest to 12.0.2 --- AndroidManifest.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 925b78a..85370a9 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="12.0.1" - android:versionCode="57" + android:versionName="12.0.2" + android:versionCode="58" android:installLocation="auto" - > - <uses-permission android:name="android.permission.INTERNET" /> + > <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_SUPERUSER"/>

1 0

[orbot/master] update to latest tor 0.2.4.16-rc
by n8fr8＠torproject.org 19 Aug '13

19 Aug '13

commit fb49463e10a9be52e9b21b15cff6bcd522f3a4b9 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Aug 19 11:20:32 2013 -0400 update to latest tor 0.2.4.16-rc --- external/tor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/tor b/external/tor index e7b4358..889e9bd 160000 --- a/external/tor +++ b/external/tor @@ -1 +1 @@ -Subproject commit e7b435872cce464fee8efa75cdb228f07a367c2b +Subproject commit 889e9bd5292972842eb6d02dbce2c6589dd3ccfe

1 0

[orbot/master] removed android Debug code
by n8fr8＠torproject.org 19 Aug '13

19 Aug '13

commit adc57ae29157edd8b76de5f3187c957bc41af5f8 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jul 22 15:39:16 2013 -0400 removed android Debug code --- src/org/torproject/android/service/TorService.java | 2 -- src/org/torproject/android/share/ShareService.java | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index de3fc10..ede49a0 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -644,8 +644,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst private void updateSettings () { - android.os.Debug.waitForDebugger(); - mHasRoot = mPrefs.getBoolean(PREF_HAS_ROOT,false); mEnableTransparentProxy = mPrefs.getBoolean("pref_transparent", false); mTransProxyAll = mPrefs.getBoolean("pref_transparent_all", false); diff --git a/src/org/torproject/android/share/ShareService.java b/src/org/torproject/android/share/ShareService.java index 7f25c22..163db24 100644 --- a/src/org/torproject/android/share/ShareService.java +++ b/src/org/torproject/android/share/ShareService.java @@ -46,8 +46,6 @@ public class ShareService implements Container, Runnable { public void run() { try { - // android.os.Debug.waitForDebugger(); - Path path = request.getPath(); String rPath = path.toString(); if (rPath.length() > 0)

1 0

[orbot/master] remove unneeded view and share intents
by n8fr8＠torproject.org 19 Aug '13

19 Aug '13

commit cfb047314aae265c3453b9e49b68d14fbd63a886 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Aug 19 09:33:44 2013 -0400 remove unneeded view and share intents --- AndroidManifest.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 45b45a0..925b78a 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -28,12 +28,13 @@ <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.LAUNCHER" /> </intent-filter> + <intent-filter> <action android:name="android.intent.action.VIEW" /> <category android:name="android.intent.category.DEFAULT" /> @@ -51,6 +52,7 @@ <action android:name="org.torproject.android.START_TOR" /> </intent-filter> +  </activity>

1 0