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

[orbot/master] update to 14.0.8
by n8fr8＠torproject.org 07 Sep '14

07 Sep '14

commit 3d67ce58bb7ee1583545ab00cc7d99d59bdfec1b Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Sep 6 01:03:04 2014 -0400 update to 14.0.8 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index c98e643..a09fe5d 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.7.3" - android:versionCode="122" + android:versionName="14.0.8" + android:versionCode="123" android:installLocation="auto" >

1 0

[orbot/master] update changelog
by n8fr8＠torproject.org 07 Sep '14

07 Sep '14

commit 826b629cadd847a5f472a1af1bfde1458c91a8f3 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sun Sep 7 09:41:38 2014 -0400 update changelog --- CHANGELOG | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 12af565..0daa755 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,11 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ +b35a239 ensure all iptables rules are always wiped and reapply rules settings if modifed after settings menu accessed +313c92f add warning about restarting Orbot after settings changes +8ee5e9e more tuning of Tor service startup and status checking +9c4c349 fix for reconnecting to exiting Tor process after service restart +a0b32ba don't manually call onDestroy, just call finish() + d2c71d7 update to 14.0.7.2 6e65469 ensure settings are updated and binary paths are on service restart af433d3 remove unused variables/patterns

1 0

[orbot/master] remove duplicate service start/bind code in onResume()
by n8fr8＠torproject.org 07 Sep '14

07 Sep '14

commit c98509d8e620a371887a28ad5247c2cabd523664 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Aug 28 23:22:45 2014 -0400 remove duplicate service start/bind code in onResume() also disable startup button if service is null --- src/org/torproject/android/Orbot.java | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index e88e14d..87276ef 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -64,7 +64,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic /* Useful UI bits */ private TextView lblStatus = null; //the main text display widget private ImageProgressView imgStatus = null; //the main touchable image for activating Orbot -// private ProgressDialog progressDialog; + private MenuItem mItemOnOff = null; private TextView downloadText = null; private TextView uploadText = null; @@ -104,6 +104,8 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic private void startService () { + appendLogTextAndScroll("starting Tor background service... "); + Intent torService = new Intent(this, TorService.class); startService(torService); @@ -125,6 +127,10 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic imgStatus.setOnTouchListener(this); + imgStatus.setEnabled(false); + + lblStatus.setText("Initializing the application..."); + downloadText = (TextView)findViewById(R.id.trafficDown); uploadText = (TextView)findViewById(R.id.trafficUp); mTxtOrbotLog = (TextView)findViewById(R.id.orbotLog); @@ -802,20 +808,12 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic setLocale(); - if (mService == null) - { - startService(); - } - else + if (mService != null) { try { torStatus = mService.getStatus(); - if (torStatus != TorServiceConstants.STATUS_ON) - mService.processSettings(); - - handleIntents(); } catch (RemoteException e) { // TODO Auto-generated catch block @@ -981,7 +979,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic else { showAlert(getString(R.string.error),"Tor Service has not started yet. Please wait and try again.",false); - startService (); + } @@ -1177,15 +1175,22 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic // bindService() a million times private final ServiceConnection mConnection = new ServiceConnection() { + + public void onServiceConnected(ComponentName className, IBinder service) { + appendLogTextAndScroll("Tor background service connected."); + // This is called when the connection with the service has been // established, giving us the service object we can use to // interact with the service. We are communicating with our // service through an IDL interface, so get a client-side // representation of that from the raw service object. mService = ITorService.Stub.asInterface(service); + + + imgStatus.setEnabled(true); // We want to monitor the service for as long as we are // connected to it. @@ -1210,11 +1215,13 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic public void onServiceDisconnected(ComponentName className) { + appendLogTextAndScroll("Tor background service disconnected."); + // This is called when the connection with the service has been // unexpectedly disconnected -- that is, its process crashed. mKeepUpdating = false; mService = null; - Log.d(TAG,"service was disconnected"); + }

1 0

[translation/tails-iuk_completed] Update translations for tails-iuk_completed
by translation＠torproject.org 07 Sep '14

07 Sep '14

