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

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 12 Jun '14

12 Jun '14

commit 4f9c171f40d506359de0f61ecd63cbc5c3307774 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 13 01:45:13 2014 +0000 Update translations for torcheck_completed --- es/torcheck.po | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/es/torcheck.po b/es/torcheck.po index 1859adb..1de2dc8 100644 --- a/es/torcheck.po +++ b/es/torcheck.po @@ -2,23 +2,24 @@ # Copyright (C) 2008-2013 The Tor Project, Inc # # Translators: -# alexiulacio <alexi.ulacio(a)gmail.com>, 2014 +# Alexi Ulacio <alexi.ulacio(a)gmail.com>, 2014 # her_tor_es_ar <cvmay08(a)gmail.com>, 2014 # Dani_RU <daniop10(a)hotmail.com>, 2014 +# gaspa <gaspa_92(a)hotmail.com>, 2014 # cronayu <itacronayu(a)hotmail.com>, 2012 -# Envite <envite(a)rolamasao.org>, 2013 +# Noel Torres <envite(a)rolamasao.org>, 2013 # Paidos <omar_garcia_sierra(a)hotmail.com>, 2014 # Shyish <jgongarrido(a)hotmail.com>, 2011 # strel, 2013-2014 # strel, 2012 # xocoyotzin, 2014 -# Nyek <electromigracion(a)gmail.com>, 2013 +# F Xavier Castane <electromigracion(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-05-31 12:01+0000\n" -"Last-Translator: Dani_RU <daniop10(a)hotmail.com>\n" +"PO-Revision-Date: 2014-06-13 01:30+0000\n" +"Last-Translator: gaspa <gaspa_92(a)hotmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,7 +29,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Congratulations. This browser is configured to use Tor." -msgstr "Enhorabuena. Este navegador está configurado para utilizar Tor." +msgstr "Felicitaciones. Este navegador está configurado para utilizar Tor." msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " @@ -42,7 +43,7 @@ msgstr "Hay una actualización de seguridad disponible para el Paquete de Navega msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click " "here to go to the download page</a>" -msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Click here to go to the download page</a>" +msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Haga click aqui para ir a la página de descarga</a>" msgid "Sorry. You are not using Tor." msgstr "Lo sentimos, no está usando Tor."

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 12 Jun '14

12 Jun '14

commit 3bbea5504b13ea5224d11f97124d7e55deb94f85 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 13 01:45:08 2014 +0000 Update translations for torcheck --- es/torcheck.po | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/es/torcheck.po b/es/torcheck.po index 1859adb..1de2dc8 100644 --- a/es/torcheck.po +++ b/es/torcheck.po @@ -2,23 +2,24 @@ # Copyright (C) 2008-2013 The Tor Project, Inc # # Translators: -# alexiulacio <alexi.ulacio(a)gmail.com>, 2014 +# Alexi Ulacio <alexi.ulacio(a)gmail.com>, 2014 # her_tor_es_ar <cvmay08(a)gmail.com>, 2014 # Dani_RU <daniop10(a)hotmail.com>, 2014 +# gaspa <gaspa_92(a)hotmail.com>, 2014 # cronayu <itacronayu(a)hotmail.com>, 2012 -# Envite <envite(a)rolamasao.org>, 2013 +# Noel Torres <envite(a)rolamasao.org>, 2013 # Paidos <omar_garcia_sierra(a)hotmail.com>, 2014 # Shyish <jgongarrido(a)hotmail.com>, 2011 # strel, 2013-2014 # strel, 2012 # xocoyotzin, 2014 -# Nyek <electromigracion(a)gmail.com>, 2013 +# F Xavier Castane <electromigracion(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-05-31 12:01+0000\n" -"Last-Translator: Dani_RU <daniop10(a)hotmail.com>\n" +"PO-Revision-Date: 2014-06-13 01:30+0000\n" +"Last-Translator: gaspa <gaspa_92(a)hotmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,7 +29,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Congratulations. This browser is configured to use Tor." -msgstr "Enhorabuena. Este navegador está configurado para utilizar Tor." +msgstr "Felicitaciones. Este navegador está configurado para utilizar Tor." msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " @@ -42,7 +43,7 @@ msgstr "Hay una actualización de seguridad disponible para el Paquete de Navega msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click " "here to go to the download page</a>" -msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Click here to go to the download page</a>" +msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Haga click aqui para ir a la página de descarga</a>" msgid "Sorry. You are not using Tor." msgstr "Lo sentimos, no está usando Tor."

1 0

[orbot/master] update torrc and torrcdiag when you need to
by n8fr8＠torproject.org 12 Jun '14

12 Jun '14

