- tor-commits - lists.torproject.org

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

12 Jan '12

commit 54c4fc057ff6197b076ef52d6152f56f732609f0 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 12 19:45:29 2012 +0000 Update translations for vidalia_help --- he/netview.po | 22 ++++++++++++++-------- it/troubleshooting.po | 6 +++++- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/he/netview.po b/he/netview.po index d54fd6b..a5f4c4b 100644 --- a/he/netview.po +++ b/he/netview.po @@ -1,12 +1,13 @@ # # Translators: +# Something Another <roeyjobsyud(a)gmail.com>, 2012. msgid "" 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: 2010-11-30 05:03+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2012-01-12 19:39+0000\n" +"Last-Translator: Something Another <roeyjobsyud(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" @@ -17,7 +18,7 @@ msgstr "" #. type: Content of: <html><body><h1> #: en/netview.html:16 msgid "Network Viewer" -msgstr "" +msgstr "צפיית רשת" #. type: Content of: <html><body><p> #: en/netview.html:20 @@ -25,6 +26,7 @@ msgid "" "The network viewer lets you see relays in the Tor network and where your " "traffic is going." msgstr "" +"הצפיית רשת נותנת לך לראות את התדרים המועברים בTor .ולאן התעבורה שלך הולכת" #. type: Content of: <html><body> #: en/netview.html:25 @@ -34,7 +36,7 @@ msgstr "" #. type: Content of: <html><body><h3> #: en/netview.html:26 msgid "Overview" -msgstr "" +msgstr "צפייה" #. type: Content of: <html><body><p> #: en/netview.html:28 @@ -45,16 +47,20 @@ msgid "" "then sent as a <i>stream</i> through that circuit. For efficiency, multiple " "streams may share the same circuit." msgstr "" +"מתי שאתה רוצה לתקשר בצורה אנונימית דרך Tor (לדוגמא, לאתר מסויים), Tor בונה " +"לך מנהרה, או <i>מעגל</i>, של חיבורים מוצפנים דרך סריה של מסרים תקשורתיים " +"ברשת. תעבורת התוכניות שלך נשלחת כ<i>זרם</i> דרך המעגל. למען היעילות, זרמים " +"רבים עלולים לחלוק את אותו מעגל." #. type: Content of: <html><body> #: en/netview.html:35 msgid "<a name=\"netmap\"/>" -msgstr "" +msgstr "<a name=\"netmap\"/>" #. type: Content of: <html><body><h3> #: en/netview.html:36 msgid "Network Map" -msgstr "" +msgstr "מפת רשת" #. type: Content of: <html><body><p> #: en/netview.html:38 @@ -183,7 +189,7 @@ msgstr "" #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:138 msgid "<b>Location</b>" -msgstr "" +msgstr "<b>מיקום</b>" #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:139 @@ -193,7 +199,7 @@ msgstr "" #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:142 msgid "<b>IP Address</b>" -msgstr "" +msgstr "<b>כתובת IP</b>" #. type: Content of: <html><body><p><table><tr><td> #: en/netview.html:143 diff --git a/it/troubleshooting.po b/it/troubleshooting.po index 7dded64..92e6df3 100644 --- a/it/troubleshooting.po +++ b/it/troubleshooting.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-08-03 15:49-0300\n" -"PO-Revision-Date: 2012-01-12 19:12+0000\n" +"PO-Revision-Date: 2012-01-12 19:17+0000\n" "Last-Translator: usagetta <usa_getta(a)libero.it>\n" "Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n" "MIME-Version: 1.0\n" @@ -60,6 +60,10 @@ msgid "" "another Tor process running. Check your list of running process and stop the" " previous Tor process, if you find one. Then, try running Tor again." msgstr "" +"Un'altra possibile ragione per cui Tor non parte e' perche' c'è un'altra " +"sessione di Tor in funzione. Si controlli la lista dei processi in funzione " +"e, se si trova un altro processo Tor, si fermi il processo. A questo punto " +"si provi a far partire di nuovo Tor." # type: Content of: <html><body><p> #: en/troubleshooting.html:38

1 0

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

12 Jan '12