commit 1fdf432b5bb0af8cf06e36962edf831e7d2ee648 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 7 08:15:56 2014 +0000 Update translations for tails-iuk_completed --- tr.po | 83 ++++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 44 insertions(+), 39 deletions(-) diff --git a/tr.po b/tr.po index ce9a488..a6f052c 100644 --- a/tr.po +++ b/tr.po @@ -3,18 +3,19 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# alibildir <alibildir(a)gmail.com>, 2014 # cmldrs <cmldrs(a)yandex.com>, 2014 # ecocan <eecocan(a)yahoo.com>, 2014 -# guvenalbayrak52 <guvenalbayrak52(a)gmail.com>, 2014 -# Tim Tanurhan <timtanurhan(a)hotmail.com>, 2014 -# volkangezer <volkangezer(a)gmail.com>, 2014 +# Güven ALBAYRAK <guvenalbayrak52(a)gmail.com>, 2014 +# tim.tanurhan <timtanurhan(a)hotmail.com>, 2014 +# Volkan Gezer <volkangezer(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2014-03-05 15:11+0100\n" -"PO-Revision-Date: 2014-03-31 01:10+0000\n" -"Last-Translator: volkangezer <volkangezer(a)gmail.com>\n" +"POT-Creation-Date: 2014-08-31 15:23+0200\n" +"PO-Revision-Date: 2014-09-07 08:00+0000\n" +"Last-Translator: alibildir <alibildir(a)gmail.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" @@ -22,8 +23,8 @@ msgstr "" "Language: tr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ../lib/Tails/IUK/Frontend.pm:146 ../lib/Tails/IUK/Frontend.pm:523 -#: ../lib/Tails/IUK/Frontend.pm:667 +#: ../lib/Tails/IUK/Frontend.pm:146 ../lib/Tails/IUK/Frontend.pm:527 +#: ../lib/Tails/IUK/Frontend.pm:671 msgid "For debugging information, see /home/amnesia/.xsession-errors" msgstr "Hata ayıklama bilgileri için, see /home/amnesia/.xsession-errors" @@ -65,39 +66,43 @@ msgstr "bu sistemde yeterli hafıza mevcut değil" msgid "No explanation available for reason '%{reason}s'." msgstr "'%{reason}s' sebebi için herhangi bit açıklama yok." -#: ../lib/Tails/IUK/Frontend.pm:281 +#: ../lib/Tails/IUK/Frontend.pm:279 +msgid "XXX HEJ XXX" +msgstr "XXX HEJ XXX" + +#: ../lib/Tails/IUK/Frontend.pm:285 msgid "The system is up-to-date" msgstr "Sistem güncel" -#: ../lib/Tails/IUK/Frontend.pm:286 +#: ../lib/Tails/IUK/Frontend.pm:290 msgid "This version of Tails is outdated, and may have security issues." msgstr "Tails'in bu sürümü güncel değil ve güvenlik sorunları olabilir." -#: ../lib/Tails/IUK/Frontend.pm:318 +#: ../lib/Tails/IUK/Frontend.pm:322 #, perl-brace-format msgid "" "The available incremental upgrade requires %{space_needed}s of free space on" " Tails system partition, but only %{free_space}s is available." msgstr "Tails için gerekli %{space_needed}s boş bir alan yükseltme gerektirir, ancak %{free_space}s kullanılabilir." -#: ../lib/Tails/IUK/Frontend.pm:334 +#: ../lib/Tails/IUK/Frontend.pm:338 #, perl-brace-format msgid "" "The available incremental upgrade requires %{memory_needed}s of free memory," " but only %{free_memory}s is available." msgstr "Tails için gerekli %{memory_needed}s boş bir hafıza güncelleme için gereklidir, ancak %{free_memory}s kullanılabilir.." -#: ../lib/Tails/IUK/Frontend.pm:356 +#: ../lib/Tails/IUK/Frontend.pm:360 msgid "" "An incremental upgrade is available, but no full upgrade is.\n" "This should not happen. Please report a bug." msgstr "Eklemeli bir yükseltme kullanılabilir, ancak tam yükseltme kullanılamaz.\n\nBu olmamalıydı.Lütfen hatayı rapor edin." -#: ../lib/Tails/IUK/Frontend.pm:360 +#: ../lib/Tails/IUK/Frontend.pm:364 msgid "Error while detecting available upgrades" msgstr "Güncellemeler kontrol edilirken hata oluştu" -#: ../lib/Tails/IUK/Frontend.pm:370 +#: ../lib/Tails/IUK/Frontend.pm:374 #, perl-brace-format msgid "" "You should upgrade to %{name}s %{version}s.\n" @@ -113,19 +118,19 @@ msgid "" "Do you want to upgrade now?" msgstr "%{name}s %{version}s yükseltmeniz gerekir.\n\n\nBu sürüm hakkında daha fazla bilgi için, %{details_url}s gidin\n\nBu yükseltme anında tüm açık uygulamaları kapatmanız tavsiye edilir.\n\nYükseltmeyi indirmek birkaç dakika birkaç saat, gibi uzun bir süre alabilir.\n\nAğ, yükseltme indirildikten sonra devre dışı kalacaktır.\n\n\n İndirme boyutu: %{size}s\n\n\nŞimdi yükseltmek istiyor musunuz?" -#: ../lib/Tails/IUK/Frontend.pm:385 +#: ../lib/Tails/IUK/Frontend.pm:389 msgid "Upgrade available" msgstr "Güncelleme yapılabilir" -#: ../lib/Tails/IUK/Frontend.pm:386 +#: ../lib/Tails/IUK/Frontend.pm:390 msgid "Upgrade now" msgstr "Şimdi güncelle" -#: ../lib/Tails/IUK/Frontend.pm:387 +#: ../lib/Tails/IUK/Frontend.pm:391 msgid "Upgrade later" msgstr "Daha sonra güncelle" -#: ../lib/Tails/IUK/Frontend.pm:395 +#: ../lib/Tails/IUK/Frontend.pm:399 #, perl-brace-format msgid "" "You should do a manual upgrade to %{name}s %{version}s.\n" @@ -137,20 +142,20 @@ msgid "" "To learn how to do a manual upgrade, go to https://tails.boum.org/doc/first_steps/upgrade/#manual" msgstr "%{name}s %{version}s manuel olarak yükseltebilirsiniz.\n\n\n\nBu yeni sürümü hakkında daha fazla bilgi için şu adrese gidin %{details_url}s\n\n\n\nCihazınızı otomatik olarak bu yeni sürüme yükseltmek mümkün değildir : %{explanation}s.\n\n\n\nManual yükseltme yapmayı öğrenmek için şu adrese gidin https://tails.boum.org/doc/first_steps/upgrade/#manual" -#: ../lib/Tails/IUK/Frontend.pm:411 +#: ../lib/Tails/IUK/Frontend.pm:415 msgid "New version available" msgstr "Yeni sürüm mevcut" -#: ../lib/Tails/IUK/Frontend.pm:468 +#: ../lib/Tails/IUK/Frontend.pm:472 msgid "Downloading upgrade" msgstr "Güncelleme indiriliyor" -#: ../lib/Tails/IUK/Frontend.pm:471 +#: ../lib/Tails/IUK/Frontend.pm:475 #, perl-brace-format msgid "Downloading the upgrade to %{name}s %{version}s..." msgstr "Yükselteme indiriliyor. %{name} %{version}" -#: ../lib/Tails/IUK/Frontend.pm:512 +#: ../lib/Tails/IUK/Frontend.pm:516 msgid "" "The upgrade could not be downloaded.\\n\\nCheck your network " "connection, and restart Tails to try upgrading again.\\n\\nIf the problem " @@ -158,26 +163,26 @@ msgid "" "file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" msgstr "Yükseltme indirilemedi.\\n\\nAğ bağlantınızı denetleyin, ve Tails yükseltmeyi yeniden deneyin.\\n\\nSorun devam ederse, adrese gidin file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" -#: ../lib/Tails/IUK/Frontend.pm:528 ../lib/Tails/IUK/Frontend.pm:547 +#: ../lib/Tails/IUK/Frontend.pm:532 ../lib/Tails/IUK/Frontend.pm:551 msgid "Error while downloading the upgrade" msgstr "Güncelleme indirilirken hata" -#: ../lib/Tails/IUK/Frontend.pm:540 +#: ../lib/Tails/IUK/Frontend.pm:544 #, perl-brace-format msgid "" "Output file '%{output_file}s' does not exist, but tails-iuk-get-target-file " "did not complain. Please report a bug." msgstr "Dosya çıktısı '%{output_file}s' mevcut değil, ancak tails-iuk-get-target-file şikayet edilmedi. Lütfen hatayı rapor edin." -#: ../lib/Tails/IUK/Frontend.pm:559 +#: ../lib/Tails/IUK/Frontend.pm:563 msgid "Error while creating temporary downloading directory" msgstr "Geçiçi indirme dizini oluşturulurken bir hata oluştu." -#: ../lib/Tails/IUK/Frontend.pm:562 +#: ../lib/Tails/IUK/Frontend.pm:566 msgid "Failed to create temporary download directory" msgstr "Geçici indirme dizini oluşturulamadı" -#: ../lib/Tails/IUK/Frontend.pm:574 +#: ../lib/Tails/IUK/Frontend.pm:578 msgid "" "Your Tails device was successfully upgraded.\n" "\n" @@ -187,46 +192,46 @@ msgid "" "Do you want to restart now?" msgstr "Tails cihazınız başarıyla güncellendi.\n\n\n\nBazı güvenlik özellikleri geçici olarak devre dışı bırakıldı.\n\nYeni sürüme geçmek için Tails'i yeniden başlatmanız gerekiyor.\n\n\n\nŞimdi yeniden başlatmak istiyor musunuz?" -#: ../lib/Tails/IUK/Frontend.pm:579 +#: ../lib/Tails/IUK/Frontend.pm:583 msgid "Restart Tails" msgstr "Tails'i Yeniden Başlat" -#: ../lib/Tails/IUK/Frontend.pm:580 +#: ../lib/Tails/IUK/Frontend.pm:584 msgid "Restart now" msgstr "Şimdi yeniden başlat" -#: ../lib/Tails/IUK/Frontend.pm:581 +#: ../lib/Tails/IUK/Frontend.pm:585 msgid "Restart later" msgstr "Daha sonra yeniden başlat" -#: ../lib/Tails/IUK/Frontend.pm:592 +#: ../lib/Tails/IUK/Frontend.pm:596 msgid "Error while restarting the system" msgstr "Sistem yeniden başlatılırken hata" -#: ../lib/Tails/IUK/Frontend.pm:595 +#: ../lib/Tails/IUK/Frontend.pm:599 msgid "Failed to restart the system" msgstr "Sistem yeniden başlatılamadı" -#: ../lib/Tails/IUK/Frontend.pm:610 +#: ../lib/Tails/IUK/Frontend.pm:614 msgid "Error while shutting down the network" msgstr "Ağı kapatma sırasında hata oluştu" -#: ../lib/Tails/IUK/Frontend.pm:613 +#: ../lib/Tails/IUK/Frontend.pm:617 msgid "Failed to shutdown network" msgstr "Ağı kapatma başarısız" -#: ../lib/Tails/IUK/Frontend.pm:623 +#: ../lib/Tails/IUK/Frontend.pm:627 msgid "Upgrading the system" msgstr "Sistem yükseltiliyor" -#: ../lib/Tails/IUK/Frontend.pm:625 +#: ../lib/Tails/IUK/Frontend.pm:629 msgid "" "Your Tails device is being upgraded...\n" "\n" "For security reasons, the networking is now disabled." msgstr "Tails cihazınızda güncelleniyor...\n\nGüvenlik nedenlerinden dolayı, ağ artık devre dışıdır." -#: ../lib/Tails/IUK/Frontend.pm:662 +#: ../lib/Tails/IUK/Frontend.pm:666 msgid "" "An error occured while installing the upgrade.\\n\\nYour Tails device" " needs to be repaired and might be unable to restart.\\n\\nPlease follow the" @@ -234,6 +239,6 @@ msgid "" "file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" msgstr "Yükseltmesini yüklerken bir hata oluştu.\\n\\nSizin Tails Cihaz tamir edilmeli ve yeniden mümkün olabilir.\\n\\nLütfen adresdeki talimatları takip edin file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" -#: ../lib/Tails/IUK/Frontend.pm:672 +#: ../lib/Tails/IUK/Frontend.pm:676 msgid "Error while installing the upgrade" msgstr "Güncelleme yüklenirken hata oluştu"