commit 917ec8d7a086c4ecd4edae4b6f19815c49795edb Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jun 11 22:03:57 2014 -0400 update torrc and torrcdiag when you need to --- .../torproject/android/service/TorResourceInstaller.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/org/torproject/android/service/TorResourceInstaller.java b/src/org/torproject/android/service/TorResourceInstaller.java index 414c33c..c2fcb6a 100644 --- a/src/org/torproject/android/service/TorResourceInstaller.java +++ b/src/org/torproject/android/service/TorResourceInstaller.java @@ -135,6 +135,19 @@ public class TorResourceInstaller implements TorServiceConstants { streamToFile(sbis,outFile,true,false); } + is = context.getResources().openRawResource(R.raw.torrcdiag); + outFile = new File(installFolder, TORRCDIAG_ASSET_KEY); + shell.add(new SimpleCommand(COMMAND_RM_FORCE + outFile.getAbsolutePath())).waitForFinish(); + streamToFile(is,outFile, false, false); + + if (extraLines != null && extraLines.length() > 0) + { + StringBufferInputStream sbis = new StringBufferInputStream('\n' + extraLines + '\n'); + streamToFile(sbis,outFile,true,false); + } + + shell.close(); + return true; }

1 0

[orbot/master] fix torrc defaults - add back in avoiddiskwrites
by n8fr8＠torproject.org 12 Jun '14

12 Jun '14

commit 65eb7ad24948c0c767b4e3231369c8b430be8fa0 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jun 11 22:02:32 2014 -0400 fix torrc defaults - add back in avoiddiskwrites --- res/raw/torrc | 3 ++- res/raw/torrcdiag | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/res/raw/torrc b/res/raw/torrc index 1ebabf7..e222fe7 100644 --- a/res/raw/torrc +++ b/res/raw/torrc @@ -1,4 +1,5 @@ Log notice stdout ControlPortWriteToFile /data/data/org.torproject.android/app_bin/control.txt ControlPort auto -CookieAuthentication 1 \ No newline at end of file +CookieAuthentication 1 +AvoidDiskWrites 1 \ No newline at end of file diff --git a/res/raw/torrcdiag b/res/raw/torrcdiag index df37970..c102d81 100644 --- a/res/raw/torrcdiag +++ b/res/raw/torrcdiag @@ -2,3 +2,4 @@ Log debug stdout ControlPortWriteToFile /data/data/org.torproject.android/app_bin/control.txt ControlPort auto CookieAuthentication 1 +AvoidDiskWrites 1 \ No newline at end of file

1 0

[orbot/master] clean up bind/unbind and handleIntent wizard logic
by n8fr8＠torproject.org 12 Jun '14

12 Jun '14

commit 44648f16c3177b7c149402162cf40399583f0043 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jun 11 22:04:15 2014 -0400 clean up bind/unbind and handleIntent wizard logic --- src/org/torproject/android/Orbot.java | 49 ++++++++++----------------------- 1 file changed, 14 insertions(+), 35 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index c1e755c..1f59c23 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -113,19 +113,10 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic torService = new Intent(this, TorService.class); startService(torService); - /* - if (Build.VERSION.SDK_INT > 14) - { + + bindService(torService, + mConnection, Context.BIND_AUTO_CREATE); - bindService(torService, - mConnection, Context.BIND_AUTO_CREATE|Context.BIND_IMPORTANT|Context.BIND_ABOVE_CLIENT); - } - else - { - */ - - //} - } @@ -395,7 +386,8 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic } else if (item.getItemId() == R.id.menu_wizard) { - startWizard(); + startActivity(new Intent(this, ChooseLocaleWizardActivity.class)); + } else if (item.getItemId() == R.id.menu_verify) { @@ -465,7 +457,6 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic if (aDialog != null) aDialog.dismiss(); - unbindService(mConnection); } private void doTorCheck () @@ -540,7 +531,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic } - private void handleIntents () + private synchronized void handleIntents () { if (getIntent() == null) return; @@ -646,15 +637,17 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic SharedPreferences mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); - boolean showWizard = mPrefs.getBoolean("show_wizard",true); + showWizard = mPrefs.getBoolean("show_wizard",showWizard); if (showWizard) { Editor pEdit = mPrefs.edit(); pEdit.putBoolean("show_wizard",false); pEdit.commit(); - - startWizard(); + showWizard = false; + + startActivity(new Intent(this, ChooseLocaleWizardActivity.class)); + } } @@ -664,7 +657,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic } - + private boolean showWizard = true; @Override @@ -771,19 +764,6 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic } } - /* - * Show the help view - a popup dialog - */ - private void startWizard () - { - - SharedPreferences mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); - Editor pEdit = mPrefs.edit(); - pEdit.putBoolean("wizardscreen1",true); - pEdit.commit(); - startActivity(new Intent(getApplicationContext(), ChooseLocaleWizardActivity.class)); - } - /* * Load the basic settings application to display torrc */ @@ -799,9 +779,6 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic protected void onResume() { super.onResume(); - bindService(torService, - mConnection, 0); - if (mService != null) { try { @@ -810,6 +787,8 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic mService.processSettings(); setLocale(); + + handleIntents(); } catch (RemoteException e) { // TODO Auto-generated catch block e.printStackTrace();