commit b3a5caa72c754ea34020643d4c4441bc3fdce2d7 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 12 19:45:23 2012 +0000 Update translations for vidalia --- he/vidalia_he.po | 50 +++++++++++++++++++++++++------------------------- 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/he/vidalia_he.po b/he/vidalia_he.po index 6880631..a3ded2f 100644 --- a/he/vidalia_he.po +++ b/he/vidalia_he.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-01-12 19:12+0000\n" +"PO-Revision-Date: 2012-01-12 19:25+0000\n" "Last-Translator: Something Another <roeyjobsyud(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -185,7 +185,7 @@ msgstr "אזהרה" msgctxt "AdvancedPage" msgid "You changed torrc path, would you like to restart Tor?" -msgstr "" +msgstr "שינית הגדרות בקונפיגורציית טור, רוצה לאתחל את Tor?" msgctxt "AdvancedPage" msgid "Tor Configuration File (torrc);;All Files (*)" @@ -197,7 +197,7 @@ msgstr "בחר קובץ עבור Tor socket path" msgctxt "AdvancedPage" msgid "Configure ControlPort automatically" -msgstr "" +msgstr "עשה קונפיגורצייה אוטומטית עבור \"שליטת פורטים\"" msgctxt "AdvancedPage" msgid "" @@ -2125,11 +2125,11 @@ msgstr "" msgctxt "MainWindow" msgid "(probably Telnet)" -msgstr "" +msgstr "(יתכן (Telnet" msgctxt "MainWindow" msgid "(probably an email client)" -msgstr "" +msgstr "(כנראה לקוח אימייל)" msgctxt "MainWindow" msgid "" @@ -2705,11 +2705,11 @@ msgstr "" msgctxt "NetworkPage" msgid "HTTP" -msgstr "" +msgstr "HTTP" msgctxt "NetworkPage" msgid "HTTP / HTTPS" -msgstr "" +msgstr "HTTP / HTTPS" msgctxt "Policy" msgid "accept" @@ -3282,11 +3282,11 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Your Tor Software is Out-of-date" -msgstr "" +msgstr "Tor פג תוקף" msgctxt "StatusEventWidget" msgid "Connected to the Tor Network" -msgstr "" +msgstr "התחבר אל רשת Tor" msgctxt "StatusEventWidget" msgid "" @@ -3322,7 +3322,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Your Computer's Clock is Potentially Incorrect" -msgstr "" +msgstr "השעה של המחשב שלך עלולה להיות שגיאה" msgctxt "StatusEventWidget" msgid "" @@ -3341,7 +3341,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Potentially Dangerous Connection!" -msgstr "" +msgstr "חיבור העלול להיות מסוכן!." msgctxt "StatusEventWidget" msgid "" @@ -3353,7 +3353,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Unknown SOCKS Protocol" -msgstr "" +msgstr "SOCKS Protocol לא ידועים" msgctxt "StatusEventWidget" msgid "" @@ -3386,7 +3386,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "DNS Hijacking Detected" -msgstr "" +msgstr "נמצא DNS Hijacking" msgctxt "StatusEventWidget" msgid "" @@ -3540,7 +3540,7 @@ msgstr "ערבול סיסמת שליטה נכשל." msgctxt "TorrcDialog" msgid "Editing torrc" -msgstr "" +msgstr "ערוך torrc" msgctxt "TorrcDialog" msgid "" @@ -3550,15 +3550,15 @@ msgstr "" msgctxt "TorrcDialog" msgid "Cut" -msgstr "" +msgstr "גזור" msgctxt "TorrcDialog" msgid "Copy" -msgstr "" +msgstr "העתק" msgctxt "TorrcDialog" msgid "Paste" -msgstr "" +msgstr "הדבק" msgctxt "TorrcDialog" msgid "Undo" @@ -3570,35 +3570,35 @@ 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\"" -msgstr "" +msgstr "אין בחירות. אנא בחר טקסט מסוים, או שבחר ב\"החל הכל\"" msgctxt "TorrcDialog" msgid "Error at line %1: \"%2\"" -msgstr "" +msgstr "שגיאה בשורה %1:\"%2\"" msgctxt "TorrcDialog" msgid "Error" -msgstr "" +msgstr "שגיאה" msgctxt "TorrcDialog" msgid "An error ocurred while opening torrc file" -msgstr "" +msgstr "שגיאה מסויימת התרחשה בעת פתיחת קובץ torrc" msgctxt "UPNPControl" msgid "Success"

1 0

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

12 Jan '12

commit c78c137993830ad62df4838b9025af227394fe48 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 12 19:15:24 2012 +0000 Update translations for vidalia_help --- it/troubleshooting.po | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/it/troubleshooting.po b/it/troubleshooting.po index c5e461f..7dded64 100644 --- a/it/troubleshooting.po +++ b/it/troubleshooting.po @@ -1,13 +1,14 @@ # # Translators: # Luca <luca(a)jeckodevelopment.it>, 2011. +# usagetta <usa_getta(a)libero.it>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-08-03 15:49-0300\n" -"PO-Revision-Date: 2011-11-30 13:34+0000\n" -"Last-Translator: jeckodevelopment <luca(a)jeckodevelopment.it>\n" +"PO-Revision-Date: 2012-01-12 19:12+0000\n" +"Last-Translator: usagetta <usa_getta(a)libero.it>\n" "Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,6 +29,10 @@ msgid "" "having, check out our website at <i>www.vidalia-project.net</i> for more " "support and information. <a name=\"start\"/>" msgstr "" +"Di seguito una lista di problemi o domande che altri utenti hanno avuto " +"utilizzando Tor. Se non trovate nessun riferimento al particolare problema " +"che avete, controllate il nostro sito web <i>www.vidalia-project.net</i> per" +" ulteriore supporto o informazioni. <a name=\"start\"/>" # type: Content of: <html><body><h3> #: en/troubleshooting.html:25 @@ -42,6 +47,11 @@ msgid "" "Vidalia where Tor is located by updating the <i>Tor Executable</i> option in" " the <a href=\"config.html#general\">general configuration settings</a>." msgstr "" +"La ragione piu' probabile per cui Vidalia non puo' far partire Tor e' " +"perche' Vidalia cerca l'installazione di Tor nella directory sbagliata. Si " +"puo' indicare a Vidalia dove si trova Tor aggiornando l'opzione <i>Tor " +"Executable</i> in <a href=\"config.html#general\">impostazioni generali di " +"configurazione</a>." # type: Content of: <html><body><p> #: en/troubleshooting.html:33

1 0

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

12 Jan '12

commit a491b16d1bed21bb94edf96d44fb149eba79a4df Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 12 19:15:19 2012 +0000 Update translations for vidalia --- he/vidalia_he.po | 59 ++++++++++++++++++++++++++++------------------------- 1 files changed, 31 insertions(+), 28 deletions(-) diff --git a/he/vidalia_he.po b/he/vidalia_he.po index c03ba6b..6880631 100644 --- a/he/vidalia_he.po +++ b/he/vidalia_he.po @@ -2,13 +2,14 @@ # Translators: # Amichay P. K. <am1chay.p.k(a)gmail.com>, 2011. # runasand <runa.sandvik(a)gmail.com>, 2011. +# Something Another <roeyjobsyud(a)gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2011-10-10 09:24+0000\n" -"Last-Translator: Amichay <am1chay.p.k(a)gmail.com>\n" +"PO-Revision-Date: 2012-01-12 19:12+0000\n" +"Last-Translator: Something Another <roeyjobsyud(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" @@ -188,11 +189,11 @@ msgstr "" msgctxt "AdvancedPage" msgid "Tor Configuration File (torrc);;All Files (*)" -msgstr "" +msgstr "קובץ קונפיגורציית Tor (torrc);;כל הקבצים (*)" msgctxt "AdvancedPage" msgid "Select a file to use for Tor socket path" -msgstr "" +msgstr "בחר קובץ עבור Tor socket path" msgctxt "AdvancedPage" msgid "Configure ControlPort automatically" @@ -705,15 +706,15 @@ msgstr "גואטמאלה" msgctxt "CountryInfo" msgid "Guinea" -msgstr "" +msgstr "Guinea" msgctxt "CountryInfo" msgid "Guinea-Bissau" -msgstr "" +msgstr "Guinea-Bissau" msgctxt "CountryInfo" msgid "Guyana" -msgstr "" +msgstr "Guyana" msgctxt "CountryInfo" msgid "Hong Kong" @@ -757,7 +758,7 @@ msgstr "קניה" msgctxt "CountryInfo" msgid "Kiribati" -msgstr "" +msgstr "Kiribati" msgctxt "CountryInfo" msgid "Kuwait" @@ -781,7 +782,7 @@ msgstr "לבנון" msgctxt "CountryInfo" msgid "Lesotho" -msgstr "" +msgstr "Lesotho" msgctxt "CountryInfo" msgid "Liberia" @@ -793,7 +794,7 @@ msgstr "ליכטנשטיין" msgctxt "CountryInfo" msgid "Lithuania" -msgstr "" +msgstr "Lithuania" msgctxt "CountryInfo" msgid "Luxembourg" @@ -809,7 +810,7 @@ msgstr "מדגסקר" msgctxt "CountryInfo" msgid "Malawi" -msgstr "" +msgstr "Malawi" msgctxt "CountryInfo" msgid "Malaysia" @@ -825,7 +826,7 @@ msgstr "מלטה" msgctxt "CountryInfo" msgid "Marshall Islands" -msgstr "" +msgstr "Marshall Islands" msgctxt "CountryInfo" msgid "Mauritania" @@ -869,7 +870,7 @@ msgstr "נמיביה" msgctxt "CountryInfo" msgid "Nauru" -msgstr "" +msgstr "Nauru" msgctxt "CountryInfo" msgid "Nepal" @@ -1165,7 +1166,7 @@ msgstr "זימבבואה" msgctxt "CountryInfo" msgid "Zaire" -msgstr "" +msgstr "Zaire" msgctxt "CountryInfo" msgid "Albania" @@ -1269,7 +1270,7 @@ msgstr "שלח דו\"ח התרסקות" msgctxt "CrashReportDialog" msgid "Vidalia encountered an error and needed to close" -msgstr "" +msgstr "Vidalia נתקל בשגיאה וחייב להסגר" msgctxt "CrashReportDialog" msgid "Restart Vidalia" @@ -1287,7 +1288,7 @@ msgctxt "CrashReportDialog" msgid "" "We were unable to automatically restart Vidalia. Please restart Vidalia " "manually." -msgstr "" +msgstr "לא יכלנו לאתחל את Vidalia. אנא אתחל אותו ידנית." msgctxt "CrashReportDialog" msgid "Please fill a ticket in:" @@ -2083,6 +2084,8 @@ msgid "" "application's configuration and use only encrypted protocols, such as SSL, " "if possible." msgstr "" +"כל מה שנשלח דרך חיבור זה יכול להיות והיה מועקב. אנא בדוק את קונפיגורציית " +"התוכניות שלך והשתמש בפרוטוקולים מוצפנים, כגון SSL, אם מתאפשר." msgctxt "MainWindow" msgid "failed (%1)" @@ -2388,15 +2391,15 @@ msgstr "שמוראוטומטית הודעות חדשות לקובץ" msgctxt "MessageLog" msgid "Basic" -msgstr "" +msgstr "בסיסי" msgctxt "MessageLog" msgid "Tor Status" -msgstr "" +msgstr "סטטוס Tor" msgctxt "MessageLog" msgid "Advanced" -msgstr "" +msgstr "מתקדם" msgctxt "MessageLog" msgid "Always Save New Log Messages" @@ -2682,19 +2685,19 @@ msgstr "לחץ על \"עזרה\" לקבלת מידע נוסף על דרכים ש msgctxt "NetworkPage" msgid "Address:" -msgstr "" +msgstr "כתובת:" msgctxt "NetworkPage" msgid "Type:" -msgstr "" +msgstr "סוג:" msgctxt "NetworkPage" msgid "You must select the proxy type." -msgstr "" +msgstr "אתה חייב לבחור את סוג הפרוקסי." msgctxt "NetworkPage" msgid "SOCKS 4" -msgstr "" +msgstr "SOCKS 4" msgctxt "NetworkPage" msgid "SOCKS 5" @@ -3136,7 +3139,7 @@ msgstr "<a href=\"bridges.finding\">מי השתמש בגשר שלי?</a>" msgctxt "ServerPage" msgid "<a href=\"#bridgeHelp\">What's this?</a>" -msgstr "" +msgstr "<a href=\"#bridgeHelp\">מה זה?</a>" msgctxt "ServerPage" msgid "Automatically distribute my bridge address" @@ -3244,15 +3247,15 @@ msgstr "" msgctxt "StatusEventWidget" msgid "The Tor Software is Running" -msgstr "" +msgstr "Tor רץ כעת" msgctxt "StatusEventWidget" msgid "You are currently running version \"%1\" of the Tor software." -msgstr "" +msgstr "אתה מריץ את גרסאת \"%1\" של Tor כעת." msgctxt "StatusEventWidget" msgid "The Tor Software is not Running" -msgstr "" +msgstr "\"tor\" לא רץ כעת" msgctxt "StatusEventWidget" msgid "" @@ -3293,7 +3296,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Tor Software Error" -msgstr "" +msgstr "שגיאת תוכנה " msgctxt "StatusEventWidget" msgid ""

1 0

[stem/master] Making lsof cwd checks account for permissions
by atagar＠torproject.org 12 Jan '12

12 Jan '12

commit 479a620ee8d3351e07d1bc86bec3f1107c04cc69 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jan 12 09:17:20 2012 -0800 Making lsof cwd checks account for permissions With the anti-debugger tor change the /proc/<pid>/cwd symlink becomes only readable by root. This causes lsof queries for a process' cwd to return the proc path with a message saying that permission is denied, and the sys tools misparsed that as meaning that the cwd _was_ the proc path. --- stem/util/system.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/stem/util/system.py b/stem/util/system.py index 8eced97..f58f698 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -451,7 +451,13 @@ def get_cwd(pid): results = call(GET_CWD_LSOF % pid) if results and len(results) == 2 and results[1].startswith("n/"): - return results[1][1:].strip() + lsof_result = results[1][1:].strip() + + # If we lack read permissions for the cwd then it returns... + # p2683 + # n/proc/2683/cwd (readlink: Permission denied) + + if not " " in lsof_result: return lsof_result else: log.debug("%s we got unexpected output from lsof: %s" % (logging_prefix, results))

1 0

[stem/master] Making integ account for DisableDebuggerAttachment
by atagar＠torproject.org 12 Jan '12

12 Jan '12

commit 27e84652f1bd97747a1360f7632783923cf762b2 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jan 12 09:51:40 2012 -0800 Making integ account for DisableDebuggerAttachment Stem's system integration tests failed with tor's new version because DisableDebuggerAttachment prevents cwd and port lookups. Skipping those tests when that option is set. --- test/integ/util/system.py | 35 ++++++++++++++++++++++++++++++----- test/runner.py | 21 +++++++++++++++++++++ 2 files changed, 51 insertions(+), 5 deletions(-) diff --git a/test/integ/util/system.py b/test/integ/util/system.py index 4f78099..70d73ae 100644 --- a/test/integ/util/system.py +++ b/test/integ/util/system.py @@ -130,10 +130,13 @@ class TestSystem(unittest.TestCase): Tests the get_pid_by_name function with a lsof response. """ + runner = test.runner.get_runner() if self.is_extra_tor_running: self.skipTest("(multiple tor instances)") elif not stem.util.system.is_available("lsof"): self.skipTest("(lsof unavailable)") + elif runner.is_debugging_prevented(): + self.skipTest("(DisableDebuggerAttachment is set)") lsof_prefix = stem.util.system.GET_PID_BY_NAME_LSOF % "" self._run_pid_test(lsof_prefix, stem.util.system.get_pid_by_name, "tor") @@ -143,10 +146,13 @@ class TestSystem(unittest.TestCase): Checks general usage of the stem.util.system.get_pid_by_port function. """ + runner = test.runner.get_runner() if not self._has_port(): self.skipTest("(test instance has no port)") + elif runner.is_debugging_prevented(): + self.skipTest("(DisableDebuggerAttachment is set)") - tor_pid, tor_port = test.runner.get_runner().get_pid(), test.runner.CONTROL_PORT + tor_pid, tor_port = runner.get_pid(), test.runner.CONTROL_PORT self.assertEquals(tor_pid, stem.util.system.get_pid_by_port(tor_port)) self.assertEquals(None, stem.util.system.get_pid_by_port(99999)) @@ -155,11 +161,15 @@ class TestSystem(unittest.TestCase): Tests the get_pid_by_port function with a netstat response. """ + runner = test.runner.get_runner() if not self._has_port(): self.skipTest("(test instance has no port)") elif not stem.util.system.is_available("netstat"): self.skipTest("(netstat unavailable)") - elif stem.util.system.is_bsd(): self.skipTest("(linux only)") + elif stem.util.system.is_bsd(): + self.skipTest("(linux only)") + elif runner.is_debugging_prevented(): + self.skipTest("(DisableDebuggerAttachment is set)") netstat_cmd = stem.util.system.GET_PID_BY_PORT_NETSTAT self._run_pid_test(netstat_cmd, stem.util.system.get_pid_by_port, test.runner.CONTROL_PORT) @@ -169,11 +179,15 @@ class TestSystem(unittest.TestCase): Tests the get_pid_by_port function with a sockstat response. """ + runner = test.runner.get_runner() if not self._has_port(): self.skipTest("(test instance has no port)") elif not stem.util.system.is_available("sockstat"): self.skipTest("(sockstat unavailable)") - elif not stem.util.system.is_bsd(): self.skipTest("(bsd only)") + elif not stem.util.system.is_bsd(): + self.skipTest("(bsd only)") + elif runner.is_debugging_prevented(): + self.skipTest("(DisableDebuggerAttachment is set)") sockstat_prefix = stem.util.system.GET_PID_BY_PORT_SOCKSTAT % "" self._run_pid_test(sockstat_prefix, stem.util.system.get_pid_by_port, test.runner.CONTROL_PORT) @@ -183,10 +197,13 @@ class TestSystem(unittest.TestCase): Tests the get_pid_by_port function with a lsof response. """ + runner = test.runner.get_runner() if not self._has_port(): self.skipTest("(test instance has no port)") elif not stem.util.system.is_available("lsof"): self.skipTest("(lsof unavailable)") + elif runner.is_debugging_prevented(): + self.skipTest("(DisableDebuggerAttachment is set)") lsof_cmd = stem.util.system.GET_PID_BY_PORT_LSOF self._run_pid_test(lsof_cmd, stem.util.system.get_pid_by_port, test.runner.CONTROL_PORT) @@ -211,6 +228,10 @@ class TestSystem(unittest.TestCase): """ runner = test.runner.get_runner() + + if runner.is_debugging_prevented(): + self.skipTest("(DisableDebuggerAttachment is set)") + self.assertEquals(runner.get_tor_cwd(), stem.util.system.get_cwd(runner.get_pid())) self.assertEquals(None, stem.util.system.get_cwd(99999)) @@ -219,14 +240,16 @@ class TestSystem(unittest.TestCase): Tests the get_pid_by_cwd function with a pwdx response. """ + runner = test.runner.get_runner() if not stem.util.system.is_available("pwdx"): self.skipTest("(pwdx unavailable)") + elif runner.is_debugging_prevented(): + self.skipTest("(DisableDebuggerAttachment is set)") # filter the call function to only allow this command pwdx_prefix = stem.util.system.GET_CWD_PWDX % "" stem.util.system.CALL_MOCKING = lambda cmd: cmd.startswith(pwdx_prefix) - runner = test.runner.get_runner() runner_pid, tor_cwd = runner.get_pid(), runner.get_tor_cwd() self.assertEquals(tor_cwd, stem.util.system.get_cwd(runner_pid)) @@ -235,14 +258,16 @@ class TestSystem(unittest.TestCase): Tests the get_pid_by_cwd function with a lsof response. """ + runner = test.runner.get_runner() if not stem.util.system.is_available("lsof"): self.skipTest("(lsof unavailable)") + elif runner.is_debugging_prevented(): + self.skipTest("(DisableDebuggerAttachment is set)") # filter the call function to only allow this command lsof_prefix = "lsof -a -p " stem.util.system.CALL_MOCKING = lambda cmd: cmd.startswith(lsof_prefix) - runner = test.runner.get_runner() runner_pid, tor_cwd = runner.get_pid(), runner.get_tor_cwd() self.assertEquals(tor_cwd, stem.util.system.get_cwd(runner_pid)) diff --git a/test/runner.py b/test/runner.py index cfe6dbb..ea2a60c 100644 --- a/test/runner.py +++ b/test/runner.py @@ -254,6 +254,27 @@ class Runner: return is_running + def is_debugging_prevented(self): + """ + Checks if tor's 'DisableDebuggerAttachment' option is set. This feature has + a lot of adverse side effects as per... + https://trac.torproject.org/projects/tor/ticket/3313 + + Returns: + True if debugger attachment is disallowd, False otherwise, and None if + tor can't be checked + """ + + # TODO: replace higher level GETCONF query when we have a controller class + control_socket = self.get_tor_socket() + if control_socket == None: return None + + control_socket.send("GETCONF DisableDebuggerAttachment") + getconf_response = control_socket.recv() + control_socket.close() + + return str(getconf_response) == "DisableDebuggerAttachment=1" + def get_test_dir(self): """ Provides the absolute path for our testing directory.

1 0

[metrics-web/master] Speed up relays-by-country aggregation.
by karsten＠torproject.org 12 Jan '12

12 Jan '12

commit cc3afcbd79c441ab56f61804f8cab69589628970 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jan 12 17:26:36 2012 +0100 Speed up relays-by-country aggregation. --- db/tordir.sql | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/db/tordir.sql b/db/tordir.sql index 4e4e4b5..6d3b617 100644 --- a/db/tordir.sql +++ b/db/tordir.sql @@ -531,15 +531,22 @@ CREATE OR REPLACE FUNCTION refresh_relay_countries() RETURNS INTEGER AS $$ (date, country, relays) SELECT date, country, relays / count AS relays FROM ( - SELECT DATE(validafter), + SELECT date, COALESCE(lower((geoip_lookup(address)).country), ''zz'') AS country, - COUNT(*) AS relays - FROM statusentry - WHERE isrunning = TRUE - AND validafter >= ''' || min_date || ''' - AND validafter < ''' || max_date || ''' - AND DATE(validafter) IN (SELECT date FROM updates) + SUM(relays) AS relays + FROM ( + SELECT DATE(validafter) AS date, + fingerprint, + address, + COUNT(*) AS relays + FROM statusentry + WHERE isrunning = TRUE + AND validafter >= ''' || min_date || ''' + AND validafter < ''' || max_date || ''' + AND DATE(validafter) IN (SELECT date FROM updates) + GROUP BY 1, 2, 3 + ) c GROUP BY 1, 2 ) b NATURAL JOIN relay_statuses_per_day';

1 0

r25305: {website} fix org name and update mirror status. (in website/trunk: . include)
by Andrew Lewman 12 Jan '12

12 Jan '12

Author: phobos Date: 2012-01-12 16:23:59 +0000 (Thu, 12 Jan 2012) New Revision: 25305 Modified: website/trunk/include/mirrors-table.wmi website/trunk/update-mirrors.pl Log: fix org name and update mirror status. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2012-01-11 17:45:34 UTC (rev 25304) +++ website/trunk/include/mirrors-table.wmi 2012-01-12 16:23:59 UTC (rev 25305) @@ -69,6 +69,23 @@ <tr> + <td>EE</td> + + <td>CyberSIDE</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://cyberside.net.ee/tor/">http</a></td> + <td><a href="http://cyberside.planet.ee/tor/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>IS</td> <td>torproject.is</td> @@ -171,6 +188,23 @@ <tr> + <td>AT</td> + + <td>FoDT.IT</td> + + <td>Up to date</td> + + <td><a href="ftp://ftp.fodt.it/pub/mirror/tor/">ftp</a></td> + <td><a href="http://tor.fodt.it/dist/">http</a></td> + <td><a href="http://tor.fodt.it/">http</a></td> + <td><a href="https://tor.fodt.it/dist/">https</a></td> + <td><a href="https://tor.fodt.it/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>FR</td> <td>BarkerJr</td> @@ -307,9 +341,26 @@ <tr> + <td>US</td> + + <td>NW Linux</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://torproject.nwlinux.us/dist/">http</a></td> + <td><a href="http://torproject.nwlinux.us/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td><a href="rsync://nwlinux.us/tor-web">rsync</a></td> +</tr> + +<tr> + <td>DE</td> - <td></td> + <td>borgmann.tv</td> <td>Up to date</td> @@ -392,23 +443,6 @@ <tr> - <td>IS</td> - - <td>TheOnionRouter</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://theonionrouter.com/dist/">http</a></td> - <td><a href="http://theonionrouter.com/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>SE</td> <td>homosu</td> @@ -477,15 +511,15 @@ <tr> - <td>EE</td> + <td>IS</td> - <td>CyberSIDE</td> + <td>TheOnionRouter</td> - <td>Up to date</td> + <td>Out of date</td> <td> - </td> - <td><a href="http://cyberside.net.ee/tor/">http</a></td> - <td><a href="http://cyberside.planet.ee/tor/">http</a></td> + <td><a href="http://theonionrouter.com/dist/">http</a></td> + <td><a href="http://theonionrouter.com/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -630,40 +664,6 @@ <tr> - <td>AT</td> - - <td>FoDT.IT</td> - - <td>Unknown</td> - - <td><a href="ftp://ftp.fodt.it/pub/mirror/tor/">ftp</a></td> - <td><a href="http://tor.fodt.it/dist/">http</a></td> - <td><a href="http://tor.fodt.it/">http</a></td> - <td><a href="https://tor.fodt.it/dist/">https</a></td> - <td><a href="https://tor.fodt.it/">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>US</td> - - <td>NW Linux</td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://torproject.nwlinux.us/dist/">http</a></td> - <td><a href="http://torproject.nwlinux.us/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td><a href="rsync://nwlinux.us/tor-web">rsync</a></td> -</tr> - -<tr> - <td>NL</td> <td></td> Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2012-01-11 17:45:34 UTC (rev 25304) +++ website/trunk/update-mirrors.pl 2012-01-12 16:23:59 UTC (rev 25305) @@ -824,7 +824,7 @@ }, mirror050 => { adminContact => "", - orgName => "", + orgName => "borgmann.tv", isoCC => "DE", subRegion => "", region => "DE",

1 0

[metrics-web/master] Tweak the relay-search query a bit.
by karsten＠torproject.org 12 Jan '12

12 Jan '12

commit b3b67567da69c9547a15fee02a5c54827b165532 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jan 12 14:50:40 2012 +0100 Tweak the relay-search query a bit. --- .../torproject/ernie/web/RelaySearchServlet.java | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/org/torproject/ernie/web/RelaySearchServlet.java b/src/org/torproject/ernie/web/RelaySearchServlet.java index 8d47667..512e25f 100644 --- a/src/org/torproject/ernie/web/RelaySearchServlet.java +++ b/src/org/torproject/ernie/web/RelaySearchServlet.java @@ -343,6 +343,7 @@ public class RelaySearchServlet extends HttpServlet { queryBuilder.append(timeInterval); queryBuilder.append("ORDER BY validafter DESC LIMIT 31) AND "); queryBuilder.append(conditionBuilder.toString()); + queryBuilder.append(timeInterval); queries.add(queryBuilder.toString()); }

1 0

[metrics-web/master] Fix statusentry trigger function.
by karsten＠torproject.org 12 Jan '12

12 Jan '12

commit e2e45b24a95e21bb8e1f1e2329c13c26014623ea Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jan 12 16:13:22 2012 +0100 Fix statusentry trigger function. --- db/tordir.sql | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/db/tordir.sql b/db/tordir.sql index bc93b45..4e4e4b5 100644 --- a/db/tordir.sql +++ b/db/tordir.sql @@ -98,9 +98,10 @@ DECLARE n_month INTEGER; BEGIN - v_year := extract(YEAR FROM new.validafter); - v_month := extract(MONTH FROM new.validafter); - tablename := 'statusentry_y' || v_year || 'm' || v_month; + v_year := extract(YEAR FROM NEW.validafter); + v_month := extract(MONTH FROM NEW.validafter); + tablename := 'statusentry_y' || v_year || 'm' || + TO_CHAR(NEW.validafter, 'mm'); EXECUTE 'SELECT relname FROM pg_class WHERE relname = '''|| tablename || '''' INTO selectresult; IF selectresult IS NULL THEN @@ -108,9 +109,11 @@ BEGIN n_year := extract(YEAR FROM nextmonth); n_month := extract(MONTH FROM nextmonth); EXECUTE 'CREATE TABLE ' || tablename || - ' ( CHECK ( validafter >= ''' || v_year || '-' || v_month || - '-01 00:00:00'' AND validafter < ''' || n_year || '-' || n_month || - '-01 00:00:00'') ) INHERITS (statusentry_all)'; + ' ( CHECK ( validafter >= ''' || v_year || '-' || + TO_CHAR(NEW.validafter, 'mm') || '-01 00:00:00'' ' || + 'AND validafter < ''' || n_year || '-' || + TO_CHAR(nextmonth, 'mm') || + '-01 00:00:00'') ) INHERITS (statusentry)'; EXECUTE 'ALTER TABLE ' || tablename || ' ADD CONSTRAINT ' || tablename || '_pkey PRIMARY KEY (validafter, fingerprint)'; EXECUTE 'CREATE INDEX ' || tablename || '_address ON ' || @@ -132,7 +135,7 @@ END; $$ LANGUAGE plpgsql; CREATE TRIGGER insert_statusentry_trigger - BEFORE INSERT ON statusentry_all + BEFORE INSERT ON statusentry FOR EACH ROW EXECUTE PROCEDURE statusentry_insert_trigger(); -- TABLE consensus

1 0