1 0

[translation/tails-iuk] Update translations for tails-iuk
by translation＠torproject.org 07 Sep '14

07 Sep '14

commit 47c122b703b8eb626eeaf412b4a0a70f3973ac07 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 7 08:15:49 2014 +0000 Update translations for tails-iuk --- tr.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tr.po b/tr.po index fc527f7..a6f052c 100644 --- a/tr.po +++ b/tr.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# alibildir <alibildir(a)gmail.com>, 2014 # cmldrs <cmldrs(a)yandex.com>, 2014 # ecocan <eecocan(a)yahoo.com>, 2014 # Güven ALBAYRAK <guvenalbayrak52(a)gmail.com>, 2014 @@ -13,8 +14,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-08-31 15:23+0200\n" -"PO-Revision-Date: 2014-09-01 09:20+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-09-07 08:00+0000\n" +"Last-Translator: alibildir <alibildir(a)gmail.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" @@ -67,7 +68,7 @@ msgstr "'%{reason}s' sebebi için herhangi bit açıklama yok." #: ../lib/Tails/IUK/Frontend.pm:279 msgid "XXX HEJ XXX" -msgstr "" +msgstr "XXX HEJ XXX" #: ../lib/Tails/IUK/Frontend.pm:285 msgid "The system is up-to-date"

