- tor-commits - lists.torproject.org

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 20 Dec '12

20 Dec '12

commit 536fe192532790c1d3df1931c339bffee80fb25e Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 20 04:15:04 2012 +0000 Update translations for bridgedb_completed --- es/bridgedb.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/es/bridgedb.po b/es/bridgedb.po index 7ffb480..6675342 100644 --- a/es/bridgedb.po +++ b/es/bridgedb.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-01-01 07:48-0800\n" -"PO-Revision-Date: 2012-12-04 17:22+0000\n" +"PO-Revision-Date: 2012-12-20 04:09+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -36,7 +36,7 @@ msgid "" "To use the above lines, go to Vidalia's Network settings page, and click\n" "\"My ISP blocks connections to the Tor network\". Then add each bridge\n" "address one at a time." -msgstr "Para usar las lineas de arriba, vaya a la pestaña Red de las \nPreferencias del Panel de Control de Vidalia, y haga clic en \n\"Mi ISP bloquea las conexiones de la red de Tor\"." +msgstr "Para usar las líneas de arriba, vaya a la pestaña Red de las \nPreferencias del Panel de Control de Vidalia, y haga clic en \n\"Mi ISP bloquea las conexiones de la red de Tor\"." #: lib/bridgedb/I18n.py:32 msgid "" @@ -51,11 +51,11 @@ msgid "" "of the mail. However, so we can make it harder for an attacker to learn\n" "lots of bridge addresses, you must send this request from an email address at\n" "one of the following domains:" -msgstr "Otra forma de encontrar direcciones de bridge (repetidores puente,\naccesos a Tor de publicitación restringida) es enviar un correo a \nbridges(a)torproject.org con la linea \"get bridges\" por si misma en el\ncuerpo del correo. Sin embargo, para que podamos ponerle más difícil\na un atacante aprender muchas direcciones de bridge, debe enviar esta\npetición desde una dirección de correo de uno de estos dominios: " +msgstr "Otra forma de encontrar direcciones de bridge (repetidores puente,\naccesos a Tor de publicitación restringida) es enviar un correo a \nbridges(a)torproject.org con la línea \"get bridges\" por si misma en el\ncuerpo del correo. Sin embargo, para que podamos ponerle más difícil\na un atacante aprender muchas direcciones de bridge, debe enviar esta\npetición desde una dirección de correo de uno de estos dominios: " #: lib/bridgedb/I18n.py:41 msgid "[This is an automated message; please do not reply.]" -msgstr "[Este es un mensaje automatizado, por favor no responda]" +msgstr "[Este es un mensaje automatizado, por favor no responda.]" #: lib/bridgedb/I18n.py:43 msgid ""

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 20 Dec '12

20 Dec '12

commit 2bf0c3ed64f608d5089d5de55b09d9edbf5cd427 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 20 04:15:02 2012 +0000 Update translations for bridgedb --- es/bridgedb.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/es/bridgedb.po b/es/bridgedb.po index 7ffb480..6675342 100644 --- a/es/bridgedb.po +++ b/es/bridgedb.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-01-01 07:48-0800\n" -"PO-Revision-Date: 2012-12-04 17:22+0000\n" +"PO-Revision-Date: 2012-12-20 04:09+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -36,7 +36,7 @@ msgid "" "To use the above lines, go to Vidalia's Network settings page, and click\n" "\"My ISP blocks connections to the Tor network\". Then add each bridge\n" "address one at a time." -msgstr "Para usar las lineas de arriba, vaya a la pestaña Red de las \nPreferencias del Panel de Control de Vidalia, y haga clic en \n\"Mi ISP bloquea las conexiones de la red de Tor\"." +msgstr "Para usar las líneas de arriba, vaya a la pestaña Red de las \nPreferencias del Panel de Control de Vidalia, y haga clic en \n\"Mi ISP bloquea las conexiones de la red de Tor\"." #: lib/bridgedb/I18n.py:32 msgid "" @@ -51,11 +51,11 @@ msgid "" "of the mail. However, so we can make it harder for an attacker to learn\n" "lots of bridge addresses, you must send this request from an email address at\n" "one of the following domains:" -msgstr "Otra forma de encontrar direcciones de bridge (repetidores puente,\naccesos a Tor de publicitación restringida) es enviar un correo a \nbridges(a)torproject.org con la linea \"get bridges\" por si misma en el\ncuerpo del correo. Sin embargo, para que podamos ponerle más difícil\na un atacante aprender muchas direcciones de bridge, debe enviar esta\npetición desde una dirección de correo de uno de estos dominios: " +msgstr "Otra forma de encontrar direcciones de bridge (repetidores puente,\naccesos a Tor de publicitación restringida) es enviar un correo a \nbridges(a)torproject.org con la línea \"get bridges\" por si misma en el\ncuerpo del correo. Sin embargo, para que podamos ponerle más difícil\na un atacante aprender muchas direcciones de bridge, debe enviar esta\npetición desde una dirección de correo de uno de estos dominios: " #: lib/bridgedb/I18n.py:41 msgid "[This is an automated message; please do not reply.]" -msgstr "[Este es un mensaje automatizado, por favor no responda]" +msgstr "[Este es un mensaje automatizado, por favor no responda.]" #: lib/bridgedb/I18n.py:43 msgid ""

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 20 Dec '12

20 Dec '12

