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

[translation/gettor_completed] Update translations for gettor_completed
by translation＠torproject.org 09 Apr '13

09 Apr '13

commit 987476bcc4909440ff4b0b7443f6b3cb03281a0d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 9 21:15:13 2013 +0000 Update translations for gettor_completed --- ar/gettor.po | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ar/gettor.po b/ar/gettor.po index c8d422f..0329909 100644 --- a/ar/gettor.po +++ b/ar/gettor.po @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-04-09 20:43+0000\n" +"PO-Revision-Date: 2013-04-09 21:02+0000\n" "Last-Translator: Sherief <sheriefalaa.w(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -126,11 +126,11 @@ msgid "" " gettor+pl(a)torproject.org: Polish\n" " gettor+ru(a)torproject.org: Russian\n" " gettor+zh(a)torproject.org: Chinese" -msgstr " gettor+ar(a)torproject.org: عربي gettor+de(a)torproject.org: German\n gettor+en(a)torproject.org: English\n gettor+es(a)torproject.org: Spanish\n gettor+fa(a)torproject.org: Farsi (Iran)\n gettor+fr(a)torproject.org: French\n gettor+it(a)torproject.org: Italian\n gettor+nl(a)torproject.org: Dutch\n gettor+pl(a)torproject.org: Polish\n gettor+ru(a)torproject.org: Russian\n gettor+zh(a)torproject.org: Chinese" +msgstr "gettor+ar(a)torproject.org: العربية\ngettor+de(a)torproject.org: الألمانية\ngettor+en(a)torproject.org: الإنجليزية\ngettor+es(a)torproject.org: الإسبانية\ngettor+fa(a)torproject.org: الفارسية (إيران)\ngettor+fr(a)torproject.org: الفرنسية\ngettor+it(a)torproject.org: الإيطالية\ngettor+nl(a)torproject.org: الهولندية\ngettor+pl(a)torproject.org: البولندية\ngettor+ru(a)torproject.org: الروسية\ngettor+zh(a)torproject.org: الصينية" #: lib/gettor/i18n.py:92 msgid "If you select no language, you will receive the English version." -msgstr "إذا قمت بتحديد أي لغة ، سوف تتلقى النسخة الانكليزية." +msgstr "إذا لم تقوم بتحديد أي لغة ، سوف تتلقى النسخة الإنجليزية." #: lib/gettor/i18n.py:94 msgid "" @@ -164,11 +164,11 @@ msgstr "إرسال هذا النص في بريد إلكتروني إلى GetTor msgid "" "After having received all parts, you need to re-assemble them to \n" "one package again. This is done as follows:" -msgstr "بعد أن تحصل على جميع الأجزاء ، تحتاج إلى إعادة تجميعها إلى حزمة واحدة مرة أخرى. ويتم ذلك على النحو التالي :" +msgstr "بعد أن تتسلم جميع الأجزاء، تحتاج إلى إعادة تجميعها\nإلى حزمة واحدة مرة أخرى. ويتم ذلك على النحو التالي :" #: lib/gettor/i18n.py:113 msgid "1.) Save all received attachments into one folder on your disk." -msgstr "1) حفظ كافة المرفقات الواردة في مجلد واحد على القرص." +msgstr "1.) احفظ كافة المرفقات التي تسلمتها في مجلد واحد على القرص الصلب الخاص بك." #: lib/gettor/i18n.py:115 msgid "" @@ -195,11 +195,11 @@ msgid "" "5.) After unpacking is finished, you should find a newly created \n" "\".exe\" file in your destination folder. Simply doubleclick\n" "that and Tor Browser Bundle should start within a few seconds." -msgstr "5) بعد الانتهاء من فك الحزم،يمكنك العثور على ملف جديد\nملف \".exe\" في مجلد الوجه. إضغط مرتين\n على الملف سيبدأ متصفح تور في غضون ثوان قليلة." +msgstr "5) بعد الانتهاء من فك الحزم، يمكنك العثور على ملف جديد\nملف \".exe\" في مجلد الوجه. إضغط مرتين\n على الملف سيبدأ متصفح تور في غضون ثوان قليلة." #: lib/gettor/i18n.py:130 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!" -msgstr "6.) هذا كل شيء. تقوم به. شكرا لاستخدام تور وتمتع به!" +msgstr "6.) هذا كل شيء. شكرا لاستخدام تور و تمتع به!" #: lib/gettor/i18n.py:132 msgid ""

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 09 Apr '13

09 Apr '13

commit c6100cfea6e01c31b6d02febf4f02f7aebbfc91b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 9 21:15:09 2013 +0000 Update translations for gettor --- ar/gettor.po | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ar/gettor.po b/ar/gettor.po index c8d422f..0329909 100644 --- a/ar/gettor.po +++ b/ar/gettor.po @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-04-09 20:43+0000\n" +"PO-Revision-Date: 2013-04-09 21:02+0000\n" "Last-Translator: Sherief <sheriefalaa.w(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -126,11 +126,11 @@ msgid "" " gettor+pl(a)torproject.org: Polish\n" " gettor+ru(a)torproject.org: Russian\n" " gettor+zh(a)torproject.org: Chinese" -msgstr " gettor+ar(a)torproject.org: عربي gettor+de(a)torproject.org: German\n gettor+en(a)torproject.org: English\n gettor+es(a)torproject.org: Spanish\n gettor+fa(a)torproject.org: Farsi (Iran)\n gettor+fr(a)torproject.org: French\n gettor+it(a)torproject.org: Italian\n gettor+nl(a)torproject.org: Dutch\n gettor+pl(a)torproject.org: Polish\n gettor+ru(a)torproject.org: Russian\n gettor+zh(a)torproject.org: Chinese" +msgstr "gettor+ar(a)torproject.org: العربية\ngettor+de(a)torproject.org: الألمانية\ngettor+en(a)torproject.org: الإنجليزية\ngettor+es(a)torproject.org: الإسبانية\ngettor+fa(a)torproject.org: الفارسية (إيران)\ngettor+fr(a)torproject.org: الفرنسية\ngettor+it(a)torproject.org: الإيطالية\ngettor+nl(a)torproject.org: الهولندية\ngettor+pl(a)torproject.org: البولندية\ngettor+ru(a)torproject.org: الروسية\ngettor+zh(a)torproject.org: الصينية" #: lib/gettor/i18n.py:92 msgid "If you select no language, you will receive the English version." -msgstr "إذا قمت بتحديد أي لغة ، سوف تتلقى النسخة الانكليزية." +msgstr "إذا لم تقوم بتحديد أي لغة ، سوف تتلقى النسخة الإنجليزية." #: lib/gettor/i18n.py:94 msgid "" @@ -164,11 +164,11 @@ msgstr "إرسال هذا النص في بريد إلكتروني إلى GetTor msgid "" "After having received all parts, you need to re-assemble them to \n" "one package again. This is done as follows:" -msgstr "بعد أن تحصل على جميع الأجزاء ، تحتاج إلى إعادة تجميعها إلى حزمة واحدة مرة أخرى. ويتم ذلك على النحو التالي :" +msgstr "بعد أن تتسلم جميع الأجزاء، تحتاج إلى إعادة تجميعها\nإلى حزمة واحدة مرة أخرى. ويتم ذلك على النحو التالي :" #: lib/gettor/i18n.py:113 msgid "1.) Save all received attachments into one folder on your disk." -msgstr "1) حفظ كافة المرفقات الواردة في مجلد واحد على القرص." +msgstr "1.) احفظ كافة المرفقات التي تسلمتها في مجلد واحد على القرص الصلب الخاص بك." #: lib/gettor/i18n.py:115 msgid "" @@ -195,11 +195,11 @@ msgid "" "5.) After unpacking is finished, you should find a newly created \n" "\".exe\" file in your destination folder. Simply doubleclick\n" "that and Tor Browser Bundle should start within a few seconds." -msgstr "5) بعد الانتهاء من فك الحزم،يمكنك العثور على ملف جديد\nملف \".exe\" في مجلد الوجه. إضغط مرتين\n على الملف سيبدأ متصفح تور في غضون ثوان قليلة." +msgstr "5) بعد الانتهاء من فك الحزم، يمكنك العثور على ملف جديد\nملف \".exe\" في مجلد الوجه. إضغط مرتين\n على الملف سيبدأ متصفح تور في غضون ثوان قليلة." #: lib/gettor/i18n.py:130 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!" -msgstr "6.) هذا كل شيء. تقوم به. شكرا لاستخدام تور وتمتع به!" +msgstr "6.) هذا كل شيء. شكرا لاستخدام تور و تمتع به!" #: lib/gettor/i18n.py:132 msgid ""

1 0

[translation/gettor_completed] Update translations for gettor_completed
by translation＠torproject.org 09 Apr '13

09 Apr '13

commit d1a69bfcb59b0d550e202aee2b62c1dcc28987b0 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 9 20:45:09 2013 +0000 Update translations for gettor_completed --- ar/gettor.po | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ar/gettor.po b/ar/gettor.po index be01e54..c8d422f 100644 --- a/ar/gettor.po +++ b/ar/gettor.po @@ -10,13 +10,14 @@ # mohammad Alhargan <malham1(a)gmail.com>, 2011. # Mohammed Al-Doub <voulnet(a)gmail.com>, 2012. # Mohammed ALDOUB <voulnet(a)gmail.com>, 2013. +# Sherief Alaa <sheriefalaa.w(a)gmail.com>, 2013. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-01-19 17:11+0000\n" -"Last-Translator: Mohammed ALDOUB <voulnet(a)gmail.com>\n" +"PO-Revision-Date: 2013-04-09 20:43+0000\n" +"Last-Translator: Sherief <sheriefalaa.w(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -44,14 +45,14 @@ msgid "" "We only process requests from email services that support \"DKIM\",\n" "which is an email feature that lets us verify that the address in the\n" "\"From\" line is actually the one who sent the mail." -msgstr "نحن فقط نقبل الطلبات خدمات البريد الإلكتروني التي تدعم \"DKIM\"\n ، وهي ميزة البريد الإلكتروني الذي يتيح لنا التحقق من أن العنوان في التبويب\n\"من\" هو في الواقع الذي أرسل البريد." +msgstr "نحن فقط نقبل الطلبات خدمات البريد الإلكتروني التي تدعم \"DKIM\"،\nوهي عبارة عن ميزة في البريد الإلكتروني تتيح لنا التأكد من ان عنوان البريد المرسل لنا\nهو فعلاً عنوان البريد الموجود في سطر \"مرسل من\" " #: lib/gettor/i18n.py:39 msgid "" "(We apologize if you didn't ask for this mail. Since your email is from\n" "a service that doesn't use DKIM, we're sending a short explanation,\n" "and then we'll ignore this email address for the next day or so.)" -msgstr "(نعتذر إذا لم يكن هناك أي طلب على هذا البريد. إذا كان البريد الإلكتروني الخاص بك لا يستخدم\n DKIM ، سنرسل شرحا موجزا،\nومن ثم سنقوم بتجاهل عنوان البريد الإلكتروني لليوم التالي أو نحو ذلك .)" +msgstr "(نعتذر إذا لم تطلب هذا البريد. حيث ان مزود خدمة بريدك الإلكتروني الخاص بك لا يستخدم\n DKIM ، نحن نرسل لك شرحا موجزا،\nوبعد ذلك سوف نتجاهل عنوان بريدك الإلكتروني لليوم التالي أو نحو ذلك .)" #: lib/gettor/i18n.py:43 lib/gettor/i18n.py:135 msgid ""

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 09 Apr '13

09 Apr '13

commit 0572d8c68f7887c7a108ef52099e32c83a533af2 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 9 20:45:06 2013 +0000 Update translations for gettor --- ar/gettor.po | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ar/gettor.po b/ar/gettor.po index be01e54..c8d422f 100644 --- a/ar/gettor.po +++ b/ar/gettor.po @@ -10,13 +10,14 @@ # mohammad Alhargan <malham1(a)gmail.com>, 2011. # Mohammed Al-Doub <voulnet(a)gmail.com>, 2012. # Mohammed ALDOUB <voulnet(a)gmail.com>, 2013. +# Sherief Alaa <sheriefalaa.w(a)gmail.com>, 2013. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-01-19 17:11+0000\n" -"Last-Translator: Mohammed ALDOUB <voulnet(a)gmail.com>\n" +"PO-Revision-Date: 2013-04-09 20:43+0000\n" +"Last-Translator: Sherief <sheriefalaa.w(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -44,14 +45,14 @@ msgid "" "We only process requests from email services that support \"DKIM\",\n" "which is an email feature that lets us verify that the address in the\n" "\"From\" line is actually the one who sent the mail." -msgstr "نحن فقط نقبل الطلبات خدمات البريد الإلكتروني التي تدعم \"DKIM\"\n ، وهي ميزة البريد الإلكتروني الذي يتيح لنا التحقق من أن العنوان في التبويب\n\"من\" هو في الواقع الذي أرسل البريد." +msgstr "نحن فقط نقبل الطلبات خدمات البريد الإلكتروني التي تدعم \"DKIM\"،\nوهي عبارة عن ميزة في البريد الإلكتروني تتيح لنا التأكد من ان عنوان البريد المرسل لنا\nهو فعلاً عنوان البريد الموجود في سطر \"مرسل من\" " #: lib/gettor/i18n.py:39 msgid "" "(We apologize if you didn't ask for this mail. Since your email is from\n" "a service that doesn't use DKIM, we're sending a short explanation,\n" "and then we'll ignore this email address for the next day or so.)" -msgstr "(نعتذر إذا لم يكن هناك أي طلب على هذا البريد. إذا كان البريد الإلكتروني الخاص بك لا يستخدم\n DKIM ، سنرسل شرحا موجزا،\nومن ثم سنقوم بتجاهل عنوان البريد الإلكتروني لليوم التالي أو نحو ذلك .)" +msgstr "(نعتذر إذا لم تطلب هذا البريد. حيث ان مزود خدمة بريدك الإلكتروني الخاص بك لا يستخدم\n DKIM ، نحن نرسل لك شرحا موجزا،\nوبعد ذلك سوف نتجاهل عنوان بريدك الإلكتروني لليوم التالي أو نحو ذلك .)" #: lib/gettor/i18n.py:43 lib/gettor/i18n.py:135 msgid ""

1 0

[tor-launcher/master] Increase width of progress dialog.
by brade＠torproject.org 09 Apr '13

09 Apr '13

commit fd48e23cd8c4d9a9261336e610f5913b02f8e370 Author: Kathy Brade <brade(a)torproject.org> Date: Tue Apr 9 13:50:45 2013 -0400 Increase width of progress dialog. --- src/chrome/skin/progress.css | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/chrome/skin/progress.css b/src/chrome/skin/progress.css index e0111f0..c3ca079 100644 --- a/src/chrome/skin/progress.css +++ b/src/chrome/skin/progress.css @@ -6,7 +6,7 @@ */ dialog { - width: 320px; + width: 370px; } #progressHeading {

1 0

[tor-launcher/master] Add TODO comment r.e. error alert width problem.
by brade＠torproject.org 09 Apr '13

09 Apr '13

commit 5c86998829dde659274df9cdf03b7b7dc9050350 Author: Kathy Brade <brade(a)torproject.org> Date: Tue Apr 9 13:51:14 2013 -0400 Add TODO comment r.e. error alert width problem. --- src/modules/tl-util.jsm | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index e6ed617..8809ee4 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -29,6 +29,7 @@ let TorLauncherUtil = // Public // Error Reporting / Prompting showAlert: function(aParentWindow, aMsg) { + // TODO: alert() does not always resize correctly to fit the message. try { if (!aParentWindow)

1 0

[tor-launcher/master] Rename torcontroller.properties to torlauncher.properties.
by brade＠torproject.org 09 Apr '13

09 Apr '13

commit 1702921184a9f1857f2c679a5a384ae0d96e4ad9 Author: Kathy Brade <brade(a)torproject.org> Date: Tue Apr 9 13:24:51 2013 -0400 Rename torcontroller.properties to torlauncher.properties. --- src/chrome/locale/en/torcontroller.properties | 26 ------------------------- src/chrome/locale/en/torlauncher.properties | 26 +++++++++++++++++++++++++ src/modules/tl-util.jsm | 2 +- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/chrome/locale/en/torcontroller.properties b/src/chrome/locale/en/torcontroller.properties deleted file mode 100644 index 9331ecf..0000000 --- a/src/chrome/locale/en/torcontroller.properties +++ /dev/null @@ -1,26 +0,0 @@ -### Copyright (c) 2013, The Tor Project, Inc. -### See LICENSE for licensing information. - -torlauncher.error_title=Tor Launcher - -torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.tor_failed_to_start=Tor failed to start. -torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.\n\n%S - -torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S -torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. -torlauncher.password_hash_missing=Failed to get hashed password. - -torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S -torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S -torlauncher.ensure_tor_is_running=Please ensure that Tor is running. - -torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. -torlauncher.error_proxy_type_missing=You must select the proxy type. -torlauncher.error_bridges_missing=You must specify one or more bridges. - -torlauncher.connect=Connect -torlauncher.quit=Quit -torlauncher.quit_win=Exit diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties new file mode 100644 index 0000000..9331ecf --- /dev/null +++ b/src/chrome/locale/en/torlauncher.properties @@ -0,0 +1,26 @@ +### Copyright (c) 2013, The Tor Project, Inc. +### See LICENSE for licensing information. + +torlauncher.error_title=Tor Launcher + +torlauncher.tor_exited=Tor unexpectedly exited. +torlauncher.tor_failed_to_start=Tor failed to start. +torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.\n\n%S + +torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S +torlauncher.tor_missing=The Tor executable is missing. +torlauncher.torrc_missing=The torrc file is missing. +torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.password_hash_missing=Failed to get hashed password. + +torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S +torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S +torlauncher.ensure_tor_is_running=Please ensure that Tor is running. + +torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. +torlauncher.error_proxy_type_missing=You must select the proxy type. +torlauncher.error_bridges_missing=You must specify one or more bridges. + +torlauncher.connect=Connect +torlauncher.quit=Quit +torlauncher.quit_win=Exit diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index 5f85815..e6ed617 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -11,7 +11,7 @@ let EXPORTED_SYMBOLS = [ "TorLauncherUtil" ]; const Cc = Components.classes; const Ci = Components.interfaces; -const kPropBundleURI = "chrome://torlauncher/locale/torcontroller.properties"; +const kPropBundleURI = "chrome://torlauncher/locale/torlauncher.properties"; const kPropNamePrefix = "torlauncher."; let TorLauncherUtil = // Public

1 0

[tor-launcher/master] Surround plaintext (non-hex) passwords with double quotes.
by brade＠torproject.org 09 Apr '13

09 Apr '13

commit 30df488037d3c8945ff17b95df5d24625a9467c3 Author: Kathy Brade <brade(a)torproject.org> Date: Tue Apr 9 13:20:33 2013 -0400 Surround plaintext (non-hex) passwords with double quotes. --- src/components/tl-protocol.js | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index f589472..f760e63 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -423,8 +423,15 @@ TorProtocolService.prototype = inStream: inputStream, outStream: outputStream }; // AUTHENTICATE - var reply = this._sendCommand(conn, "AUTHENTICATE", - this._strEscape(this.mControlPassword)); + var pwdArg = this._strEscape(this.mControlPassword); + if (pwdArg && (pwdArg.length > 0) && (pwdArg.charAt(0) != '"')) + { + // Surround non-hex strings with double quotes. + const kIsHexRE = /^[A-Fa-f0-9]*$/; + if (!kIsHexRE.test(pwdArg)) + pwdArg = '"' + pwdArg + '"'; + } + var reply = this._sendCommand(conn, "AUTHENTICATE", pwdArg); if (!this.TorCommandSucceeded(reply)) { TorLauncherLogger.log(4, "authenticate failed");

1 0

[tor-launcher/master] Added hidden pref. to control whether Tor Launcher starts the tor process.
by brade＠torproject.org 09 Apr '13

09 Apr '13

commit 3daaee7e03793efeaf3775d7f6bbb7128758db3c Author: Kathy Brade <brade(a)torproject.org> Date: Tue Apr 9 13:01:54 2013 -0400 Added hidden pref. to control whether Tor Launcher starts the tor process. --- src/chrome/content/network-settings.js | 4 +--- src/components/tl-process.js | 24 ++++++++++++++++++------ src/components/tl-protocol.js | 21 +++++++++++++-------- src/defaults/preferences/prefs.js | 1 + 4 files changed, 33 insertions(+), 17 deletions(-) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 98d4ed7..a2f57ad 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -15,8 +15,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherUtil", XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherLogger", "resource://torlauncher/modules/tl-logger.jsm"); -const kPrefPromptAtStartup = "extensions.torlauncher.prompt_at_startup"; - const kUseProxyCheckbox = "useProxy"; const kProxyTypeMenulist = "proxyType"; const kProxyAddr = "proxyAddr"; @@ -48,7 +46,7 @@ var gIsBootstrapComplete = false; function initDialog() { var okBtn = document.documentElement.getButton("accept"); - gIsInitialBootstrap = TorLauncherUtil.getBoolPref(kPrefPromptAtStartup); + gIsInitialBootstrap = window.arguments[0]; if (gIsInitialBootstrap) { document.documentElement.setAttribute("class", "initialBootstrap"); diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 4067232..4d77d21 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -30,6 +30,7 @@ TorProcessService.prototype = kServiceName : "Tor Launcher Process Service", kClassID: Components.ID("{FE7B4CAF-BCF4-4848-8BFF-EFA66C9AFDA1}"), + kPrefStartTor: "extensions.torlauncher.start_tor", kPrefPromptAtStartup: "extensions.torlauncher.prompt_at_startup", kInitialMonitorDelayMS: 1000, // TODO: how can we avoid this delay? kMonitorDelayMS: 200, @@ -76,7 +77,9 @@ TorProcessService.prototype = this.mObsSvc.addObserver(this, "quit-application-granted", false); this.mObsSvc.addObserver(this, kOpenNetworkSettingsTopic, false); this.mObsSvc.addObserver(this, kUserQuitTopic, false); - this._startTor(); + + if (TorLauncherUtil.getBoolPref(this.kPrefStartTor)) + this._startTor(); } else if ("quit-application-granted" == aTopic) { @@ -118,7 +121,7 @@ TorProcessService.prototype = this.mTimer.init(this, this.kMonitorDelayMS, this.mTimer.TYPE_ONE_SHOT); } else if (kOpenNetworkSettingsTopic == aTopic) - this._openNetworkSettings(); + this._openNetworkSettings(false); else if (kUserQuitTopic == aTopic) this.mQuitSoon = true; }, @@ -267,7 +270,7 @@ TorProcessService.prototype = // to delay before retry inside TorSendCommand()... which is // difficult b/c that is a synchronous API. if (this.mProtocolSvc) - this._openNetworkSettings(); // Blocks until dialog is closed. + this._openNetworkSettings(true); // Blocks until dialog is closed. } else { @@ -332,13 +335,22 @@ TorProcessService.prototype = }, // _checkBootstrapStatus() // Blocks until network settings dialog is closed. - _openNetworkSettings: function() + _openNetworkSettings: function(aIsInitialBootstrap) { - var chromeURL = "chrome://torlauncher/content/network-settings.xul"; + const kChromeURL = "chrome://torlauncher/content/network-settings.xul"; + var wwSvc = Cc["@mozilla.org/embedcomp/window-watcher;1"] .getService(Ci.nsIWindowWatcher); var winFeatures = "chrome,dialog=yes,modal,all"; - wwSvc.openWindow(null, chromeURL, "_blank", winFeatures, null); + + var argsArray = Cc["@mozilla.org/array;1"] + .createInstance(Ci.nsIMutableArray); + var variant = Cc["@mozilla.org/variant;1"] + .createInstance(Ci.nsIWritableVariant); + variant.setFromVariant(aIsInitialBootstrap); + argsArray.appendElement(variant, false); + + wwSvc.openWindow(null, kChromeURL, "_blank", winFeatures, argsArray); }, _openProgressDialog: function() diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index 26cd983..f589472 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -71,6 +71,8 @@ TorProtocolService.prototype = kServiceName : "Tor Launcher Protocol Service", kClassID: Components.ID("{4F476361-23FB-43EF-A427-B36A14D3208E}"), + kPrefStartTor: "extensions.torlauncher.start_tor", + // nsISupports implementation. QueryInterface: function(aIID) { @@ -429,16 +431,19 @@ TorProtocolService.prototype = return null; } - // Try to become the primary controller (TAKEOWNERSHIP). - reply = this._sendCommand(conn, "TAKEOWNERSHIP", null); - if (!this.TorCommandSucceeded(reply)) - TorLauncherLogger.log(4, "take ownership failed"); - else + if (TorLauncherUtil.getBoolPref(this.kPrefStartTor)) { - reply = this._sendCommand(conn, "RESETCONF", - "__OwningControllerProcess"); + // Try to become the primary controller (TAKEOWNERSHIP). + reply = this._sendCommand(conn, "TAKEOWNERSHIP", null); if (!this.TorCommandSucceeded(reply)) - TorLauncherLogger.log(4, "clear owning controller process failed"); + TorLauncherLogger.log(4, "take ownership failed"); + else + { + reply = this._sendCommand(conn, "RESETCONF", + "__OwningControllerProcess"); + if (!this.TorCommandSucceeded(reply)) + TorLauncherLogger.log(4, "clear owning controller process failed"); + } } } catch(e) diff --git a/src/defaults/preferences/prefs.js b/src/defaults/preferences/prefs.js index 68613b5..d9ea4d1 100644 --- a/src/defaults/preferences/prefs.js +++ b/src/defaults/preferences/prefs.js @@ -4,6 +4,7 @@ pref("extensions.torlauncher.logmethod", 1); // 0=stdout, 1=errorconsole, 2=deb pref("extensions.torlauncher.control_host", "127.0.0.1"); pref("extensions.torlauncher.control_port", 9151); +pref("extensions.torlauncher.start_tor", true); pref("extensions.torlauncher.prompt_at_startup", true); // All path prefs. are relative to the firefox executable's directory

1 0

r26153: {website} Couple more GSoC projects from sjmurdoch (website/trunk/getinvolved/en)
by Damian Johnson 09 Apr '13

09 Apr '13

Author: atagar Date: 2013-04-09 16:41:49 +0000 (Tue, 09 Apr 2013) New Revision: 26153 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Couple more GSoC projects from sjmurdoch Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2013-04-09 16:05:53 UTC (rev 26152) +++ website/trunk/getinvolved/en/volunteer.wml 2013-04-09 16:41:49 UTC (rev 26153) @@ -603,6 +603,11 @@ block Tor. This has both a C and python implementation. + + Project Ideas: + <a href="#betterPluggableTransports">Build Better Pluggable Transports</a> + + <a id="project-flash-proxy"></a> <h3><a href="https://crypto.stanford.edu/flashproxy/">Flash Proxy</a> (<a href="https://gitweb.torproject.org/flashproxy.git">code</a>, <a @@ -1270,7 +1275,62 @@ </li> + <a id="betterPluggableTransports"></a> <li> + Build Better Pluggable Transports + + Effort Level: Medium to High + + Skill Level: Medium + + Likely Mentors: Steven (sjmurdoch) + + For Tor users in censored countries, we currently offer <a + href="https://www.torproject.org/projects/obfsproxy.html.en">obfsproxy</a> + bridges, which disguise Tor traffic by making it look random. This works + for many users, but it has disadvantages: firstly it does not disguise + packet size and secondly it looks like no real protocol. These weaknesses + may result in obfsproxy being blocked. + + + + The goal for this project will be to implement new pluggable transports, + which resolve these weaknesses and so can be deployed if/when obfsproxy is + blocked. Ideas for doing so include: + <ul> + <li>Impersonate a voice-over-IP protocol</li> + <li>Impersonate HTTP sufficiently well that traffic will go through a HTTP-only proxy</li> + <li>Implement <a href="http://cacr.uwaterloo.ca/techreports/2011/cacr2011-21.pdf">scanning resistance</a></a> + </ul> + + + <a id="profileUDPTransport"></a> + <li> + Profile UDP transport protocols + + Effort Level: Medium to High + + Skill Level: High + + Likely Mentors: Steven (sjmurdoch) + + There are <a + href="https://research.torproject.org/techreports/datagram-comparison-2011-11-07.…">lots + of options</a> as to how Tor could send its data over UDP rather than TCP, + and some will likely perform significantly better than others. This project + will evaluate these options, so as to decide which should be used in future + versions of Tor. A first step will be to benchmark the various transport + protocols being considered, in terms of performance and also code quality, + including userspace TCP, <a + href="https://github.com/bittorrent/libutp">μTP</a>, <a + href="http://en.wikipedia.org/wiki/Stream_Control_Transmission_Protocol">SCTP</a> + and <a href="http://curvecp.org/">CurveCP</a>. Initially these transport + protocols will be examined in isolation, but if the project progresses well + one or more could be integrated in Tor. + + </li> + + <li> Bring up new ideas! Don't like any of these? Look at the <a

1 0