1 0

[translation/tails-iuk_completed] Update translations for tails-iuk_completed
by translation＠torproject.org 06 Sep '14

06 Sep '14

commit 64e24e02d0e83f4bf053350f91d50d5ffe182386 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Sep 6 18:45:52 2014 +0000 Update translations for tails-iuk_completed --- zh_CN.po | 79 +++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 42 insertions(+), 37 deletions(-) diff --git a/zh_CN.po b/zh_CN.po index ed32dbe..1988178 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -5,14 +5,15 @@ # Translators: # ihints <ihints(a)gmail.com>, 2014 # kwh <14alpaca(a)gmail.com>, 2013 -# Y.F Yang <yfdyh000(a)gmail.com>, 2013-2014 +# Wu Ming Shi, 2014 +# YF <yfdyh000(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: 2014-03-05 15:11+0100\n" -"PO-Revision-Date: 2014-03-13 06:50+0000\n" -"Last-Translator: ihints <ihints(a)gmail.com>\n" +"POT-Creation-Date: 2014-08-31 15:23+0200\n" +"PO-Revision-Date: 2014-09-06 18:40+0000\n" +"Last-Translator: Wu Ming Shi\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,8 +21,8 @@ msgstr "" "Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../lib/Tails/IUK/Frontend.pm:146 ../lib/Tails/IUK/Frontend.pm:523 -#: ../lib/Tails/IUK/Frontend.pm:667 +#: ../lib/Tails/IUK/Frontend.pm:146 ../lib/Tails/IUK/Frontend.pm:527 +#: ../lib/Tails/IUK/Frontend.pm:671 msgid "For debugging information, see /home/amnesia/.xsession-errors" msgstr "调试信息见 /home/amnesia/.xsession-errors" @@ -63,39 +64,43 @@ msgstr "在此系统上没有足够的可用内存" msgid "No explanation available for reason '%{reason}s'." msgstr "对原因 '%{reason}s' 没有可用的说明。" -#: ../lib/Tails/IUK/Frontend.pm:281 +#: ../lib/Tails/IUK/Frontend.pm:279 +msgid "XXX HEJ XXX" +msgstr "XXX HEJ XXX" + +#: ../lib/Tails/IUK/Frontend.pm:285 msgid "The system is up-to-date" msgstr "系统已是最新" -#: ../lib/Tails/IUK/Frontend.pm:286 +#: ../lib/Tails/IUK/Frontend.pm:290 msgid "This version of Tails is outdated, and may have security issues." msgstr "此版本的 Tails 已过时，可能存在安全性问题。" -#: ../lib/Tails/IUK/Frontend.pm:318 +#: ../lib/Tails/IUK/Frontend.pm:322 #, perl-brace-format msgid "" "The available incremental upgrade requires %{space_needed}s of free space on" " Tails system partition, but only %{free_space}s is available." msgstr "可用的增量升级，需要在 Tails 的系统分区有 %{space_needed}s 空闲空间，而目前仅有 %{free_space}s 可用。" -#: ../lib/Tails/IUK/Frontend.pm:334 +#: ../lib/Tails/IUK/Frontend.pm:338 #, perl-brace-format msgid "" "The available incremental upgrade requires %{memory_needed}s of free memory," " but only %{free_memory}s is available." msgstr "可用的增量升级，需要有 %{space_needed}s 空闲空间，而目前仅有 %{free_space}s 可用。" -#: ../lib/Tails/IUK/Frontend.pm:356 +#: ../lib/Tails/IUK/Frontend.pm:360 msgid "" "An incremental upgrade is available, but no full upgrade is.\n" "This should not happen. Please report a bug." msgstr "增量升级可用但是没有完整升级。\n这不应该发生，请将此事报告为bug。" -#: ../lib/Tails/IUK/Frontend.pm:360 +#: ../lib/Tails/IUK/Frontend.pm:364 msgid "Error while detecting available upgrades" msgstr "检测可用升级时出错" -#: ../lib/Tails/IUK/Frontend.pm:370 +#: ../lib/Tails/IUK/Frontend.pm:374 #, perl-brace-format msgid "" "You should upgrade to %{name}s %{version}s.\n" @@ -111,19 +116,19 @@ msgid "" "Do you want to upgrade now?" msgstr "您应该升级到 %{name}s %{version}s.\n\n查看关于新版本的更多信息，请到 %{details_url}s.\n\n建议在升级过程中关闭所有打开的程序\n下载升级可能需要用很长时间，从数分钟到数小时不等\n下载升级之后网络将被禁用\n\n下载大小: %{size}s\n\n您想现在升级么？" -#: ../lib/Tails/IUK/Frontend.pm:385 +#: ../lib/Tails/IUK/Frontend.pm:389 msgid "Upgrade available" msgstr "有升级可用" -#: ../lib/Tails/IUK/Frontend.pm:386 +#: ../lib/Tails/IUK/Frontend.pm:390 msgid "Upgrade now" msgstr "现在升级" -#: ../lib/Tails/IUK/Frontend.pm:387 +#: ../lib/Tails/IUK/Frontend.pm:391 msgid "Upgrade later" msgstr "稍后升级" -#: ../lib/Tails/IUK/Frontend.pm:395 +#: ../lib/Tails/IUK/Frontend.pm:399 #, perl-brace-format msgid "" "You should do a manual upgrade to %{name}s %{version}s.\n" @@ -135,20 +140,20 @@ msgid "" "To learn how to do a manual upgrade, go to https://tails.boum.org/doc/first_steps/upgrade/#manual" msgstr "您应该手动升级到 %{name}s %{version}s。\n\n有关此版本的更多信息请见 %{details_url}s。\n\n不能自动升级您的设备到新版本 %{explanation}s。\n\n关于如何进行手动升级，请见 https://tails.boum.org/doc/first_steps/upgrade/#manual" -#: ../lib/Tails/IUK/Frontend.pm:411 +#: ../lib/Tails/IUK/Frontend.pm:415 msgid "New version available" msgstr "新版本可用" -#: ../lib/Tails/IUK/Frontend.pm:468 +#: ../lib/Tails/IUK/Frontend.pm:472 msgid "Downloading upgrade" msgstr "正在下载升级" -#: ../lib/Tails/IUK/Frontend.pm:471 +#: ../lib/Tails/IUK/Frontend.pm:475 #, perl-brace-format msgid "Downloading the upgrade to %{name}s %{version}s..." msgstr "正在下载升级包到%{name}s %{version}s..." -#: ../lib/Tails/IUK/Frontend.pm:512 +#: ../lib/Tails/IUK/Frontend.pm:516 msgid "" "The upgrade could not be downloaded.\\n\\nCheck your network " "connection, and restart Tails to try upgrading again.\\n\\nIf the problem " @@ -156,26 +161,26 @@ msgid "" "file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" msgstr "该升级不能被下载.\\n\\n检查您的网络连接，并且重启Tails然后重新尝试升级.\\n\\n如果依旧有这个问题，请到 file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" -#: ../lib/Tails/IUK/Frontend.pm:528 ../lib/Tails/IUK/Frontend.pm:547 +#: ../lib/Tails/IUK/Frontend.pm:532 ../lib/Tails/IUK/Frontend.pm:551 msgid "Error while downloading the upgrade" msgstr "在下载升级时出现错误" -#: ../lib/Tails/IUK/Frontend.pm:540 +#: ../lib/Tails/IUK/Frontend.pm:544 #, perl-brace-format msgid "" "Output file '%{output_file}s' does not exist, but tails-iuk-get-target-file " "did not complain. Please report a bug." msgstr "输出文件'%{output_file}s'不存在，但是 tails-iuk-get-target-file 并没有察觉，请将此事报告为bug。" -#: ../lib/Tails/IUK/Frontend.pm:559 +#: ../lib/Tails/IUK/Frontend.pm:563 msgid "Error while creating temporary downloading directory" msgstr "建立临时下载目录时出错" -#: ../lib/Tails/IUK/Frontend.pm:562 +#: ../lib/Tails/IUK/Frontend.pm:566 msgid "Failed to create temporary download directory" msgstr "创建临时下载目录时错误" -#: ../lib/Tails/IUK/Frontend.pm:574 +#: ../lib/Tails/IUK/Frontend.pm:578 msgid "" "Your Tails device was successfully upgraded.\n" "\n" @@ -185,46 +190,46 @@ msgid "" "Do you want to restart now?" msgstr "您的Tails设备成功升级\n\n一些安全特性已经被临时禁用.\n您应该尽快重启到新版本\n\n您想重启么？" -#: ../lib/Tails/IUK/Frontend.pm:579 +#: ../lib/Tails/IUK/Frontend.pm:583 msgid "Restart Tails" msgstr "重启Tails" -#: ../lib/Tails/IUK/Frontend.pm:580 +#: ../lib/Tails/IUK/Frontend.pm:584 msgid "Restart now" msgstr "现在重启" -#: ../lib/Tails/IUK/Frontend.pm:581 +#: ../lib/Tails/IUK/Frontend.pm:585 msgid "Restart later" msgstr "稍后重启" -#: ../lib/Tails/IUK/Frontend.pm:592 +#: ../lib/Tails/IUK/Frontend.pm:596 msgid "Error while restarting the system" msgstr "重启系统时出现错误" -#: ../lib/Tails/IUK/Frontend.pm:595 +#: ../lib/Tails/IUK/Frontend.pm:599 msgid "Failed to restart the system" msgstr "重启系统失败" -#: ../lib/Tails/IUK/Frontend.pm:610 +#: ../lib/Tails/IUK/Frontend.pm:614 msgid "Error while shutting down the network" msgstr "关闭网络时错误" -#: ../lib/Tails/IUK/Frontend.pm:613 +#: ../lib/Tails/IUK/Frontend.pm:617 msgid "Failed to shutdown network" msgstr "关闭网络失败" -#: ../lib/Tails/IUK/Frontend.pm:623 +#: ../lib/Tails/IUK/Frontend.pm:627 msgid "Upgrading the system" msgstr "正在升级系统" -#: ../lib/Tails/IUK/Frontend.pm:625 +#: ../lib/Tails/IUK/Frontend.pm:629 msgid "" "Your Tails device is being upgraded...\n" "\n" "For security reasons, the networking is now disabled." msgstr "您的Tails已经被成功升级...\n\n为了安全原因，网络连接已经被禁用。" -#: ../lib/Tails/IUK/Frontend.pm:662 +#: ../lib/Tails/IUK/Frontend.pm:666 msgid "" "An error occured while installing the upgrade.\\n\\nYour Tails device" " needs to be repaired and might be unable to restart.\\n\\nPlease follow the" @@ -232,6 +237,6 @@ msgid "" "file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" msgstr "安装更新时出现错误\\n\\n您的Tails设备需要修复，并且可能无法重启.\\n\\n请查看以下说明：file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" -#: ../lib/Tails/IUK/Frontend.pm:672 +#: ../lib/Tails/IUK/Frontend.pm:676 msgid "Error while installing the upgrade" msgstr "安装升级时出错"

