April 2014 - tor-commits - lists.torproject.org

[orbot/master] only show app warning if debug is on
by n8fr8＠torproject.org 17 Apr '14

17 Apr '14

commit edd3195ec8a1a08ee58b1b7a177214a9c8462808 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Apr 17 13:39:40 2014 -0400 only show app warning if debug is on --- src/org/torproject/android/Orbot.java | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 5e68e92..601b98e 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -24,6 +24,7 @@ import android.content.ServiceConnection; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; import android.content.SharedPreferences.OnSharedPreferenceChangeListener; +import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.content.res.Configuration; @@ -282,16 +283,20 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic private void appConflictChecker () { - - String[] badApps = {"com.sec.msc.nts.android.proxy"}; - - for (String badApp : badApps) + boolean debug = mPrefs.getBoolean("pref_enable_logging",false); + + if (debug) { - if (appInstalledOrNot(badApp)) - { - showAlert(getString(R.string.title_error),"Please uninstall or disable this app if you are having problems with Orbot: " + badApp,true); - break; - } + String[] badApps = {"com.sec.msc.nts.android.proxy"}; + + for (String badApp : badApps) + { + if (appInstalledOrNot(badApp)) + { + showAlert("App Conflict","Please disable this app in Android settings if you are having problems with Orbot: " + badApp,true); + break; + } + } } } @@ -714,7 +719,8 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic boolean app_installed = false; try { - pm.getPackageInfo(uri, PackageManager.GET_ACTIVITIES); + PackageInfo pi = pm.getPackageInfo(uri, PackageManager.GET_ACTIVITIES); + app_installed = true; } catch (PackageManager.NameNotFoundException e)

1 0

[orbot/master] 13.0.6-RC-4a
by n8fr8＠torproject.org 17 Apr '14

17 Apr '14

commit a2c8e919f25a80640894301bff6f07454ed0f986 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Apr 17 13:40:33 2014 -0400 13.0.6-RC-4a --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 694ae3d..7012833 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="13.0.6-RC-4" - android:versionCode="83" + android:versionName="13.0.6-RC-4a" + android:versionCode="84" android:installLocation="auto" >

1 0

[orbot/master] limit log length for diag share
by n8fr8＠torproject.org 17 Apr '14

17 Apr '14