commit 644e4a3f90078a5eb62374e92b5363ff3ca06ceb Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 20 03:45:19 2012 +0000 Update translations for vidalia --- zh_TW/vidalia_zh_TW.po | 112 ++++++++++++++++++++++++------------------------ 1 files changed, 56 insertions(+), 56 deletions(-) diff --git a/zh_TW/vidalia_zh_TW.po b/zh_TW/vidalia_zh_TW.po index bdc31c3..fb1c0fb 100644 --- a/zh_TW/vidalia_zh_TW.po +++ b/zh_TW/vidalia_zh_TW.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-12-13 03:22+0000\n" -"Last-Translator: chinrur <chinrur(a)gmail.com>\n" +"PO-Revision-Date: 2012-12-20 03:40+0000\n" +"Last-Translator: sora8964 <sora8964(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -141,19 +141,19 @@ msgstr "請選擇Tor儲存數據的資料夾目錄" msgctxt "AdvancedPage" msgid "Tor Control" -msgstr "" +msgstr "Tor 控制" msgctxt "AdvancedPage" msgid "Use TCP connection (ControlPort)" -msgstr "" +msgstr "使用TCP連線(控制埠)" msgctxt "AdvancedPage" msgid "Path:" -msgstr "" +msgstr "路徑: " msgctxt "AdvancedPage" msgid "Use Unix domain socket (ControlSocket)" -msgstr "" +msgstr "使用Unix Socket(控制埠)" msgctxt "AdvancedPage" msgid "Edit current torrc" @@ -181,7 +181,7 @@ msgstr "" msgctxt "AdvancedPage" msgid "Warning" -msgstr "" +msgstr "警告" msgctxt "AdvancedPage" msgid "You changed torrc path, would you like to restart Tor?" @@ -244,7 +244,7 @@ msgstr "" msgctxt "AppearancePage" msgid "Hide the Tray Icon" -msgstr "" +msgstr "隱藏到系統匣" msgctxt "AppearancePage" msgid "Hide the Dock Icon" @@ -1186,7 +1186,7 @@ msgstr "辛巴威" msgctxt "CountryInfo" msgid "Zaire" -msgstr "" +msgstr "薩伊" msgctxt "CountryInfo" msgid "Albania" @@ -1274,7 +1274,7 @@ msgstr "" msgctxt "CountryInfo" msgid "Mexico" -msgstr "" +msgstr "墨西哥" msgctxt "CountryInfo" msgid "Myanmar" @@ -1294,15 +1294,15 @@ msgstr "" msgctxt "CrashReportDialog" msgid "Restart Vidalia" -msgstr "" +msgstr "重新啟動 Vidalia" msgctxt "CrashReportDialog" msgid "Don't Restart" -msgstr "" +msgstr "不要重新啟動" msgctxt "CrashReportDialog" msgid "Unable to restart Vidalia" -msgstr "" +msgstr "無法重新啟動 Vidalia" msgctxt "CrashReportDialog" msgid "" @@ -1379,7 +1379,7 @@ msgstr "代理應用程式參數:" msgctxt "GeneralPage" msgid "Software Updates" -msgstr "" +msgstr "軟件更新" msgctxt "GeneralPage" msgid "Check for new software updates automatically" @@ -1407,11 +1407,11 @@ msgstr "%1 GB" msgctxt "GraphFrame" msgid "Recv:" -msgstr "" +msgstr "已接收: " msgctxt "GraphFrame" msgid "Sent:" -msgstr "" +msgstr "已傳送: " msgctxt "HelpBrowser" msgid "Supplied XML file is not a valid Contents document." @@ -1539,7 +1539,7 @@ msgstr "搜索結果" msgctxt "HelpBrowser" msgid "Error Loading Help Contents:" -msgstr "" +msgstr "載入內容時發生錯誤: " msgctxt "HelpTextBrowser" msgid "Opening External Link" @@ -1568,7 +1568,7 @@ msgstr "" msgctxt "HelpTextBrowser" msgid "Error opening help file:" -msgstr "" +msgstr "無法打開說明檔" msgctxt "LicenseDialog" msgid "License Information" @@ -1608,27 +1608,27 @@ msgstr "未知" msgctxt "LogTreeItem" msgid "Debug" -msgstr "" +msgstr "除錯 Debug" msgctxt "LogTreeItem" msgid "Info" -msgstr "" +msgstr "資訊 Info" msgctxt "LogTreeItem" msgid "Notice" -msgstr "" +msgstr "通知 Notice" msgctxt "LogTreeItem" msgid "Warning" -msgstr "" +msgstr "警告 Warning" msgctxt "LogTreeItem" msgid "Error" -msgstr "" +msgstr "錯誤 Error" msgctxt "LogTreeItem" msgid "Unknown" -msgstr "" +msgstr "未知 Unknown" msgctxt "MainWindow" msgid "Start Tor" @@ -1748,11 +1748,11 @@ msgstr "" msgctxt "MainWindow" msgid "Loading network status" -msgstr "" +msgstr "正在載入網絡狀態" msgctxt "MainWindow" msgid "Loading authority certificates" -msgstr "" +msgstr "正在載入憑證機構證書" msgctxt "MainWindow" msgid "Requesting relay information" @@ -1760,7 +1760,7 @@ msgstr "正在要求中繼站資訊" msgctxt "MainWindow" msgid "Loading relay information" -msgstr "" +msgstr "正在載入中繼資訊" msgctxt "MainWindow" msgid "Connecting to the Tor network" @@ -1788,7 +1788,7 @@ msgstr "完成" msgctxt "MainWindow" msgid "connection refused" -msgstr "" +msgstr "連線被拒絕" msgctxt "MainWindow" msgid "connection timeout" @@ -1928,7 +1928,7 @@ msgstr "你目前安裝的版本已過期，或是官方不再建議你使用。 msgctxt "MainWindow" msgid "Tor website: %1" -msgstr "" +msgstr "Tor 網站: %1" msgctxt "MainWindow" msgid "" @@ -1962,7 +1962,7 @@ msgstr "Vidalia 快捷方式" msgctxt "MainWindow" msgid "Setup Relaying" -msgstr "設置中繼服務器\n" +msgstr "設置中繼服務器" msgctxt "MainWindow" msgid "Set up a relay and help the network grow" @@ -2396,11 +2396,11 @@ msgstr "自動保存新的消息內容至文件" msgctxt "MessageLog" msgid "Basic" -msgstr "" +msgstr "基本" msgctxt "MessageLog" msgid "Tor Status" -msgstr "" +msgstr "Tor 狀態" msgctxt "MessageLog" msgid "Advanced" @@ -2543,7 +2543,7 @@ msgstr "未知" msgctxt "NetViewer" msgid "Full Screen" -msgstr "" +msgstr "全屏" msgctxt "NetViewer" msgid "View the network map as a full screen window" @@ -2671,7 +2671,7 @@ msgstr "" msgctxt "NetworkPage" msgid "Type:" -msgstr "" +msgstr "類型:" msgctxt "NetworkPage" msgid "You must select the proxy type." @@ -2679,15 +2679,15 @@ msgstr "" msgctxt "NetworkPage" msgid "SOCKS 4" -msgstr "" +msgstr "SOCKS 4" msgctxt "NetworkPage" msgid "SOCKS 5" -msgstr "" +msgstr "SOCKS 5" msgctxt "NetworkPage" msgid "HTTP / HTTPS" -msgstr "" +msgstr "HTTP / HTTPS" msgctxt "NetworkPage" msgid "You must specify one or more bridges." @@ -3358,7 +3358,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "DNS Hijacking Detected" -msgstr "" +msgstr "偵測到DNS劫持" msgctxt "StatusEventWidget" msgid "" @@ -3522,39 +3522,39 @@ msgstr "" msgctxt "TorrcDialog" msgid "Cut" -msgstr "" +msgstr "剪下" msgctxt "TorrcDialog" msgid "Copy" -msgstr "" +msgstr "複製" msgctxt "TorrcDialog" msgid "Paste" -msgstr "" +msgstr "貼上" msgctxt "TorrcDialog" msgid "Undo" -msgstr "" +msgstr "復原" msgctxt "TorrcDialog" msgid "Redo" -msgstr "" +msgstr "重做" msgctxt "TorrcDialog" msgid "Select All" -msgstr "" +msgstr "選擇全部" msgctxt "TorrcDialog" msgid "Apply all" -msgstr "" +msgstr "套用全部" msgctxt "TorrcDialog" msgid "Apply selection only" -msgstr "" +msgstr "套用已選取的" msgctxt "TorrcDialog" msgid "Error connecting to Tor" -msgstr "" +msgstr "連線到Tor時發生錯誤" msgctxt "TorrcDialog" msgid "Selection is empty. Please select some text, or check \"Apply all\"" @@ -3566,7 +3566,7 @@ msgstr "" msgctxt "TorrcDialog" msgid "Error" -msgstr "" +msgstr "錯誤" msgctxt "TorrcDialog" msgid "An error ocurred while opening torrc file" @@ -3658,7 +3658,7 @@ msgstr "正在啟動 Tor 軟體" msgctxt "UpdateProgressDialog" msgid "Done! Your software is now up to date." -msgstr "" +msgstr "成功! 您的軟件已是最新版本" msgctxt "UpdateProgressDialog" msgid "OK" @@ -3666,11 +3666,11 @@ msgstr "確定" msgctxt "UpdateProgressDialog" msgid "Software Updates" -msgstr "" +msgstr "軟件更新" msgctxt "UpdateProgressDialog" msgid "Checking for updates..." -msgstr "" +msgstr "正在檢查更新..." msgctxt "UpdateProgressDialog" msgid "Cancel" @@ -3682,11 +3682,11 @@ msgstr "Tor 有新版本" msgctxt "UpdatesAvailableDialog" msgid "Remind Me Later" -msgstr "" +msgstr "稍後提醒我" msgctxt "UpdatesAvailableDialog" msgid "Install" -msgstr "" +msgstr "安裝" msgctxt "UpdatesAvailableDialog" msgid "The following updated software packages are ready for installation:" @@ -3837,12 +3837,12 @@ msgstr "%1 GB/s" msgctxt "stringutil.h" msgid "%1 days" -msgstr "" +msgstr "%1 日" msgctxt "stringutil.h" msgid "%1 hours" -msgstr "" +msgstr "%1 小時" msgctxt "stringutil.h" msgid "%1 mins" -msgstr "" +msgstr "%1 分鐘"

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 20 Dec '12

20 Dec '12

commit 2bbacfda535b350e06bcc0afe20e6ac806727d10 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 20 03:45:06 2012 +0000 Update translations for gettor --- vi/gettor.po | 455 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 455 insertions(+), 0 deletions(-) diff --git a/vi/gettor.po b/vi/gettor.po new file mode 100644 index 0000000..c31089d --- /dev/null +++ b/vi/gettor.po @@ -0,0 +1,455 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Clytie Siddall <clytie(a)riverland.net.au>, 2012. +# Jacob Appelbaum <jacob(a)appelbaum.net>, 2009. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2011-11-13 22:01+0100\n" +"PO-Revision-Date: 2012-12-20 03:43+0000\n" +"Last-Translator: Clytie Siddall <clytie(a)riverland.net.au>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: vi\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: lib/gettor/i18n.py:27 +msgid "Hello, This is the \"GetTor\" robot." +msgstr "" + +#: lib/gettor/i18n.py:29 +msgid "Thank you for your request." +msgstr "" + +#: lib/gettor/i18n.py:31 +msgid "" +"Unfortunately, we won't answer you at this address. You should make\n" +"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n" +"one of those." +msgstr "" + +#: lib/gettor/i18n.py:35 +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 "Chúng tôi chỉ xử lý yêu cầu đến từ dịch vụ thư điện tử cũng hỗ trợ « DKIM », một tính năng thư điện tử cho phép kiểm tra địa chỉ trên dòng « Từ » thật sự là người đã gửi thư đó." + +#: 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 "(Xin lỗi nếu bạn đã không yêu cầu thư này. Vì thư của bạn đến từ một dịch vụ không phải sử dụng DKIM, chúng tôi gửi một lời giải thích ngắn, sau đó chúng tôi cũng không đáp ứng thư từ địa chỉ này trong vài ngày.)" + +#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130 +msgid "" +"If you have any questions or it doesn't work, you can contact a\n" +"human at this support email address: help(a)rt.torproject.org" +msgstr "" + +#: lib/gettor/i18n.py:46 +msgid "" +"I will mail you a Tor package, if you tell me which one you want.\n" +"Please select one of the following package names:\n" +"\n" +" windows\n" +" macos-i386\n" +" macos-ppc\n" +" linux-i386\n" +" linux-x86_64\n" +" source" +msgstr "" + +#: lib/gettor/i18n.py:56 +msgid "" +"Please reply to this mail, and tell me a single package name anywhere \n" +"in the body of your email." +msgstr "" + +#: lib/gettor/i18n.py:59 +msgid "" +"OBTAINING LOCALIZED VERSIONS OF TOR\n" +"===================================" +msgstr "" + +#: lib/gettor/i18n.py:62 +msgid "" +"To get a version of Tor translated into your language, specify the\n" +"language you want in the address you send the mail to:\n" +"\n" +" gettor+fa(a)torproject.org" +msgstr "" + +#: lib/gettor/i18n.py:67 +msgid "" +"This example will give you the requested package in a localized\n" +"version for Farsi (Persian). Check below for a list of supported language\n" +"codes. " +msgstr "" + +#: lib/gettor/i18n.py:71 +msgid " List of supported locales:" +msgstr "Danh sách các miền địa phương được hỗ trợ :" + +#: lib/gettor/i18n.py:73 +msgid "Here is a list of all available languages:" +msgstr "Đây là một danh sách các ngôn ngữ sẵn sàng:" + +#: lib/gettor/i18n.py:75 +msgid "" +" gettor+ar(a)torproject.org: Arabic\n" +" 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: Tiếng A-Rập⏎ gettor+de(a)torproject.org: Tiếng Đức⏎ gettor+en(a)torproject.org: Tiếng Anh⏎ gettor+es(a)torproject.org: Tiếng Tây Ban Nha⏎ gettor+fa(a)torproject.org: Tiếng Pha-xi (I-rắn)⏎ gettor+fr(a)torproject.org: Tiếng Pháp⏎ gettor+it(a)torproject.org: Tiếng Y⏎ gettor+nl(a)torproject.org: Tiếng Hoà-lan⏎ gettor+pl(a)torproject.org: Tiếng Ba-lan⏎ gettor+ru(a)torproject.org: Tiếng Nga⏎ gettor+zh(a)torproject.org: Tiếng Trung" + +#: lib/gettor/i18n.py:87 +msgid "If you select no language, you will receive the English version." +msgstr "Nếu bạn không chọn một ngôn ngữ riêng thì bạn nhận phiên bản tiếng Anh." + +#: lib/gettor/i18n.py:89 +msgid "" +"SMALLER SIZED PACKAGES\n" +"======================" +msgstr "" + +#: lib/gettor/i18n.py:92 +msgid "" +"If your bandwith is low or your provider doesn't allow you to\n" +"receive large attachments in your email, GetTor can send you several\n" +"small packages instead of one big one." +msgstr "" + +#: lib/gettor/i18n.py:96 +msgid "" +"Simply include the keyword 'split' in a new line on its own (this part\n" +"is important!) like so: \n" +" \n" +" windows\n" +" split" +msgstr "" + +#: lib/gettor/i18n.py:102 +msgid "" +"Sending this text in an email to GetTor will cause it to send you \n" +"the Tor Browser Bundle in a number of 1,4MB attachments." +msgstr "" + +#: lib/gettor/i18n.py:105 +msgid "" +"After having received all parts, you need to re-assemble them to \n" +"one package again. This is done as follows:" +msgstr "" + +#: lib/gettor/i18n.py:108 +msgid "1.) Save all received attachments into one folder on your disk." +msgstr "" + +#: lib/gettor/i18n.py:110 +msgid "" +"2.) Unzip all files ending in \".z\". If you saved all attachments to\n" +"a fresh folder before, simply unzip all files in that folder. If you don't\n" +"know how to unzip the .z files, please see the UNPACKING THE FILES section." +msgstr "" + +#: lib/gettor/i18n.py:114 +msgid "" +"3.) Verify all files as described in the mail you received with \n" +"each package. (gpg --verify)" +msgstr "" + +#: lib/gettor/i18n.py:117 +msgid "" +"4.) Now unpack the multi-volume archive into one file by double-\n" +"clicking the file ending in \"..split.part01.exe\". This should start the \n" +"process automatically." +msgstr "" + +#: lib/gettor/i18n.py:121 +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 "" + +#: lib/gettor/i18n.py:125 +msgid "6.) That's it. You're done. Thanks for using Tor and have fun!" +msgstr "" + +#: lib/gettor/i18n.py:127 +msgid "" +"SUPPORT\n" +"=======" +msgstr "" + +#: lib/gettor/i18n.py:133 +msgid "" +"Here's your requested software as a zip file. Please unzip the\n" +"package and verify the signature." +msgstr "" + +#: lib/gettor/i18n.py:136 +msgid "" +"VERIFY SIGNATURE\n" +"================\n" +"If your computer has GnuPG installed, use the gpg commandline \n" +"tool as follows after unpacking the zip file:\n" +"\n" +" gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US.exe" +msgstr "" + +#: lib/gettor/i18n.py:143 +msgid "" +"The output should look somewhat like this:\n" +"\n" +" gpg: Good signature from 'Erinn Clark <...>'" +msgstr "" + +#: lib/gettor/i18n.py:147 +msgid "" +"If you're not familiar with commandline tools, try looking for\n" +"a graphical user interface for GnuPG on this website:\n" +"\n" +" http://www.gnupg.org/related_software/frontends.html" +msgstr "" + +#: lib/gettor/i18n.py:152 +msgid "" +"BLOCKED ACCESS / CENSORSHIP\n" +"===========================" +msgstr "" + +#: lib/gettor/i18n.py:155 +msgid "" +"If your Internet connection blocks access to the Tor network, you\n" +"may need a bridge relay. Bridge relays (or \"bridges\" for short)\n" +"are Tor relays that aren't listed in the main directory. Since there\n" +"is no complete public list of them, even if your ISP is filtering\n" +"connections to all the known Tor relays, they probably won't be able\n" +"to block all the bridges." +msgstr "" + +#: lib/gettor/i18n.py:162 +msgid "" +"You can acquire a bridge by sending an email that contains \"get bridges\"\n" +"in the body of the email to the following email address:\n" +"\n" +" bridges(a)torproject.org" +msgstr "" + +#: lib/gettor/i18n.py:167 +msgid "" +"It is also possible to fetch bridges with a web browser at the following\n" +"url: https://bridges.torproject.org/" +msgstr "" + +#: lib/gettor/i18n.py:170 +msgid "" +"IMPORTANT NOTE:\n" +"Since this is part of a split-file request, you need to wait for\n" +"all split files to be received by you before you can save them all\n" +"into the same directory and unpack them by double-clicking the\n" +"first file." +msgstr "" + +#: lib/gettor/i18n.py:176 +msgid "" +"Packages might arrive out of order! Please make sure you received\n" +"all packages before you attempt to unpack them!" +msgstr "" + +#: lib/gettor/i18n.py:179 +#, python-format +msgid "" +"It was successfully understood. Your request is currently being processed.\n" +"Your package (%s) should arrive within the next ten minutes." +msgstr "" + +#: lib/gettor/i18n.py:182 +msgid "" +"If it doesn't arrive, the package might be too big for your mail provider.\n" +"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account." +msgstr "" + +#: lib/gettor/i18n.py:185 +msgid "" +"Unfortunately we are currently experiencing problems and we can't fulfill\n" +"your request right now. Please be patient as we try to resolve this issue." +msgstr "" + +#: lib/gettor/i18n.py:188 +msgid "" +"Unfortunately there is no split package available for the package you\n" +"requested. Please send us another package name or request the same package \n" +"again, but remove the 'split' keyword. In that case we'll send you the whole \n" +"package. Make sure this is what you want." +msgstr "" + +#: lib/gettor/i18n.py:193 +msgid "" +"UNPACKING THE FILES\n" +"===================" +msgstr "" + +#: lib/gettor/i18n.py:196 +msgid "" +"The easiest way to unpack the files you received is to install 7-Zip,\n" +"a free file compression/uncompression tool. If it isn't installed on\n" +"your computer yet, you can download it here:\n" +"\n" +" http://www.7-zip.org/" +msgstr "" + +#: lib/gettor/i18n.py:202 +msgid "" +"When 7-Zip is installed, you can open the .z archive you received from\n" +"us by double-clicking on it." +msgstr "" + +#: lib/gettor/i18n.py:205 +msgid "" +"An alternative way to get the .z files extraced is to rename them to\n" +".zip. For example, if you recevied a file called \"windows.z\", rename it to \n" +"\"windows.zip\". You should then be able to extract the archive with common \n" +"file archiver programs that probably are already installed on your computer." +msgstr "" + +#: lib/gettor/i18n.py:210 +msgid "" +"Please reply to this mail, and tell me a single package name anywhere\n" +"in your reply. Here's a short explanation of what these packages are:" +msgstr "" + +#: lib/gettor/i18n.py:213 +msgid "" +"windows:\n" +"The Tor Browser Bundle package for Windows operating systems. If you're \n" +"running some version of Windows, like Windows XP, Windows Vista or \n" +"Windows 7, this is the package you should get." +msgstr "" + +#: lib/gettor/i18n.py:218 +msgid "" +"macos-i386:\n" +"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n" +"general, newer Mac hardware will require you to use this package." +msgstr "" + +#: lib/gettor/i18n.py:222 +msgid "" +"macos-ppc:\n" +"This is an older installer (the \"Vidalia bundle\") for older Macs running\n" +"OS X on PowerPC CPUs. Note that this package will be deprecated soon." +msgstr "" + +#: lib/gettor/i18n.py:226 +msgid "" +"linux-i386:\n" +"The Tor Browser Bundle package for Linux, 32bit versions." +msgstr "" + +#: lib/gettor/i18n.py:229 +msgid "" +"Note that this package is rather large and needs your email provider to \n" +"allow for attachments of about 30MB in size." +msgstr "" + +#: lib/gettor/i18n.py:232 +msgid "" +"linux-x86_64:\n" +"The Tor Browser Bundle package for Linux, 64bit versions." +msgstr "" + +#: lib/gettor/i18n.py:235 +msgid "" +"source:\n" +"The Tor source code, for experts. Most users do not want this package." +msgstr "" + +#: lib/gettor/i18n.py:238 +msgid "" +"FREQUENTLY ASKED QUESTIONS\n" +"==========================" +msgstr "" + +#: lib/gettor/i18n.py:241 +msgid "What is Tor?" +msgstr "" + +#: lib/gettor/i18n.py:243 +msgid "The name \"Tor\" can refer to several different components." +msgstr "" + +#: lib/gettor/i18n.py:245 +msgid "" +"The Tor software is a program you can run on your computer that helps \n" +"keep you safe on the Internet. Tor protects you by bouncing your \n" +"communications around a distributed network of relays run by volunteers \n" +"all around the world: it prevents somebody watching your Internet connection \n" +"from learning what sites you visit, and it prevents the sites you visit from \n" +"learning your physical location. This set of volunteer relays is called the \n" +"Tor network. You can read more about how Tor works here:\n" +"\n" +" https://www.torproject.org/about/overview.html.en" +msgstr "" + +#: lib/gettor/i18n.py:255 +msgid "What is the Tor Browser Bundle?" +msgstr "" + +#: lib/gettor/i18n.py:257 +msgid "" +"The Browser Bundle (TBB) is the package we recommend to most users. \n" +"The bundle comes with everything you need to safely browse the Internet.\n" +"Just extract it and run." +msgstr "" + +#: lib/gettor/i18n.py:261 +msgid "What package should I request?" +msgstr "" + +#: lib/gettor/i18n.py:263 +msgid "" +"This depends on the operating system you use. For instance, if your\n" +"operating system is Microsoft Windows, you should request \"windows\". Here\n" +"is a short explanation of all packages to request and what operating \n" +"systems there are suitable for:" +msgstr "" + +#: lib/gettor/i18n.py:268 +msgid "How do I extract the file(s) you sent me?" +msgstr "" + +#: lib/gettor/i18n.py:270 +msgid "QUESTION:" +msgstr "" + +#: lib/gettor/i18n.py:272 +msgid "ANSWER:" +msgstr "" + +#: lib/gettor/i18n.py:274 +#, python-format +msgid "" +"Sorry, but the package you requested (%s) is too large for your \n" +"provider to accept as an attachment. Try using another provider that allows \n" +"for larger email attachments. Or try one of the following mirrors:\n" +"\n" +" https://www.oignon.net/dist/torbrowser/\n" +" https://tor.beme-it.de/dist/torbrowser/\n" +" https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/" +msgstr ""

1 0

[flashproxy/master] Add failing tests for matching address family of proxy and client.
by dcf＠torproject.org 20 Dec '12

20 Dec '12

commit 658ed1941733604d2eef2a5524d70001a0b8ebde Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 19 19:07:03 2012 -0800 Add failing tests for matching address family of proxy and client. See #6124. --- facilitator/facilitator-test | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/facilitator/facilitator-test b/facilitator/facilitator-test index c8946e6..fd12ebe 100755 --- a/facilitator/facilitator-test +++ b/facilitator/facilitator-test @@ -9,6 +9,7 @@ import fac FACILITATOR_HOST = "127.0.0.1" FACILITATOR_PORT = 9002 +FACILITATOR_ADDR = (FACILITATOR_HOST, FACILITATOR_PORT) def gimme_socket(host, port): addrinfo = socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM, socket.IPPROTO_TCP)[0] @@ -18,6 +19,11 @@ def gimme_socket(host, port): return s class FacilitatorTest(unittest.TestCase): + IPV4_CLIENT_ADDR = ("1.1.1.1", 9000) + IPV6_CLIENT_ADDR = ("[11::11]", 9000) + IPV4_PROXY_ADDR = ("2.2.2.2", 13000) + IPV6_PROXY_ADDR = ("[22::22]", 13000) + def gimme_socket(self): return gimme_socket(FACILITATOR_HOST, FACILITATOR_PORT) @@ -55,6 +61,32 @@ class FacilitatorTest(unittest.TestCase): except socket.error: pass + def test_af_v4_v4(self): + """Test that IPv4 proxies can get IPv4 clients.""" + fac.put_reg(FACILITATOR_ADDR, self.IPV4_CLIENT_ADDR) + fac.put_reg(FACILITATOR_ADDR, self.IPV6_CLIENT_ADDR) + reg = fac.get_reg(FACILITATOR_ADDR, self.IPV4_PROXY_ADDR) + self.assertEqual(reg["client"], fac.format_addr(self.IPV4_CLIENT_ADDR)) + + def test_af_v4_v6(self): + """Test that IPv4 proxies do not get IPv6 clients.""" + fac.put_reg(FACILITATOR_ADDR, self.IPV6_CLIENT_ADDR) + reg = fac.get_reg(FACILITATOR_ADDR, self.IPV4_PROXY_ADDR) + self.assertEqual(reg["client"], "") + + def test_af_v6_v4(self): + """Test that IPv6 proxies do not get IPv4 clients.""" + fac.put_reg(FACILITATOR_ADDR, self.IPV4_CLIENT_ADDR) + reg = fac.get_reg(FACILITATOR_ADDR, self.IPV6_PROXY_ADDR) + self.assertEqual(reg["client"], "") + + def test_af_v6_v6(self): + """Test that IPv6 proxies can get IPv6 clients.""" + fac.put_reg(FACILITATOR_ADDR, self.IPV4_CLIENT_ADDR) + fac.put_reg(FACILITATOR_ADDR, self.IPV6_CLIENT_ADDR) + reg = fac.get_reg(FACILITATOR_ADDR, self.IPV6_PROXY_ADDR) + self.assertEqual(reg["client"], fac.format_addr(self.IPV6_CLIENT_ADDR)) + # def test_same_proxy(self): # """Test that the same proxy doesn't get the same client when asking # twice."""

1 0

[translation/vidalia_help_completed] Update translations for vidalia_help_completed
by translation＠torproject.org 20 Dec '12

20 Dec '12

commit 92b89cde06e85c91b804db72c21e748e4205d37b Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 20 02:45:35 2012 +0000 Update translations for vidalia_help_completed --- es/netview.po | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/es/netview.po b/es/netview.po index 42b8f3d..add2e83 100644 --- a/es/netview.po +++ b/es/netview.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2012-12-20 02:08+0000\n" +"PO-Revision-Date: 2012-12-20 02:31+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -153,17 +153,17 @@ msgid "" "All bandwidth values are estimates based on the minimum of either the " "maximum bandwidth sustained input or output over any ten second period in " "the past day." -msgstr "Todos los valores de ancho de banda son estimaciones basadas en el mínimo de ancho de banda ya sea la entrada o salida máxima sostenida en un período de diez segundos en el último día." +msgstr "Todos los valores de ancho de banda son estimaciones basadas en el valor más bajo de entre los valores máximos de ancho de banda de entrada o de salida, sostenidos en periodos de diez segundos, durante el pasado día." #. type: Content of: <html><body> #: en/netview.html:122 msgid "<a name=\"details\"/>" -msgstr "<a name=\"details\"/>" +msgstr "<a name=\"detalles\"/>" #. type: Content of: <html><body><h3> #: en/netview.html:123 msgid "Relay Details" -msgstr "Detalles del relé" +msgstr "Detalles del repetidor" #. type: Content of: <html><body><p> #: en/netview.html:125 @@ -173,14 +173,14 @@ msgid "" "href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream" " in the list of your current circuits and streams, this panel will show you " "details about each relay through which your traffic is currently being sent." -msgstr "El panel de detalles del relé esta en el lado derecho de la pantalla le da detalles sobre el relé o relés seleccionados en la <a href=\"#relaylist\">lista de retransmisión</a> . Si ha seleccionado un circuito de corriente o en la lista de sus circuitos de corriente y arroyos, este panel le mostrará información detallada sobre cada relé a través del cual es actualmente el tráfico que se envía." +msgstr "El panel de detalles del repetidor en el lado derecho de la pantalla, le da detalles sobre el repetidor o repetidores actualmente seleccionados en la <a href=\"#relaylist\">lista de repetidores</a>. Si ha seleccionado un circuito o secuencia (stream) de la lista de sus circuitos y secuencias actuales, este panel le mostrará los detalles acerca de cada repetidor a través cuales que se envía su tráfico." #. type: Content of: <html><body><p> #: en/netview.html:132 msgid "" "The fields that you may see in the panel are as follows (<i>Note</i>: not " "all of these fields will always be present):" -msgstr "Los campos que puede ver en el panel son las siguientes (<i>Nota:</i> No todos estos campos siempre estarán presentes):" +msgstr "Los campos que podría ver en el panel son las siguientes (<i>Nota:</i> No todos estos campos estarán presentes siempre):" #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:138 @@ -190,7 +190,7 @@ msgstr "<b>Ubicación</b>" #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:139 msgid "The geographic location of this Tor relay." -msgstr "La ubicación geográfica de este servidor Tor." +msgstr "La ubicación geográfica de este repetidor Tor." #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:142 @@ -200,7 +200,7 @@ msgstr "<b>Dirección IP</b>" #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:143 msgid "IP address at which this Tor relay can be reached." -msgstr "Dirección IP a la que puede ser este servidor Tor alcanzado." +msgstr "Dirección IP en la que se puede acceder a este repetidor Tor." #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:146 @@ -212,7 +212,7 @@ msgstr "<b>Plataforma</b>" msgid "" "Operating system information and Tor version on which this relay is " "currently running." -msgstr "Funcionamiento del sistema de información y la versión de Tor en el que este relevo se está ejecutando actualmente." +msgstr "Información del sistema operativo y la versión de Tor sobre las que se ejecuta este repetidor." #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:153

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 20 Dec '12

20 Dec '12

commit dcaac7eae4186f303b6edf0c1e5dd26d8ccec092 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 20 02:45:28 2012 +0000 Update translations for vidalia_help --- es/netview.po | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/es/netview.po b/es/netview.po index 42b8f3d..add2e83 100644 --- a/es/netview.po +++ b/es/netview.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2012-12-20 02:08+0000\n" +"PO-Revision-Date: 2012-12-20 02:31+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -153,17 +153,17 @@ msgid "" "All bandwidth values are estimates based on the minimum of either the " "maximum bandwidth sustained input or output over any ten second period in " "the past day." -msgstr "Todos los valores de ancho de banda son estimaciones basadas en el mínimo de ancho de banda ya sea la entrada o salida máxima sostenida en un período de diez segundos en el último día." +msgstr "Todos los valores de ancho de banda son estimaciones basadas en el valor más bajo de entre los valores máximos de ancho de banda de entrada o de salida, sostenidos en periodos de diez segundos, durante el pasado día." #. type: Content of: <html><body> #: en/netview.html:122 msgid "<a name=\"details\"/>" -msgstr "<a name=\"details\"/>" +msgstr "<a name=\"detalles\"/>" #. type: Content of: <html><body><h3> #: en/netview.html:123 msgid "Relay Details" -msgstr "Detalles del relé" +msgstr "Detalles del repetidor" #. type: Content of: <html><body><p> #: en/netview.html:125 @@ -173,14 +173,14 @@ msgid "" "href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream" " in the list of your current circuits and streams, this panel will show you " "details about each relay through which your traffic is currently being sent." -msgstr "El panel de detalles del relé esta en el lado derecho de la pantalla le da detalles sobre el relé o relés seleccionados en la <a href=\"#relaylist\">lista de retransmisión</a> . Si ha seleccionado un circuito de corriente o en la lista de sus circuitos de corriente y arroyos, este panel le mostrará información detallada sobre cada relé a través del cual es actualmente el tráfico que se envía." +msgstr "El panel de detalles del repetidor en el lado derecho de la pantalla, le da detalles sobre el repetidor o repetidores actualmente seleccionados en la <a href=\"#relaylist\">lista de repetidores</a>. Si ha seleccionado un circuito o secuencia (stream) de la lista de sus circuitos y secuencias actuales, este panel le mostrará los detalles acerca de cada repetidor a través cuales que se envía su tráfico." #. type: Content of: <html><body><p> #: en/netview.html:132 msgid "" "The fields that you may see in the panel are as follows (<i>Note</i>: not " "all of these fields will always be present):" -msgstr "Los campos que puede ver en el panel son las siguientes (<i>Nota:</i> No todos estos campos siempre estarán presentes):" +msgstr "Los campos que podría ver en el panel son las siguientes (<i>Nota:</i> No todos estos campos estarán presentes siempre):" #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:138 @@ -190,7 +190,7 @@ msgstr "<b>Ubicación</b>" #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:139 msgid "The geographic location of this Tor relay." -msgstr "La ubicación geográfica de este servidor Tor." +msgstr "La ubicación geográfica de este repetidor Tor." #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:142 @@ -200,7 +200,7 @@ msgstr "<b>Dirección IP</b>" #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:143 msgid "IP address at which this Tor relay can be reached." -msgstr "Dirección IP a la que puede ser este servidor Tor alcanzado." +msgstr "Dirección IP en la que se puede acceder a este repetidor Tor." #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:146 @@ -212,7 +212,7 @@ msgstr "<b>Plataforma</b>" msgid "" "Operating system information and Tor version on which this relay is " "currently running." -msgstr "Funcionamiento del sistema de información y la versión de Tor en el que este relevo se está ejecutando actualmente." +msgstr "Información del sistema operativo y la versión de Tor sobre las que se ejecuta este repetidor." #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:153

1 0

[flashproxy/master] Revert part of fe80b0fd, saved from another branch by mistake.
by dcf＠torproject.org 20 Dec '12

20 Dec '12

commit 291787fe899d06e99baee3e21bf881b01b0c7424 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 19 18:39:55 2012 -0800 Revert part of fe80b0fd, saved from another branch by mistake. --- facilitator/facilitator | 29 ++--------------------------- 1 files changed, 2 insertions(+), 27 deletions(-) diff --git a/facilitator/facilitator b/facilitator/facilitator index 6459034..97155ca 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -234,30 +234,7 @@ class Handler(SocketServer.StreamRequestHandler): print >> self.wfile, "ERROR" def do_GET(self, params): - # Get the proxy's address so we know what kind of client to give it - # (IPv4 or IPv6). - proxy_spec = fac.param_first("FROM", params) - if proxy_spec is None: - log(u"GET missing FROM param") - self.send_error() - return False - try: - _, _, af = fac.parse_addr_spec_af(proxy_spec, defport=0) - except ValueError, e: - log(u"syntax error in proxy address %s: %s" % (safe_str(repr(proxy_spec)), safe_str(repr(str(e))))) - self.send_error() - return False - - if af == socket.AF_INET: - regs = REGS_IPV4 - elif af == socket.AF_INET6: - regs = REGS_IPV6 - else: - log(u"unknown address family %d in proxy address %s" % (af, safe_str(repr(proxy_spec)))) - self.send_error() - return False - - reg = regs.fetch() + reg = REGS.fetch() if reg: log(u"proxy gets %s, relay %s (now %d)" % (safe_str(unicode(reg)), options.relay_spec, len(REGS))) @@ -296,9 +273,7 @@ class Handler(SocketServer.StreamRequestHandler): class Server(SocketServer.ThreadingMixIn, SocketServer.TCPServer): allow_reuse_address = True -# Separate pools for IPv4 and IPv6 clients. -REGS_IPV4 = RegSet() -REGS_IPV6 = RegSet() +REGS = RegSet() def main(): opts, args = getopt.gnu_getopt(sys.argv[1:], "dhl:p:r:",

1 0

[flashproxy/master] Don't use a guessed client address in the facilitator proper.
by dcf＠torproject.org 20 Dec '12

20 Dec '12

commit dace58f13fca4282d7086743043fb55908c798f0 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 19 18:32:19 2012 -0800 Don't use a guessed client address in the facilitator proper. The CGI should guess the remote IP address, but when the CGI talks to the facilitator daemon the remote address will always be localhost. This was left over from the split of the facilitator into a CGI and a backend. --- facilitator/facilitator | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/facilitator/facilitator b/facilitator/facilitator index bc47281..6459034 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -277,7 +277,7 @@ class Handler(SocketServer.StreamRequestHandler): # FROM try: - reg = Reg.parse(client_spec, self.client_address[0]) + reg = Reg.parse(client_spec) except ValueError, e: log(u"syntax error in %s: %s" % (safe_str(repr(client_spec)), safe_str(repr(str(e))))) self.send_error()

1 0

[flashproxy/master] Rename proxy_addr → remote_addr because it could be a proxy or a client.
by dcf＠torproject.org 20 Dec '12

20 Dec '12

commit fe80b0fd55a2a5a0c091edb6aadf61595a144667 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 19 18:31:17 2012 -0800 Rename proxy_addr → remote_addr because it could be a proxy or a client. --- facilitator/facilitator | 29 +++++++++++++++++++++++++++-- facilitator/facilitator.cgi | 10 +++++----- 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/facilitator/facilitator b/facilitator/facilitator index af2c04c..bc47281 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -234,7 +234,30 @@ class Handler(SocketServer.StreamRequestHandler): print >> self.wfile, "ERROR" def do_GET(self, params): - reg = REGS.fetch() + # Get the proxy's address so we know what kind of client to give it + # (IPv4 or IPv6). + proxy_spec = fac.param_first("FROM", params) + if proxy_spec is None: + log(u"GET missing FROM param") + self.send_error() + return False + try: + _, _, af = fac.parse_addr_spec_af(proxy_spec, defport=0) + except ValueError, e: + log(u"syntax error in proxy address %s: %s" % (safe_str(repr(proxy_spec)), safe_str(repr(str(e))))) + self.send_error() + return False + + if af == socket.AF_INET: + regs = REGS_IPV4 + elif af == socket.AF_INET6: + regs = REGS_IPV6 + else: + log(u"unknown address family %d in proxy address %s" % (af, safe_str(repr(proxy_spec)))) + self.send_error() + return False + + reg = regs.fetch() if reg: log(u"proxy gets %s, relay %s (now %d)" % (safe_str(unicode(reg)), options.relay_spec, len(REGS))) @@ -273,7 +296,9 @@ class Handler(SocketServer.StreamRequestHandler): class Server(SocketServer.ThreadingMixIn, SocketServer.TCPServer): allow_reuse_address = True -REGS = RegSet() +# Separate pools for IPv4 and IPv6 clients. +REGS_IPV4 = RegSet() +REGS_IPV6 = RegSet() def main(): opts, args = getopt.gnu_getopt(sys.argv[1:], "dhl:p:r:", diff --git a/facilitator/facilitator.cgi b/facilitator/facilitator.cgi index f35c9a3..c21e67d 100755 --- a/facilitator/facilitator.cgi +++ b/facilitator/facilitator.cgi @@ -17,10 +17,10 @@ Status: %d\r sys.exit() method = os.environ.get("REQUEST_METHOD") -proxy_addr = (os.environ.get("REMOTE_ADDR"), None) +remote_addr = (os.environ.get("REMOTE_ADDR"), None) path_info = os.environ.get("PATH_INFO") or "/" -if not method or not proxy_addr[0]: +if not method or not remote_addr[0]: exit_error(400) fs = cgi.FieldStorage() @@ -29,7 +29,7 @@ def do_get(): if path_info != "/": exit_error(400) try: - reg = fac.get_reg(FACILITATOR_ADDR, proxy_addr) or "" + reg = fac.get_reg(FACILITATOR_ADDR, remote_addr) or "" except: exit_error(500) # Allow XMLHttpRequest from any domain. http://www.w3.org/TR/cors/. @@ -49,10 +49,10 @@ def do_post(): exit_error(400) client_spec = client_specs[0].strip() try: - client_addr = fac.parse_addr_spec(client_spec, defhost=proxy_addr[0]) + client_addr = fac.parse_addr_spec(client_spec, defhost=remote_addr[0]) except ValueError: exit_error(400) - if not fac.put_reg(FACILITATOR_ADDR, client_addr, proxy_addr): + if not fac.put_reg(FACILITATOR_ADDR, client_addr, remote_addr): exit_error(500) print """\ Status: 200\r

1 0