1 0

[translation/tails-iuk] Update translations for tails-iuk
by translation＠torproject.org 06 Sep '14

06 Sep '14

commit 0ac187be5a130d5590f7e4036ce08859a1a08f33 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Sep 6 18:45:46 2014 +0000 Update translations for tails-iuk --- zh_CN.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/zh_CN.po b/zh_CN.po index bb19393..1988178 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -5,14 +5,15 @@ # Translators: # ihints <ihints(a)gmail.com>, 2014 # kwh <14alpaca(a)gmail.com>, 2013 +# Wu Ming Shi, 2014 # YF <yfdyh000(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: 2014-08-31 15:23+0200\n" -"PO-Revision-Date: 2014-09-01 09:20+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-09-06 18:40+0000\n" +"Last-Translator: Wu Ming Shi\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -65,7 +66,7 @@ msgstr "对原因 '%{reason}s' 没有可用的说明。" #: ../lib/Tails/IUK/Frontend.pm:279 msgid "XXX HEJ XXX" -msgstr "" +msgstr "XXX HEJ XXX" #: ../lib/Tails/IUK/Frontend.pm:285 msgid "The system is up-to-date"

1 0

[obfs4/master] Fix spelling error in man page, no functional changes.
by yawning＠torproject.org 06 Sep '14