commit b870dd3c7da0f0396975a70835524bbe2a8540c9 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Apr 17 13:39:49 2014 -0400 limit log length for diag share --- src/org/torproject/android/OrbotDiagnosticsActivity.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/org/torproject/android/OrbotDiagnosticsActivity.java b/src/org/torproject/android/OrbotDiagnosticsActivity.java index 453c0bc..f36d4c6 100644 --- a/src/org/torproject/android/OrbotDiagnosticsActivity.java +++ b/src/org/torproject/android/OrbotDiagnosticsActivity.java @@ -33,6 +33,7 @@ public class OrbotDiagnosticsActivity extends Activity { private TextView mTextView = null; private final static String TAG = "OrbotDiag"; + private StringBuffer log = new StringBuffer(); @Override protected void onCreate(Bundle savedInstanceState) { @@ -310,6 +311,7 @@ public class OrbotDiagnosticsActivity extends Activity { { Log.d(TAG, msg); mTextView.append(msg + '\n'); + log.append(msg + '\n'); } @@ -339,9 +341,18 @@ public class OrbotDiagnosticsActivity extends Activity { private void sendLog () { + int maxLength = 5000; + + String logShare = null; + + if (log.length() > maxLength) + logShare = log.substring(0, maxLength); + else + logShare = log.toString(); + Intent sendIntent = new Intent(); sendIntent.setAction(Intent.ACTION_SEND); - sendIntent.putExtra(Intent.EXTRA_TEXT, mTextView.getText().toString()); + sendIntent.putExtra(Intent.EXTRA_TEXT, logShare); sendIntent.setType("text/plain"); startActivity(sendIntent); }

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 17 Apr '14

17 Apr '14

commit b77e103ad627403098daaa8b2f8dee7ffa09a0f8 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 17 17:15:43 2014 +0000 Update translations for tails-persistence-setup_completed --- tr/tr.po | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/tr/tr.po b/tr/tr.po index 55ca1d0..09b9ac3 100644 --- a/tr/tr.po +++ b/tr/tr.po @@ -4,15 +4,16 @@ # # Translators: # sgtpepper <barlasmirc(a)gmail.com>, 2013 +# cmldrs <cmldrs(a)yandex.com>, 2014 # Tosbaa <conan(a)operamail.com>, 2013 # volkangezer <volkangezer(a)gmail.com>, 2013-2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2013-12-19 12:20+0100\n" -"PO-Revision-Date: 2014-01-08 01:40+0000\n" -"Last-Translator: volkangezer <volkangezer(a)gmail.com>\n" +"POT-Creation-Date: 2014-04-16 21:26+0200\n" +"PO-Revision-Date: 2014-04-17 16:55+0000\n" +"Last-Translator: cmldrs <cmldrs(a)yandex.com>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/torproject/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -170,18 +171,18 @@ msgstr "%s cihazı optik." #: ../lib/Tails/Persistence/Setup.pm:415 #, perl-format -msgid "Device %s was not created using Tails USB installer." -msgstr "%s cihazı Tails USB kurucusu tarafından yaratılmamış." +msgid "Device %s was not created using Tails Installer." +msgstr "Tails Yükleyici kullanılarak %s aygıtı oluşturulamadı." #: ../lib/Tails/Persistence/Setup.pm:450 msgid "Error" msgstr "Hata" -#: ../lib/Tails/Persistence/Setup.pm:665 +#: ../lib/Tails/Persistence/Setup.pm:670 msgid "Persistence wizard - Finished" msgstr "Kalıcılık sihirbazı - Bitti" -#: ../lib/Tails/Persistence/Setup.pm:668 +#: ../lib/Tails/Persistence/Setup.pm:673 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 17 Apr '14

17 Apr '14

commit 76cc9cb11cd9d59309a4755be9e548c30e8196c5 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 17 17:15:22 2014 +0000 Update translations for tails-persistence-setup --- tr/tr.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tr/tr.po b/tr/tr.po index 48596e5..09b9ac3 100644 --- a/tr/tr.po +++ b/tr/tr.po @@ -4,6 +4,7 @@ # # Translators: # sgtpepper <barlasmirc(a)gmail.com>, 2013 +# cmldrs <cmldrs(a)yandex.com>, 2014 # Tosbaa <conan(a)operamail.com>, 2013 # volkangezer <volkangezer(a)gmail.com>, 2013-2014 msgid "" @@ -11,8 +12,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-04-16 21:26+0200\n" -"PO-Revision-Date: 2014-04-17 09:09+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-04-17 16:55+0000\n" +"Last-Translator: cmldrs <cmldrs(a)yandex.com>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/torproject/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -171,7 +172,7 @@ msgstr "%s cihazı optik." #: ../lib/Tails/Persistence/Setup.pm:415 #, perl-format msgid "Device %s was not created using Tails Installer." -msgstr "" +msgstr "Tails Yükleyici kullanılarak %s aygıtı oluşturulamadı." #: ../lib/Tails/Persistence/Setup.pm:450 msgid "Error"

1 0

[tor/master] Merge remote-tracking branch 'public/ticket11528_024'
by nickm＠torproject.org 17 Apr '14

17 Apr '14

commit eb896d5e6f09902a760af010326b79ce82492da1 Merge: 9c3f7a6 0b319de Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 17 12:17:14 2014 -0400 Merge remote-tracking branch 'public/ticket11528_024' changes/ticket11528 | 6 ++++++ src/common/tortls.c | 4 ++++ 2 files changed, 10 insertions(+)

1 0

[tor/master] Elevate server TLS cipher preferences over client
by nickm＠torproject.org 17 Apr '14

17 Apr '14

commit 0b319de60f7c80ab5c37c57af182f4f710ceb5b7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 17 10:23:18 2014 -0400 Elevate server TLS cipher preferences over client The server cipher list is (thanks to #11513) chosen systematically to put the best choices for Tor first. The client cipher list is chosen to resemble a browser. So let's set SSL_OP_CIPHER_SERVER_PREFERENCE to have the servers pick according to their own preference order. --- changes/ticket11528 | 6 ++++++ src/common/tortls.c | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/changes/ticket11528 b/changes/ticket11528 new file mode 100644 index 0000000..15daad9 --- /dev/null +++ b/changes/ticket11528 @@ -0,0 +1,6 @@ + o Minor features: + - Servers now trust themselves to have a better view than clients of + which TLS ciphersuites to choose. (Thanks to #11513, the server + list is now well-considered, whereas the client list has been + chosen mainly for anti-fingerprinting purposes.) Resolves ticket + 11528. diff --git a/src/common/tortls.c b/src/common/tortls.c index 886ee0d..8eb524e 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1261,6 +1261,10 @@ tor_tls_context_new(crypto_pk_t *identity, unsigned int key_lifetime, goto error; SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv2); + /* Prefer the server's ordering of ciphers: the client's ordering has + * historically been chosen for fingerprinting resistance. */ + SSL_CTX_set_options(result->ctx, SSL_OP_CIPHER_SERVER_PREFERENCE); + /* Disable TLS1.1 and TLS1.2 if they exist. We need to do this to * workaround a bug present in all OpenSSL 1.0.1 versions (as of 1 * June 2012), wherein renegotiating while using one of these TLS

1 0

[tor/master] Remove spurious libevent include in sandbox.c
by nickm＠torproject.org 17 Apr '14

17 Apr '14

commit 9c3f7a6d356b8ca341653f8c4a6400d940e2eace Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 17 12:13:35 2014 -0400 Remove spurious libevent include in sandbox.c --- src/common/sandbox.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 743d79d..4224e03 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -47,7 +47,6 @@ #include <sys/prctl.h> #include <linux/futex.h> #include <bits/signum.h> -#include <event2/event.h> #include <stdarg.h> #include <seccomp.h>

1 0

[orbot/master] check for evil samsung proxy app that blocks 9050
by n8fr8＠torproject.org 17 Apr '14

17 Apr '14

commit 4c0d7ada8fa332b12f5a5a5bba454b60ebbe6984 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Apr 17 10:15:15 2014 -0400 check for evil samsung proxy app that blocks 9050 --- src/org/torproject/android/Orbot.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 43a797d..5e68e92 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -98,6 +98,8 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic mTorService = new Intent(this, TorService.class); getApplication().getApplicationContext().startService(mTorService); + + appConflictChecker (); } @@ -278,6 +280,22 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic } + private void appConflictChecker () + { + + String[] badApps = {"com.sec.msc.nts.android.proxy"}; + + for (String badApp : badApps) + { + if (appInstalledOrNot(badApp)) + { + showAlert(getString(R.string.title_error),"Please uninstall or disable this app if you are having problems with Orbot: " + badApp,true); + break; + } + } + } + + private void showAbout ()

1 0

[orbot/master] updated binaries
by n8fr8＠torproject.org 17 Apr '14

17 Apr '14

commit e1ea8dbd077ccfd65b3c2f54c767bbdb226b2b90 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Apr 16 16:22:01 2014 -0400 updated binaries --- libs/jtorctl.jar | Bin 14742 -> 14742 bytes res/raw/obfsproxy.mp3 | Bin 352804 -> 352804 bytes res/raw/privoxy.mp3 | Bin 264879 -> 264879 bytes res/raw/tor.mp3 | Bin 1781998 -> 1781999 bytes res/raw/torrcdiag | 16 ++++++++++++++++ res/raw/xtables.mp3 | Bin 166343 -> 166343 bytes 6 files changed, 16 insertions(+) diff --git a/libs/jtorctl.jar b/libs/jtorctl.jar index d7d0744..cf83fcb 100755 Binary files a/libs/jtorctl.jar and b/libs/jtorctl.jar differ diff --git a/res/raw/obfsproxy.mp3 b/res/raw/obfsproxy.mp3 index 94066a6..30b1993 100644 Binary files a/res/raw/obfsproxy.mp3 and b/res/raw/obfsproxy.mp3 differ diff --git a/res/raw/privoxy.mp3 b/res/raw/privoxy.mp3 index df76219..54e5799 100644 Binary files a/res/raw/privoxy.mp3 and b/res/raw/privoxy.mp3 differ diff --git a/res/raw/tor.mp3 b/res/raw/tor.mp3 index 1f2c998..3642c7e 100644 Binary files a/res/raw/tor.mp3 and b/res/raw/tor.mp3 differ diff --git a/res/raw/torrcdiag b/res/raw/torrcdiag new file mode 100644 index 0000000..5463e29 --- /dev/null +++ b/res/raw/torrcdiag @@ -0,0 +1,16 @@ +SocksPort 9050 +SOCKSListenAddress 127.0.0.1 +SafeSocks 0 +TestSocks 1 +WarnUnsafeSocks 1 +Log debug stdout +ControlListenAddress 127.0.0.1 +ControlPort 9051 +CookieAuthentication 1 +TransPort 9040 +TransListenAddress 127.0.0.1 +DNSPort 5400 +DNSListenAddress 127.0.0.1 +AvoidDiskWrites 1 +VirtualAddrNetwork 10.192.0.0/10 +AutomapHostsOnResolve 1 \ No newline at end of file diff --git a/res/raw/xtables.mp3 b/res/raw/xtables.mp3 index ea7c233..292daf5 100644 Binary files a/res/raw/xtables.mp3 and b/res/raw/xtables.mp3 differ

1 0