1 0

[orbot/master] improve logic for updating torrc files (not so often)
by n8fr8＠torproject.org 12 Jun '14

12 Jun '14

commit dee0d19fe7b8c4cf7da6066226b452cd8413d139 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jun 11 22:04:41 2014 -0400 improve logic for updating torrc files (not so often) --- src/org/torproject/android/service/TorService.java | 20 ++++++-------------- .../android/service/TorServiceUtils.java | 1 - 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index e9029c3..3de7fb3 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -557,30 +557,22 @@ public class TorService extends Service implements TorServiceConstants, TorConst TorResourceInstaller installer = new TorResourceInstaller(this, appBinHome); String extraLines = prefs.getString("pref_custom_torrc", null); + + if (extraLines != null) + { + boolean success = installer.installTorrc(extraLines); + } - boolean success = installer.installTorrc(extraLines); - success = installer.installPolipoConf(); - if (version == null || (!version.equals(BINARY_TOR_VERSION)) || (!fileTor.exists())) { logNotice("upgrading binaries to latest version: " + BINARY_TOR_VERSION); - success = installer.installResources(); + boolean success = installer.installResources(); if (success) prefs.edit().putString(PREF_BINARY_TOR_VERSION_INSTALLED,BINARY_TOR_VERSION).commit(); } - else if (!fileTorRc.exists()) - { - logNotice("upgrading binaries to latest version: " + BINARY_TOR_VERSION); - - success = installer.installResources(); - - if (success) - prefs.edit().putString(PREF_BINARY_TOR_VERSION_INSTALLED,BINARY_TOR_VERSION).commit(); - - } } diff --git a/src/org/torproject/android/service/TorServiceUtils.java b/src/org/torproject/android/service/TorServiceUtils.java index 16a9a17..af83709 100644 --- a/src/org/torproject/android/service/TorServiceUtils.java +++ b/src/org/torproject/android/service/TorServiceUtils.java @@ -112,7 +112,6 @@ public class TorServiceUtils implements TorServiceConstants { } - @TargetApi(Build.VERSION_CODES.HONEYCOMB) public static SharedPreferences getSharedPrefs (Context context) { if (Build.VERSION.SDK_INT>=Build.VERSION_CODES.HONEYCOMB)

1 0

[orbot/master] update to 14.0.3.1
by n8fr8＠torproject.org 12 Jun '14

12 Jun '14

commit 9025fc52f43b7496502c3b5e8e0dc3c8ccec04f2 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jun 11 22:04:56 2014 -0400 update to 14.0.3.1 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 368b03b..ac6c245 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.3" - android:versionCode="104" + android:versionName="14.0.3.1" + android:versionCode="105" android:installLocation="auto" >

1 0

[orbot/master] update tor binary constants to force upgrade
by n8fr8＠torproject.org 12 Jun '14

12 Jun '14

commit f91a35bbac9749e97ce2fa3f41c76f7a3a0a0c30 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jun 11 22:03:30 2014 -0400 update tor binary constants to force upgrade --- src/org/torproject/android/service/TorServiceConstants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index 58f59ab..0890f9e 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -76,7 +76,7 @@ public interface TorServiceConstants { public static final int DISABLE_TOR_MSG = 3; public static final int LOG_MSG = 4; - public static final String BINARY_TOR_VERSION = "0.2.4.22-openssl1.0.1h"; + public static final String BINARY_TOR_VERSION = "0.2.4.22-openssl1.0.1h.u2"; public static final String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INSTALLED"; //obfsproxy

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 12 Jun '14

12 Jun '14

commit f582eb13eba9a6c1832bc5b7308766aae99fefa7 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 12 11:45:12 2014 +0000 Update translations for torcheck_completed --- ko/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ko/torcheck.po b/ko/torcheck.po index 547e667..bb23bca 100644 --- a/ko/torcheck.po +++ b/ko/torcheck.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-06-12 10:21+0000\n" +"PO-Revision-Date: 2014-06-12 11:43+0000\n" "Last-Translator: letsdiet <letsdiet(a)gmail.com>\n" "Language-Team: Korean (http://www.transifex.com/projects/p/torproject/language/ko/)\n" "MIME-Version: 1.0\n"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 12 Jun '14

12 Jun '14

commit a35e808f1acf7fb6c579ab7187f07418e2cd95c5 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 12 11:45:09 2014 +0000 Update translations for torcheck --- ko/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ko/torcheck.po b/ko/torcheck.po index 547e667..bb23bca 100644 --- a/ko/torcheck.po +++ b/ko/torcheck.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-06-12 10:21+0000\n" +"PO-Revision-Date: 2014-06-12 11:43+0000\n" "Last-Translator: letsdiet <letsdiet(a)gmail.com>\n" "Language-Team: Korean (http://www.transifex.com/projects/p/torproject/language/ko/)\n" "MIME-Version: 1.0\n"

1 0