06 Sep '14

commit c4378cc0d3b025a67af3fa2be504bc9a2cac0bea Author: Yawning Angel <yawning(a)torproject.org> Date: Sat Sep 6 17:30:55 2014 +0000 Fix spelling error in man page, no functional changes. --- doc/obfs4proxy.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/obfs4proxy.1 b/doc/obfs4proxy.1 index 7a24ec8..bda677a 100644 --- a/doc/obfs4proxy.1 +++ b/doc/obfs4proxy.1 @@ -35,7 +35,7 @@ Disable the IP address scrubber when logging, storing personally identifiable information in the logs. .TP \fB\-\-obfs4\-distBias\fR -When generating probability distributions for the obfs4 lenght and timing +When generating probability distributions for the obfs4 length and timing obfuscation, generate biased distributions similar to ScrambleSuit. .SH ENVIORNMENT obfs4proxy honors all of the enviornment variables as specified in the Tor

1 0

[obfs4/master] Minor documentation cleanups, no functional changes.
by yawning＠torproject.org 06 Sep '14

06 Sep '14

commit 1436720b12383b353982022ae3d0ea0f5d847cc6 Author: Yawning Angel <yawning(a)torproject.org> Date: Sat Sep 6 16:47:57 2014 +0000 Minor documentation cleanups, no functional changes. --- README.md | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 4ad8b5c..fdcb34b 100644 --- a/README.md +++ b/README.md @@ -32,8 +32,8 @@ handshake variants without being obscenely slow is non-trivial. Build time library dependencies are handled by go get automatically but are listed for clarity. - * Go 1.2.0 or later. Prior versions of Go 1.0.2 are missing certain important - parts of the runtime library like a SHA256 implementation. + * Go 1.2.0 or later. Prior versions of Go (Eg: 1.0.2) are missing certain + important parts of the runtime library like a SHA256 implementation. * go.crypto (https://code.google.com/p/go.crypto) * go.net (https://code.google.com/p/go.net) * ed25519/extra25519 (https://github.com/agl/ed25519/extra25519) @@ -46,11 +46,11 @@ To build: `go get git.torproject.org/pluggable-transports/obfs4.git/obfs4proxy` To install: -Copy `$GOPATH/bin/obfs4proxy` to a permanent location (Eg: `/usr/local/sbin`) +Copy `$GOPATH/bin/obfs4proxy` to a permanent location (Eg: `/usr/local/bin`) Client side torrc configuration: ``` -ClientTransportPlugin obfs4 exec /usr/local/sbin/obfs4proxy +ClientTransportPlugin obfs4 exec /usr/local/bin/obfs4proxy ``` Bridge side torrc configuration: @@ -58,8 +58,11 @@ Bridge side torrc configuration: # Act as a bridge relay. BridgeRelay 1 +# Enable the Extended ORPort +ExtORPort auto + # Use obfs4proxy to provide the obfs4 protocol. -ServerTransportPlugin obfs4 exec /usr/local/sbin/obfs4proxy +ServerTransportPlugin obfs4 exec /usr/local/bin/obfs4proxy # (Optional) Listen on the specified address/port for obfs4 connections as # opposed to picking a port automatically. @@ -72,9 +75,9 @@ ServerTransportPlugin obfs4 exec /usr/local/sbin/obfs4proxy ports (<=1024) even when not running as root by granting the `CAP_NET_BIND_SERVICE` capability with setcap: - `# setcap 'cap_net_bind_service=+ep' /usr/local/sbin/obfs4proxy` + `# setcap 'cap_net_bind_service=+ep' /usr/local/bin/obfs4proxy` - * obfs4proxy can also act as a obfs2 and obfs3 client or server. Adjust the + * obfs4proxy can also act as an obfs2 and obfs3 client or server. Adjust the `ClientTransportPlugin` and `ServerTransportPlugin` lines in the torrc as appropriate.

1 0

[obfs4/master] Add a man page for obfs4proxy.
by yawning＠torproject.org 06 Sep '14

06 Sep '14

commit 09633500b3c875288059b9bea8ab59c1a34207c8 Author: Yawning Angel <yawning(a)torproject.org> Date: Sat Sep 6 16:40:37 2014 +0000 Add a man page for obfs4proxy. --- ChangeLog | 3 ++ doc/obfs4proxy.1 | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+) diff --git a/ChangeLog b/ChangeLog index f7f6419..6f91c92 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,2 +1,5 @@ +Changes in version 0.0.2 - UNRELEASED + - Add a man page for obfs4proxy. + Changes in version 0.0.1 - 2014-09-03 - Initial release. diff --git a/doc/obfs4proxy.1 b/doc/obfs4proxy.1 new file mode 100644 index 0000000..7a24ec8 --- /dev/null +++ b/doc/obfs4proxy.1 @@ -0,0 +1,88 @@ +.TH OBFS4PROXY 1 "2014-09-06" +.SH NAME +obfs4proxy \- pluggable transport proxy for Tor, implementing obfs4 +.SH SYNOPSIS +.B obfs4proxy +[\fIoptions\fR] +.SH DESCRIPTION +obfs4proxy is a tool that attempts to circumvent censorship by +transforming the Tor traffic between the client and the bridge. This way +censors, who usually monitor traffic between the client and the bridge, +will see innocent-looking transformed traffic instead of the actual Tor +traffic. +.PP +obfs4proxy implements the obfuscation protocols obfs2, obfs3 and obfs4. +.PP +obfs4proxy is currently only supported as a managed pluggable transport +spawned as a helper process via the \fBtor\fR daemon. +.SH OPTIONS +.TP +\fB\-h\fR, \fB\-\-help\fR +Display usage information and exit. +.TP +\fB\-\-version\fR +Display version information and exit. +.TP +\fB\-\-enableLogging\fR +Enable logging. +.TP +\fB\-\-logLevel\fR=\fIlevel\fR +Specify the maximum log severity to log out of "\fBERROR\fR", "\fBWARN\fR", and +"\fBINFO\fR". +.TP +\fB\-\-unsafeLogging\fR +Disable the IP address scrubber when logging, storing personally identifiable +information in the logs. +.TP +\fB\-\-obfs4\-distBias\fR +When generating probability distributions for the obfs4 lenght and timing +obfuscation, generate biased distributions similar to ScrambleSuit. +.SH ENVIORNMENT +obfs4proxy honors all of the enviornment variables as specified in the Tor +Pluggable Transport Specification. +.SH FILES +.PP +\fIDataDirectory\fR\fB/pt_state/obfs4proxy.log\fR +.RS 4 +The log file, assuming logging is enabled. +.RE +.PP +\fIDataDirectory\fR\fB/pt_state/obfs4_state.json\fR +.RS 4 +The Bridge (server) auto-generated obfs4 bridge parameters file. This file +will not be created if the administrator specifies them in the \fBtorrc\fR +via a \fBServerTransportOptions\fR directive. +.RE +.SH "CONFORMING TO" +Tor Pluggable Transport Specification +.SH NOTES +Using the obfs4 protocol requires tor-0.2.5.x or later. +.PP +The obfs2 protocol is included for backwards compatibility purposes only, and +should not be used in new deployments. +.SH EXAMPLE +To configure tor to be able to use obfs4 bridges (as a client), add obfs4proxy +to the \fBtorrc\fR like thus: +.PP +.nf +.RS +# Use obfs4proxy to provide the obfs4 protocol. +ClientTransportPlugin obfs4 exec /usr/bin/obfs4proxy +.RE +.fi +.PP +To configure tor to act as an obfs4 bridge (as the server), add obfs4proxy +to the \fBtorrc\fR like thus: +.PP +.nf +.RS +# +# In addition to the standard tor bridge configuration, add: +# + +# Use obfs4proxy to provide the obfs4 protocol. +ServerTransportPlugin obfs4 exec /usr/bin/obfs4proxy +.RE +.fi +.SH "SEE ALSO" +\fBtor (1), \fBtorrc (5), \fBobfsproxy (1)

1 0