- tor-commits - lists.torproject.org

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

15 Oct '12

commit 410b79b8641d65132122d8ebe8d2e1f3271cd5ab Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 15 18:45:20 2012 +0000 Update translations for vidalia_help --- he/troubleshooting.po | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/he/troubleshooting.po b/he/troubleshooting.po index c62c0da..e806c23 100644 --- a/he/troubleshooting.po +++ b/he/troubleshooting.po @@ -12,7 +12,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: he\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" # type: Content of: <html><body><h1> #: en/troubleshooting.html:16 @@ -241,5 +241,3 @@ msgid "" "href=\"log.html\">message log</a> to see if Tor reported any errors while " "trying to exit." msgstr "" - -

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 15 Oct '12

15 Oct '12

commit d0bb97a77249804f4b424d5265061801ac68b4df Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 15 18:45:05 2012 +0000 Update translations for gettor --- he/gettor.po | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/he/gettor.po b/he/gettor.po index 261958b..a01015a 100644 --- a/he/gettor.po +++ b/he/gettor.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <aharonoosh1(a)gmail.com>, 2012. # <arab.with.nargila(a)gmail.com>, 2012. # Jacob Appelbaum <jacob(a)appelbaum.net>, 2009. msgid "" @@ -10,14 +11,14 @@ 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-05-16 09:17+0000\n" -"Last-Translator: Elifelet <arab.with.nargila(a)gmail.com>\n" +"PO-Revision-Date: 2012-10-15 18:41+0000\n" +"Last-Translator: aharonoosh <aharonoosh1(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" "Content-Transfer-Encoding: 8bit\n" "Language: he\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: lib/gettor/i18n.py:27 msgid "Hello, This is the \"GetTor\" robot." @@ -39,7 +40,7 @@ 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 "" +msgstr "אנחנו רק מבקשים תהליך משירותי דואר אלקטרוניים התומכים \"DKIM\",\n אשר היא תכונת מייל המאפשרת לנו לוודא הכתובת\n \"מתוך\" הקו הוא למעשה זה שנשלח בדואר." #: lib/gettor/i18n.py:39 msgid "" @@ -96,7 +97,7 @@ msgstr "" #: lib/gettor/i18n.py:71 msgid " List of supported locales:" -msgstr "" +msgstr "רשימה של אזורים נתמכים:" #: lib/gettor/i18n.py:73 msgid "Here is a list of all available languages:" @@ -115,7 +116,7 @@ msgid "" " gettor+pl(a)torproject.org: Polish\n" " gettor+ru(a)torproject.org: Russian\n" " gettor+zh(a)torproject.org: Chinese" -msgstr "" +msgstr " gettor+ar(a)torproject.org: ערבית\n gettor+de(a)torproject.org: גרמנית\n gettor+en(a)torproject.org: אנגלית\n gettor+es(a)torproject.org: ספרדית\n gettor+fa(a)torproject.org: פרסית (איראן)\n gettor+fr(a)torproject.org: צרפתית\n gettor+it(a)torproject.org: איטלקית\n gettor+nl(a)torproject.org: הולנדית\n gettor+pl(a)torproject.org: פולנית\n gettor+ru(a)torproject.org: רוסית\n gettor+zh(a)torproject.org: סינית" #: lib/gettor/i18n.py:87 msgid "If you select no language, you will receive the English version."

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 15 Oct '12

15 Oct '12

commit c42da526d69ca145747ce40d8467c29416ab510f Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 15 17:45:36 2012 +0000 Update translations for liveusb-creator --- he/he.po | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/he/he.po b/he/he.po index 9e5bb72..2ff2f5c 100644 --- a/he/he.po +++ b/he/he.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <aharonoosh1(a)gmail.com>, 2012. # Yaron Shahrabani <sh.yaron(a)gmail.com>, 2010. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-04-13 14:16+0200\n" -"PO-Revision-Date: 2012-10-03 18:09+0000\n" -"Last-Translator: Tor Project <tor-assistants(a)torproject.org>\n" +"PO-Revision-Date: 2012-10-15 17:26+0000\n" +"Last-Translator: aharonoosh <aharonoosh1(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" @@ -42,7 +43,7 @@ msgstr "שגיאה לא ניתן להגדיר את התווית או לקבל א #: ../liveusb/gui.py:276 #, python-format msgid "Installation complete! (%s)" -msgstr "" +msgstr "ההתקנה הושלמה! (%s)" #: ../liveusb/gui.py:281 msgid "LiveUSB creation failed!" @@ -53,11 +54,11 @@ msgid "" "Warning: This tool needs to be run as an Administrator. To do this, right " "click on the icon and open the Properties. Under the Compatibility tab, " "check the \"Run this program as an administrator\" box." -msgstr "" +msgstr "אזהרה: כלי זה צריך להפעיל בAdministrator. כדי לעשות זאת, לחץ לחיצה ימנית על הסמל ולפתוח את המאפיינים. בכרטיסיית התאימות, סמן את התיבה הפעל תכנית זו בAdministrator\"." #: ../liveusb/gui.py:413 msgid "Unable to find any USB drive" -msgstr "" +msgstr "לא ניתן למצוא כונן USB כלשהו" #: ../liveusb/gui.py:521 msgid "" @@ -72,11 +73,11 @@ msgstr "" #: ../liveusb/gui.py:533 msgid "Partition is FAT16; Restricting overlay size to 2G" -msgstr "" +msgstr "מחיצה מהסוג FAT16; גודל הגבלת כיסוי ל2G" #: ../liveusb/gui.py:577 msgid "Persistent Storage" -msgstr "" +msgstr "אחסון מתמשך" #: ../liveusb/gui.py:586 msgid "Installation complete!"

1 0

r25846: {website} update mirrors. (in website/trunk: . include)
by Andrew Lewman 15 Oct '12

15 Oct '12

Author: phobos Date: 2012-10-15 16:49:21 +0000 (Mon, 15 Oct 2012) New Revision: 25846 Modified: website/trunk/include/mirrors-table.wmi website/trunk/update-mirrors.pl Log: update mirrors. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2012-10-15 16:30:27 UTC (rev 25845) +++ website/trunk/include/mirrors-table.wmi 2012-10-15 16:49:21 UTC (rev 25846) @@ -1,15 +1,15 @@ <tr> - <td>DE</td> + <td>INT</td> - <td></td> + <td>CoralCDN</td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.lightning-bolt.net/dist/">http</a></td> - <td><a href="http://torproject.lightning-bolt.net/">http</a></td> + <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> + <td><a href="http://www.torproject.org.nyud.net/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -18,32 +18,32 @@ <tr> - <td>TN</td> + <td>NL</td> - <td></td> + <td>CCC</td> <td>Up to date</td> <td> - </td> + <td><a href="http://tor.ccc.de/dist/">http</a></td> + <td><a href="http://tor.ccc.de/">http</a></td> <td> - </td> - <td><a href="http://torproject.antagonism.org/">http</a></td> <td> - </td> - <td><a href="https://torproject.antagonism.org/">https</a></td> <td> - </td> <td> - </td> </tr> <tr> - <td>US</td> + <td>FR</td> - <td>Quintex</td> + <td>LazyTiger</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tormirror.quintex.com/dist/">http</a></td> - <td><a href="http://tormirror.quintex.com/">http</a></td> + <td><a href="http://tor.taiga-san.net/dist/">http</a></td> + <td><a href="http://tor.taiga-san.net/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -52,15 +52,15 @@ <tr> - <td>PT</td> + <td>DE</td> - <td>5ª Coluna</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.pt/dist/">http</a></td> - <td><a href="http://torproject.pt/">http</a></td> + <td><a href="http://torproject.lightning-bolt.net/dist/">http</a></td> + <td><a href="http://torproject.lightning-bolt.net/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -69,15 +69,15 @@ <tr> - <td>NL</td> + <td>PT</td> - <td>CCC</td> + <td>5ª Coluna</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.ccc.de/dist/">http</a></td> - <td><a href="http://tor.ccc.de/">http</a></td> + <td><a href="http://torproject.pt/dist/">http</a></td> + <td><a href="http://torproject.pt/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -86,23 +86,6 @@ <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> @@ -239,74 +222,6 @@ <tr> - <td>AT</td> - - <td>FoDT</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.fodt.co.at/dist/">http</a></td> - <td><a href="http://tor.fodt.co.at/">http</a></td> - <td><a href="https://tor.fodt.co.at/dist/">https</a></td> - <td><a href="https://tor.fodt.co.at/">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>US</td> - - <td>hessmo</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://mirror.hessmo.com/tor/dist/">http</a></td> - <td><a href="http://mirror.hessmo.com/tor/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>RO</td> - - <td>me0w.cc</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.me0w.cc/dist/">http</a></td> - <td><a href="http://tor.me0w.cc/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>LT</td> - - <td></td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.vesta.nu/dist/">http</a></td> - <td><a href="http://tor.vesta.nu/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>DE</td> <td></td> @@ -392,19 +307,19 @@ <tr> - <td>US</td> + <td>DE</td> - <td></td> + <td>factor.cc</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.mirrors.samwhited.com/dist/">http</a></td> - <td><a href="http://tor.mirrors.samwhited.com/">http</a></td> - <td><a href="https://tor.mirrors.samwhited.com/dist/">https</a></td> - <td><a href="https://tor.mirrors.samwhited.com/">https</a></td> + <td><a href="http://tor.factor.cc/dist/">http</a></td> + <td><a href="http://tor.factor.cc/">http</a></td> + <td><a href="https://factor.cc/tor/dist/">https</a></td> + <td><a href="https://factor.cc/tor/">https</a></td> <td> - </td> - <td><a href="rsync://tor.mirrors.samwhited.com">rsync</a></td> + <td> - </td> </tr> <tr> @@ -528,32 +443,32 @@ <tr> - <td>US</td> + <td>IL</td> - <td>Xpdm</td> + <td>Host4site</td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproj.xpdm.us/dist/">http</a></td> - <td><a href="http://torproj.xpdm.us/">http</a></td> - <td><a href="https://torproj.xpdm.us/dist/">https</a></td> - <td><a href="https://torproj.xpdm.us/">https</a></td> + <td><a href="http://mirror.host4site.co.il/torproject.org/dist/">http</a></td> + <td><a href="http://mirror.host4site.co.il/torproject.org/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>IL</td> + <td>DE</td> - <td>Host4site</td> + <td>borgmann.tv</td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirror.host4site.co.il/torproject.org/dist/">http</a></td> - <td><a href="http://mirror.host4site.co.il/torproject.org/">http</a></td> + <td><a href="http://tor.borgmann.tv/dist/">http</a></td> + <td><a href="http://tor.borgmann.tv/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -564,81 +479,98 @@ <td>DE</td> - <td>borgmann.tv</td> + <td>spline</td> <td>Up to date</td> + <td><a href="ftp://ftp.spline.de/pub/tor">ftp</a></td> + <td><a href="http://tor.spline.de/dist/">http</a></td> + <td><a href="http://tor.spline.de/">http</a></td> + <td><a href="https://tor.spline.inf.fu-berlin.de/dist/">https</a></td> + <td><a href="https://tor.spline.inf.fu-berlin.de/">https</a></td> <td> - </td> - <td><a href="http://tor.borgmann.tv/dist/">http</a></td> - <td><a href="http://tor.borgmann.tv/">http</a></td> + <td><a href="rsync://ftp.spline.de/tor">rsync</a></td> +</tr> + +<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>US</td> + <td>TN</td> - <td>AskApache</td> + <td></td> - <td>Up to date</td> + <td>Out of date</td> <td> - </td> - <td><a href="http://tor.askapache.com/dist/">http</a></td> - <td><a href="http://tor.askapache.com/">http</a></td> <td> - </td> + <td><a href="http://torproject.antagonism.org/">http</a></td> <td> - </td> + <td><a href="https://torproject.antagonism.org/">https</a></td> <td> - </td> <td> - </td> </tr> <tr> - <td>DE</td> + <td>NL</td> - <td>spline</td> + <td>Amorphis</td> - <td>Up to date</td> + <td>Out of date</td> - <td><a href="ftp://ftp.spline.de/pub/tor">ftp</a></td> - <td><a href="http://tor.spline.de/dist/">http</a></td> - <td><a href="http://tor.spline.de/">http</a></td> - <td><a href="https://tor.spline.inf.fu-berlin.de/dist/">https</a></td> - <td><a href="https://tor.spline.inf.fu-berlin.de/">https</a></td> <td> - </td> - <td><a href="rsync://ftp.spline.de/tor">rsync</a></td> + <td><a href="http://tor.amorphis.eu/dist/">http</a></td> + <td><a href="http://tor.amorphis.eu/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>GB</td> + <td>US</td> - <td>torland</td> + <td>Quintex</td> - <td>Up to date</td> + <td>Out of date</td> <td> - </td> - <td><a href="http://mirror.torland.me/torproject.org/dist/">http</a></td> - <td><a href="http://mirror.torland.me/torproject.org/">http</a></td> - <td><a href="https://mirror.torland.me/torproject.org/dist/">https</a></td> - <td><a href="https://mirror.torland.me/torproject.org/">https</a></td> + <td><a href="http://tormirror.quintex.com/dist/">http</a></td> + <td><a href="http://tormirror.quintex.com/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>IS</td> + <td>DK</td> - <td>TheOnionRouter</td> + <td>Zentrum der Gesundheit</td> - <td>Up to date</td> + <td>Out of date</td> <td> - </td> - <td><a href="http://theonionrouter.com/dist/">http</a></td> - <td><a href="http://theonionrouter.com/">http</a></td> + <td><a href="http://tor.idnr.ws/dist/">http</a></td> + <td><a href="http://tor.idnr.ws/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -647,49 +579,66 @@ <tr> - <td>DE</td> + <td>EE</td> - <td>[[:bbs:]]</td> + <td>CyberSIDE</td> - <td>Up to date</td> + <td>Out of date</td> <td> - </td> - <td><a href="http://tor.blingblingsquad.net/dist/">http</a></td> - <td><a href="http://tor.blingblingsquad.net/">http</a></td> - <td><a href="https://tor.blingblingsquad.net/dist/">https</a></td> - <td><a href="https://tor.blingblingsquad.net/">https</a></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>INT</td> + <td>AT</td> - <td>CoralCDN</td> + <td>FoDT</td> - <td>Up to date</td> + <td>Out of date</td> <td> - </td> - <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> - <td><a href="http://www.torproject.org.nyud.net/">http</a></td> + <td><a href="http://tor.fodt.co.at/dist/">http</a></td> + <td><a href="http://tor.fodt.co.at/">http</a></td> + <td><a href="https://tor.fodt.co.at/dist/">https</a></td> + <td><a href="https://tor.fodt.co.at/">https</a></td> <td> - </td> <td> - </td> +</tr> + +<tr> + + <td>US</td> + + <td>hessmo</td> + + <td>Out of date</td> + <td> - </td> + <td><a href="http://mirror.hessmo.com/tor/dist/">http</a></td> + <td><a href="http://mirror.hessmo.com/tor/">http</a></td> <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>US</td> + <td>LT</td> <td></td> - <td>Up to date</td> + <td>Out of date</td> <td> - </td> - <td><a href="http://mirror.nametoday.me/tor/dist/">http</a></td> - <td><a href="http://mirror.nametoday.me/tor/">http</a></td> + <td><a href="http://tor.vesta.nu/dist/">http</a></td> + <td><a href="http://tor.vesta.nu/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -698,15 +647,15 @@ <tr> - <td>NL</td> + <td>UK</td> - <td>Amorphis</td> + <td></td> - <td>Up to date</td> + <td>Out of date</td> <td> - </td> - <td><a href="http://tor.amorphis.eu/dist/">http</a></td> - <td><a href="http://tor.amorphis.eu/">http</a></td> + <td><a href="http://tor.mage.me.uk/dist/">http</a></td> + <td><a href="http://tor.mage.me.uk/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -715,19 +664,36 @@ <tr> - <td>DK</td> + <td>US</td> - <td>Zentrum der Gesundheit</td> + <td></td> - <td>Up to date</td> + <td>Out of date</td> <td> - </td> - <td><a href="http://tor.idnr.ws/dist/">http</a></td> - <td><a href="http://tor.idnr.ws/">http</a></td> + <td><a href="http://tor.mirrors.samwhited.com/dist/">http</a></td> + <td><a href="http://tor.mirrors.samwhited.com/">http</a></td> + <td><a href="https://tor.mirrors.samwhited.com/dist/">https</a></td> + <td><a href="https://tor.mirrors.samwhited.com/">https</a></td> <td> - </td> + <td><a href="rsync://tor.mirrors.samwhited.com">rsync</a></td> +</tr> + +<tr> + + <td>US</td> + + <td>AskApache</td> + + <td>Out of date</td> + <td> - </td> + <td><a href="http://tor.askapache.com/dist/">http</a></td> + <td><a href="http://tor.askapache.com/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> @@ -736,7 +702,7 @@ <td>homosu</td> - <td>Up to date</td> + <td>Out of date</td> <td> - </td> <td><a href="http://tor.homosu.net/dist/">http</a></td> @@ -751,6 +717,40 @@ <td>DE</td> + <td>[[:bbs:]]</td> + + <td>Out of date</td> + + <td> - </td> + <td><a href="http://tor.blingblingsquad.net/dist/">http</a></td> + <td><a href="http://tor.blingblingsquad.net/">http</a></td> + <td><a href="https://tor.blingblingsquad.net/dist/">https</a></td> + <td><a href="https://tor.blingblingsquad.net/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>US</td> + + <td></td> + + <td>Out of date</td> + + <td> - </td> + <td><a href="http://mirror.nametoday.me/tor/dist/">http</a></td> + <td><a href="http://mirror.nametoday.me/tor/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>DE</td> + <td>crazyhaze.de</td> <td>Out of date</td> @@ -834,15 +834,15 @@ <tr> - <td>UA</td> + <td>RO</td> - <td></td> + <td>me0w.cc</td> <td>Unknown</td> <td> - </td> - <td><a href="http://torua.reactor-xg.kiev.ua/dist/">http</a></td> - <td><a href="http://torua.reactor-xg.kiev.ua/">http</a></td> + <td><a href="http://tor.me0w.cc/dist/">http</a></td> + <td><a href="http://tor.me0w.cc/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -851,15 +851,15 @@ <tr> - <td>US</td> + <td>UA</td> <td></td> <td>Unknown</td> <td> - </td> - <td><a href="http://tor.loritsu.com/dist/">http</a></td> - <td><a href="http://tor.loritsu.com/">http</a></td> + <td><a href="http://torua.reactor-xg.kiev.ua/dist/">http</a></td> + <td><a href="http://torua.reactor-xg.kiev.ua/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -868,19 +868,19 @@ <tr> - <td>DE</td> + <td>US</td> - <td>factor.cc</td> + <td></td> <td>Unknown</td> <td> - </td> - <td><a href="http://tor.factor.cc/dist/">http</a></td> - <td><a href="http://tor.factor.cc/">http</a></td> - <td><a href="https://factor.cc/tor/dist/">https</a></td> - <td><a href="https://factor.cc/tor/">https</a></td> + <td><a href="http://tor.loritsu.com/dist/">http</a></td> + <td><a href="http://tor.loritsu.com/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> @@ -902,19 +902,36 @@ <tr> - <td>FR</td> + <td>US</td> - <td>LazyTiger</td> + <td>Xpdm</td> <td>Unknown</td> <td> - </td> - <td><a href="http://tor.taiga-san.net/dist/">http</a></td> - <td><a href="http://tor.taiga-san.net/">http</a></td> + <td><a href="http://torproj.xpdm.us/dist/">http</a></td> + <td><a href="http://torproj.xpdm.us/">http</a></td> + <td><a href="https://torproj.xpdm.us/dist/">https</a></td> + <td><a href="https://torproj.xpdm.us/">https</a></td> <td> - </td> <td> - </td> +</tr> + +<tr> + + <td>GB</td> + + <td>torland</td> + + <td>Unknown</td> + <td> - </td> + <td><a href="http://mirror.torland.me/torproject.org/dist/">http</a></td> + <td><a href="http://mirror.torland.me/torproject.org/">http</a></td> + <td><a href="https://mirror.torland.me/torproject.org/dist/">https</a></td> + <td><a href="https://mirror.torland.me/torproject.org/">https</a></td> <td> - </td> + <td> - </td> </tr> <tr> Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2012-10-15 16:30:27 UTC (rev 25845) +++ website/trunk/update-mirrors.pl 2012-10-15 16:49:21 UTC (rev 25846) @@ -82,7 +82,7 @@ # Add new mirrors to the bottom! my %m = ( - + mirror000 => { adminContact => "coralcdn.org", orgName => "CoralCDN", @@ -1106,6 +1106,24 @@ httpsDistMirror => "", rsyncDistMirror => "", hiddenServiceMirror => "", + }, + mirror077 => { + adminContact => "", + orgName => "", + isoCC => "UK", + subRegion => "", + region => "UK", + ipv4 => "True", + ipv6 => "False", + loadBalanced => "No", + httpWebsiteMirror => "http://tor.mage.me.uk/", + httpsWebsiteMirror => "", + rsyncWebsiteMirror => "", + ftpWebsiteMirror => "", + httpDistMirror => "http://tor.mage.me.uk/dist/", + httpsDistMirror => "", + rsyncDistMirror => "", + hiddenServiceMirror => "", } ); @@ -1115,8 +1133,8 @@ my $tortime; $tortime = FetchDate("https://www.torproject.org/"); -# Adjust offical Tor time by out-of-date offset: number of days * seconds per day -$tortime -= 1 * 172800; +# Adjust offical Tor time by out-of-date offset: number of days * seconds per day +$tortime -= 1 * 172800; print "The official time for Tor is $tortime. \n"; foreach my $server ( keys %m ) {

1 0

r25845: {website} bump stable TBBs to 2.2.39-3 (website/trunk/include)
by Erinn Clark 15 Oct '12

15 Oct '12

Author: erinn Date: 2012-10-15 16:30:27 +0000 (Mon, 15 Oct 2012) New Revision: 25845 Modified: website/trunk/include/versions.wmi Log: bump stable TBBs to 2.2.39-3 Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2012-10-10 18:08:25 UTC (rev 25844) +++ website/trunk/include/versions.wmi 2012-10-15 16:30:27 UTC (rev 25845) @@ -23,10 +23,10 @@ <define-tag version-osx-ppc-stable whitespace=delete>0.2.2.39</define-tag> <define-tag version-osx-ppc-alpha whitespace=delete>0.2.3.22-rc</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>2.2.39-1</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>2.2.39-3</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.2.39</define-tag> <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.20-stable, zlib-1.2.7, openssl-1.0.1c</define-tag> -<define-tag version-torbrowser-firefox whitespace=delete>10.0.7esr</define-tag> +<define-tag version-torbrowser-firefox whitespace=delete>10.0.9esr</define-tag> <define-tag version-torbrowser-torbutton whitespace=delete>1.4.6</define-tag> <define-tag version-torbrowser-pidgin whitespace=delete>2.7.5</define-tag> <define-tag version-torbrowser-otr whitespace=delete>3.2</define-tag> @@ -35,11 +35,11 @@ <define-tag version-torbrowserbundlealpha whitespace=delete>2.3.22-alpha-1</define-tag> <define-tag version-torobfsbundlealpha whitespace=delete>2.3.22-alpha-1</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.39-1</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.39-1</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.39-3</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.39-3</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.39</define-tag> <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.20-stable, zlib-1.2.7, openssl-1.0.1c</define-tag> -<define-tag version-gnu-torbrowser-firefox whitespace=delete>10.0.7esr</define-tag> +<define-tag version-gnu-torbrowser-firefox whitespace=delete>10.0.9esr</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.4.6</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.20</define-tag> <define-tag version-torbrowserbundlelinux32alpha whitespace=delete>2.3.22-alpha-1</define-tag> @@ -47,10 +47,10 @@ <define-tag version-torobfsbundlelinux32alpha whitespace=delete>2.3.22-alpha-1</define-tag> <define-tag version-torobfsbundlelinux64alpha whitespace=delete>2.3.22-alpha-1</define-tag> -<define-tag version-torbrowserbundleosx32 whitespace=delete>2.2.39-1</define-tag> -<define-tag version-torbrowserbundleosx64 whitespace=delete>2.2.39-1</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>2.2.39-3</define-tag> +<define-tag version-torbrowserbundleosx64 whitespace=delete>2.2.39-3</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.39</define-tag> -<define-tag version-osx-torbrowser-firefox whitespace=delete>10.0.7esr</define-tag> +<define-tag version-osx-torbrowser-firefox whitespace=delete>10.0.9esr</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.4.6</define-tag> <define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.20</define-tag> <define-tag version-torbrowserbundleosx32alpha whitespace=delete>2.3.22-alpha-1</define-tag>

1 0

[stem/master] Moving tutorial tests to be unit tests
by atagar＠torproject.org 15 Oct '12

15 Oct '12

commit eb28305879647bd628794674517da4377c127819 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 14 13:20:16 2012 -0700 Moving tutorial tests to be unit tests Both of our integ tests for the tutorial examples were a bit clunky, the controller test because it could only run with newish tor versions and the descriptor test because it had to make use of metrics descriptors. Oh, and they didn't actually assert anything. Moving the tests to be unit tests instead. This included greatly expanding our mocking capabilities, supporting arbitrary mock objects. I'm not sure if the end result is any better than our prior integ tests since we're mocking pretty much everything (and in the case of the descriptor test it's pretty ugly). On the other hand the tutorial tests are primarily for basic syntax and compatability with our current version of stem so guess it's ok... All this said, I *really* like our arbitrary object mocking capability... --- docs/index.rst | 1 + run_tests.py | 2 + test/__init__.py | 1 + test/integ/control/controller.py | 25 --------- test/integ/descriptor/server_descriptor.py | 29 ---------- test/mocking.py | 38 +++++++++++++- test/unit/tutorial.py | 80 ++++++++++++++++++++++++++++ 7 files changed, 121 insertions(+), 55 deletions(-) diff --git a/docs/index.rst b/docs/index.rst index d6d7f01..35806d2 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -52,6 +52,7 @@ You'll need to restart Tor or issue a SIGHUP for these new settings to take effe bytes_written = controller.get_info("traffic/written") print "My Tor relay has read %s bytes and written %s." % (bytes_read, bytes_written) + controller.close() :: diff --git a/run_tests.py b/run_tests.py index ef172bf..c891bf6 100755 --- a/run_tests.py +++ b/run_tests.py @@ -42,6 +42,7 @@ import test.unit.util.tor_tools import test.unit.exit_policy.policy import test.unit.exit_policy.rule import test.unit.version +import test.unit.tutorial import test.integ.connection.authentication import test.integ.connection.connect import test.integ.control.base_controller @@ -127,6 +128,7 @@ UNIT_TESTS = ( test.unit.exit_policy.rule.TestExitPolicyRule, test.unit.exit_policy.policy.TestExitPolicy, test.unit.version.TestVersion, + test.unit.tutorial.TestTutorial, test.unit.response.control_message.TestControlMessage, test.unit.response.control_line.TestControlLine, test.unit.response.getinfo.TestGetInfoResponse, diff --git a/test/__init__.py b/test/__init__.py index e46822c..e7add66 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -8,6 +8,7 @@ __all__ = [ "output", "prompt", "runner", + "tutorial", "utils", ] diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 36ac14a..bd17703 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -18,31 +18,6 @@ import test.runner import test.util class TestController(unittest.TestCase): - def test_tutorial(self): - """ - Tests the tutorial from our front page. - """ - - if test.runner.require_control(self): return - if test.runner.require_version(self, stem.version.Version("0.2.3.1")): return # uses a relatively new feature - elif not test.runner.Torrc.PORT in test.runner.get_runner().get_options(): - test.runner.skip(self, "no port") - return - - from stem.control import Controller - - controller = Controller.from_port(control_port = test.runner.CONTROL_PORT) - - try: - controller.authenticate(test.runner.CONTROL_PASSWORD) - - bytes_read = controller.get_info("traffic/read") - bytes_written = controller.get_info("traffic/written") - - printed_msg = "My Tor relay has read %s bytes and written %s." % (bytes_read, bytes_written) - finally: - controller.close() - def test_from_port(self): """ Basic sanity check for the from_port constructor. diff --git a/test/integ/descriptor/server_descriptor.py b/test/integ/descriptor/server_descriptor.py index 0790131..55e6545 100644 --- a/test/integ/descriptor/server_descriptor.py +++ b/test/integ/descriptor/server_descriptor.py @@ -16,35 +16,6 @@ import test.runner import test.integ.descriptor class TestServerDescriptor(unittest.TestCase): - def test_tutorial(self): - """ - Runs the tutorial example for parsing server descriptors. We use our - metrics consensus rather than the cached one so it won't take overly long. - """ - - from stem.descriptor.reader import DescriptorReader - - bw_to_relay = {} # mapping of observed bandwidth to the relay nicknames - - descriptor_path = test.integ.descriptor.get_resource("example_descriptor") - with DescriptorReader([descriptor_path]) as reader: - for desc in reader: - if desc.exit_policy.is_exiting_allowed(): - bw_to_relay.setdefault(desc.observed_bandwidth, []).append(desc.nickname) - - sorted_bw = sorted(bw_to_relay.keys(), reverse = True) - - # prints the top fifteen relays - - count = 1 - for bw_value in sorted_bw: - for nickname in bw_to_relay[bw_value]: - printed_line = "%i. %s (%i bytes/s)" % (count, nickname, bw_value) - count += 1 - - if count > 15: - return - def test_metrics_descriptor(self): """ Parses and checks our results against a server descriptor from metrics. diff --git a/test/mocking.py b/test/mocking.py index 1a8aa41..4cfe91a 100644 --- a/test/mocking.py +++ b/test/mocking.py @@ -11,6 +11,7 @@ calling :func:`test.mocking.revert_mocking`. get_real_function - provides the non-mocked version of a function get_all_combinations - provides all combinations of attributes support_with - makes object be compatable for use via the 'with' keyword + get_object - get an abitrary mock object of any class Mocking Functions no_op - does nothing @@ -211,11 +212,15 @@ def return_for_args(args_to_return_value, default = None): """ def _return_value(*args): + # strip off the 'self' for mock clases + if args and 'MockClass' in str(type(args[0])): + args = args[1:] if len(args) > 2 else args[1] + if args in args_to_return_value: return args_to_return_value[args] elif default is None: arg_label = ", ".join([str(v) for v in args]) - raise ValueError("Unrecognized argument sent for return_for_args(): %s" % arg_label) + raise ValueError("Unrecognized argument sent for return_for_args(). Got '%s' but we only recognize '%s'." % (arg_label, ", ".join(args_to_return_value.keys()))) else: return default(args) @@ -384,6 +389,37 @@ def get_all_combinations(attr, include_empty = False): seen.add(item) yield item +def get_object(object_class, methods = None): + """ + Provides a mock Controller instance. Its methods are mocked with the given + replacements, and calling any others will result in an exception. + + :param class object_class: class that we're making an instance of + :param dict methods: mapping of method names to their mocked implementation + + :returns: stem.control.Controller instance + """ + + if methods is None: + methods = {} + + mock_methods = {} + + for method_name in dir(object_class): + if method_name in methods: + mock_methods[method_name] = methods[method_name] + elif method_name.startswith('__') and method_name.endswith('__'): + pass # messing with most private methods makes for a broken mock object + else: + mock_methods[method_name] = raise_exception(ValueError("Unexpected call of '%s' on a mock object" % method_name)) + + # makes it so our constructor won't need any arguments + mock_methods['__init__'] = no_op() + + mock_class = type('MockClass', (object_class,), mock_methods) + + return mock_class() + def get_message(content, reformat = True): """ Provides a ControlMessage with content modified to be parsable. This makes diff --git a/test/unit/tutorial.py b/test/unit/tutorial.py new file mode 100644 index 0000000..13ef645 --- /dev/null +++ b/test/unit/tutorial.py @@ -0,0 +1,80 @@ +""" +Tests for the examples given in stem's tutorial. +""" + +from __future__ import with_statement +import unittest + +import test.mocking as mocking + +class TestTutorial(unittest.TestCase): + def tearDown(self): + mocking.revert_mocking() + + def test_the_little_relay_that_could(self): + from stem.control import Controller + + controller = mocking.get_object(Controller, { + 'authenticate': mocking.no_op(), + 'close': mocking.no_op(), + 'get_info': mocking.return_for_args({ + 'traffic/read': '1234', + 'traffic/written': '5678', + }), + }) + + controller.authenticate() + + bytes_read = controller.get_info("traffic/read") + bytes_written = controller.get_info("traffic/written") + + expected_line = "My Tor relay has read 1234 bytes and written 5678." + printed_line = "My Tor relay has read %s bytes and written %s." % (bytes_read, bytes_written) + self.assertEqual(expected_line, printed_line) + + controller.close() + + def test_mirror_mirror_on_the_wall(self): + from stem.descriptor.server_descriptor import RelayDescriptor + from stem.descriptor.reader import DescriptorReader + + exit_descriptor = RelayDescriptor(mocking.get_relay_server_descriptor({ + 'router': 'speedyexit 149.255.97.109 9001 0 0' + }, content = True).replace('reject *:*', 'accept *:*')) + + reader_wrapper = mocking.get_object(DescriptorReader, { + '__enter__': lambda x: x, + '__exit__': mocking.no_op(), + '__iter__': mocking.return_value(iter(( + exit_descriptor, + mocking.get_relay_server_descriptor(), # non-exit + exit_descriptor, + exit_descriptor, + ))) + }) + + bw_to_relay = {} # mapping of observed bandwidth to the relay nicknames + + with reader_wrapper as reader: + for desc in reader: + if desc.exit_policy.is_exiting_allowed(): + bw_to_relay.setdefault(desc.observed_bandwidth, []).append(desc.nickname) + + sorted_bw = sorted(bw_to_relay.keys(), reverse = True) + + # prints the top fifteen relays + + count = 1 + for bw_value in sorted_bw: + for nickname in bw_to_relay[bw_value]: + expected_line = "%i. speedyexit (104590 bytes/s)" % count + printed_line = "%i. %s (%i bytes/s)" % (count, nickname, bw_value) + self.assertEqual(expected_line, printed_line) + + count += 1 + + if count > 15: + return + + self.assertEqual(4, count) +

1 0

[stem/master] Replacing reversed() in tutorial
by atagar＠torproject.org 15 Oct '12

15 Oct '12

commit 11edc074fcd9f5d178899d3f4d8b6545bcd5d429 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 14 11:30:01 2012 -0700 Replacing reversed() in tutorial Dropping the reversed() call in the tutorial in favor of providing the 'reverse = True' argument to sorted(). Thanks to gsathya for the suggestion. --- docs/index.rst | 4 ++-- test/integ/descriptor/server_descriptor.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/index.rst b/docs/index.rst index 05c5296..d6d7f01 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -58,7 +58,7 @@ You'll need to restart Tor or issue a SIGHUP for these new settings to take effe % python example.py My Tor relay has read 33406 bytes and written 29649. -Congratulations! You've written your first controller script. +Congratulations! You've just written your first controller script. Mirror Mirror on the Wall ------------------------- @@ -89,7 +89,7 @@ To read this file we'll use the :class:`~stem.descriptor.reader.DescriptorReader if desc.exit_policy.is_exiting_allowed(): bw_to_relay.setdefault(desc.observed_bandwidth, []).append(desc.nickname) - sorted_bw = reversed(sorted(bw_to_relay.keys())) + sorted_bw = sorted(bw_to_relay.keys(), reverse = True) # prints the top fifteen relays diff --git a/test/integ/descriptor/server_descriptor.py b/test/integ/descriptor/server_descriptor.py index 21d0b33..0790131 100644 --- a/test/integ/descriptor/server_descriptor.py +++ b/test/integ/descriptor/server_descriptor.py @@ -32,7 +32,7 @@ class TestServerDescriptor(unittest.TestCase): if desc.exit_policy.is_exiting_allowed(): bw_to_relay.setdefault(desc.observed_bandwidth, []).append(desc.nickname) - sorted_bw = reversed(sorted(bw_to_relay.keys())) + sorted_bw = sorted(bw_to_relay.keys(), reverse = True) # prints the top fifteen relays

1 0

[stem/master] Moving tutorial to dedicated page
by atagar＠torproject.org 15 Oct '12

15 Oct '12

commit 8c767d35514ca345d051c94246668e97151d1c73 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 14 18:09:09 2012 -0700 Moving tutorial to dedicated page Beginning of my grand scheme to make stem's front page a simple listing of its sections (tutorial, API, release notes, download, etc). Moved the tutorial to its own page with a summary of the tutorials listed at the top. The tutorial is linked from the main page by an image link. --- docs/_static/buttons/tutorial.png | Bin 0 -> 12908 bytes docs/_static/buttons/unused/tutorial.xcf | Bin 0 -> 32568 bytes docs/index.rst | 122 +--------------------------- docs/tutorial.rst | 129 ++++++++++++++++++++++++++++++ 4 files changed, 133 insertions(+), 118 deletions(-) diff --git a/docs/_static/buttons/tutorial.png b/docs/_static/buttons/tutorial.png new file mode 100644 index 0000000..65e0f38 Binary files /dev/null and b/docs/_static/buttons/tutorial.png differ diff --git a/docs/_static/buttons/unused/tutorial.xcf b/docs/_static/buttons/unused/tutorial.xcf new file mode 100644 index 0000000..5e9afed Binary files /dev/null and b/docs/_static/buttons/unused/tutorial.xcf differ diff --git a/docs/index.rst b/docs/index.rst index 35806d2..5cc754c 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -3,124 +3,8 @@ Welcome to Stem! Stem is a python controller library for `Tor <https://www.torproject.org/>`_. Like its predecessor, `TorCtl <https://www.torproject.org/getinvolved/volunteer.html.en#project-torctl>`_, it uses Tor's `control protocol <https://gitweb.torproject.org/torspec.git/blob/HEAD:/control-spec.txt>`_ to help developers program against the Tor process, enabling them to build things similar to `Vidalia <https://www.torproject.org/getinvolved/volunteer.html.en#project-vidalia>`_ and `arm <http://www.atagar.com/arm/>`_. -Getting started with any new library can be rather daunting, so lets get our feet wet by jumping straight in with a tutorial... - -The Little Relay that Could ---------------------------- - -Lets say you just set up your very first `Tor relay <https://www.torproject.org/docs/tor-doc-relay.html.en>`_. Thank you! Now you want to write a script that tells you how much it is being used. - -First, for any script we write to be able to talk with our relay it'll need to have a control port available. This is a port that's usually only available on localhost and protected by either a password or authentication cookie. - -Look at your `torrc <https://www.torproject.org/docs/faq.html.en#torrc>`_ for the following configuration options... - -:: - - # This provides a port for the script we write to talk to. If you set this - # then be sure to also have either set the CookieAuthentication flag *or* - # provide a HashedControlPassword! - - ControlPort 9051 - - # This will make Tor write an authentication cookie file. Anything that can - # read that file can connect to Tor. If you're going to run this script with - # the same user as Tor then this is the easiest method of authentication to - # use. - - CookieAuthentication 1 - - # Alternatively we can authenticate with a password. To set a password first - # get its hash... - # - # % tor --hash-password "my_password" - # 16:E600ADC1B52C80BB6022A0E999A7734571A451EB6AE50FED489B72E3DF - # - # ... and use that for the HashedControlPassword in our torrc. - - HashedControlPassword 16:E600ADC1B52C80BB6022A0E999A7734571A451EB6AE50FED489B72E3DF - -You'll need to restart Tor or issue a SIGHUP for these new settings to take effect. Now lets write a script that tells us how many bytes Tor has sent and received... - -:: - - from stem.control import Controller - - controller = Controller.from_port(control_port = 9051) - controller.authenticate() # provide the password here if you set one - - bytes_read = controller.get_info("traffic/read") - bytes_written = controller.get_info("traffic/written") - - print "My Tor relay has read %s bytes and written %s." % (bytes_read, bytes_written) - controller.close() - -:: - - % python example.py - My Tor relay has read 33406 bytes and written 29649. - -Congratulations! You've just written your first controller script. - -Mirror Mirror on the Wall -------------------------- - -A script that tells us our contributed bandwidth is neat and all, but now lets figure out who the *biggest* exit relays are. - -Information about the Tor relay network come from documents called **descriptors**. Descriptors can come from a few things... - -1. The Tor control port with GETINFO options like **desc/all-recent** and **ns/all**. -2. Files in Tor's data directory, like **cached-descriptors** and **cached-consensus**. -3. The descriptor archive on `Tor's metrics site <https://metrics.torproject.org/data.html>`_. - -We've already used the control port, so for this example we'll use the cached files directly. First locate Tor's data directory. If your torrc has a DataDirectory line then that's the spot. If not then check Tor's man page for the default location. - -Tor has several descriptor types. For bandwidth information we'll go to the server descriptors, which are located in the **cached-descriptors** file. These have somewhat infrequently changing information published by the relays themselves. - -To read this file we'll use the :class:`~stem.descriptor.reader.DescriptorReader`, a class designed to read descriptor files. The **cached-descriptors** is full of server descriptors, so the reader will provide us with :class:`~stem.descriptor.server_descriptor.RelayDescriptor` instances (a :class:`~stem.descriptor.server_descriptor.ServerDescriptor` subclass for relays). - -:: - - import sys - from stem.descriptor.reader import DescriptorReader - - bw_to_relay = {} # mapping of observed bandwidth to the relay nicknames - - with DescriptorReader(["/home/atagar/.tor/cached-descriptors"]) as reader: - for desc in reader: - if desc.exit_policy.is_exiting_allowed(): - bw_to_relay.setdefault(desc.observed_bandwidth, []).append(desc.nickname) - - sorted_bw = sorted(bw_to_relay.keys(), reverse = True) - - # prints the top fifteen relays - - count = 1 - for bw_value in sorted_bw: - for nickname in bw_to_relay[bw_value]: - print "%i. %s (%i bytes/s)" % (count, nickname, bw_value) - count += 1 - - if count > 15: - sys.exit() - -:: - - % python example.py - 1. herngaard (42939655 bytes/s) - 2. chaoscomputerclub19 (42402911 bytes/s) - 3. chaoscomputerclub18 (41967097 bytes/s) - 4. chaoscomputerclub20 (40882989 bytes/s) - 5. wannabe (40514411 bytes/s) - 6. dorrisdeebrown (40349829 bytes/s) - 7. manning2 (40057719 bytes/s) - 8. chaoscomputerclub21 (38701399 bytes/s) - 9. TorLand1 (37983627 bytes/s) - 10. bolobolo1 (37676580 bytes/s) - 11. manning1 (37117034 bytes/s) - 12. gorz (35760527 bytes/s) - 13. ndnr1 (26595129 bytes/s) - 14. politkovskaja2 (26149682 bytes/s) - 15. wau (25929953 bytes/s) +.. image:: /_static/buttons/tutorial.png + :target: tutorial.html :mod:`stem.connection` ---------------------- @@ -174,3 +58,5 @@ Indices and tables *Last updated:* |today| + + diff --git a/docs/tutorial.rst b/docs/tutorial.rst new file mode 100644 index 0000000..9cb1414 --- /dev/null +++ b/docs/tutorial.rst @@ -0,0 +1,129 @@ +Tutorial +======== + +Getting started with any new library can be rather daunting, so lets get our feet wet by jumping straight in with a tutorial... + +* :ref:`the-little-relay-that-could` - Hello world with the control port. +* :ref:`mirror-mirror-on-the-wall` - Querying information about the Tor network. + +.. _the-little-relay-that-could: + +The Little Relay that Could +--------------------------- + +Lets say you just set up your very first `Tor relay <https://www.torproject.org/docs/tor-doc-relay.html.en>`_. Thank you! Now you want to write a script that tells you how much it is being used. + +First, for any script we write to be able to talk with our relay it'll need to have a control port available. This is a port that's usually only available on localhost and protected by either a password or authentication cookie. + +Look at your `torrc <https://www.torproject.org/docs/faq.html.en#torrc>`_ for the following configuration options... + +:: + + # This provides a port for the script we write to talk to. If you set this + # then be sure to also have either set the CookieAuthentication flag *or* + # provide a HashedControlPassword! + + ControlPort 9051 + + # This will make Tor write an authentication cookie file. Anything that can + # read that file can connect to Tor. If you're going to run this script with + # the same user as Tor then this is the easiest method of authentication to + # use. + + CookieAuthentication 1 + + # Alternatively we can authenticate with a password. To set a password first + # get its hash... + # + # % tor --hash-password "my_password" + # 16:E600ADC1B52C80BB6022A0E999A7734571A451EB6AE50FED489B72E3DF + # + # ... and use that for the HashedControlPassword in our torrc. + + HashedControlPassword 16:E600ADC1B52C80BB6022A0E999A7734571A451EB6AE50FED489B72E3DF + +You'll need to restart Tor or issue a SIGHUP for these new settings to take effect. Now lets write a script that tells us how many bytes Tor has sent and received... + +:: + + from stem.control import Controller + + controller = Controller.from_port(control_port = 9051) + controller.authenticate() # provide the password here if you set one + + bytes_read = controller.get_info("traffic/read") + bytes_written = controller.get_info("traffic/written") + + print "My Tor relay has read %s bytes and written %s." % (bytes_read, bytes_written) + controller.close() + +:: + + % python example.py + My Tor relay has read 33406 bytes and written 29649. + +Congratulations! You've just written your first controller script. + +.. _mirror-mirror-on-the-wall: + +Mirror Mirror on the Wall +------------------------- + +A script that tells us our contributed bandwidth is neat and all, but now lets figure out who the *biggest* exit relays are. + +Information about the Tor relay network come from documents called **descriptors**. Descriptors can come from a few things... + +1. The Tor control port with GETINFO options like **desc/all-recent** and **ns/all**. +2. Files in Tor's data directory, like **cached-descriptors** and **cached-consensus**. +3. The descriptor archive on `Tor's metrics site <https://metrics.torproject.org/data.html>`_. + +We've already used the control port, so for this example we'll use the cached files directly. First locate Tor's data directory. If your torrc has a DataDirectory line then that's the spot. If not then check Tor's man page for the default location. + +Tor has several descriptor types. For bandwidth information we'll go to the server descriptors, which are located in the **cached-descriptors** file. These have somewhat infrequently changing information published by the relays themselves. + +To read this file we'll use the :class:`~stem.descriptor.reader.DescriptorReader`, a class designed to read descriptor files. The **cached-descriptors** is full of server descriptors, so the reader will provide us with :class:`~stem.descriptor.server_descriptor.RelayDescriptor` instances (a :class:`~stem.descriptor.server_descriptor.ServerDescriptor` subclass for relays). + +:: + + import sys + from stem.descriptor.reader import DescriptorReader + + bw_to_relay = {} # mapping of observed bandwidth to the relay nicknames + + with DescriptorReader(["/home/atagar/.tor/cached-descriptors"]) as reader: + for desc in reader: + if desc.exit_policy.is_exiting_allowed(): + bw_to_relay.setdefault(desc.observed_bandwidth, []).append(desc.nickname) + + sorted_bw = sorted(bw_to_relay.keys(), reverse = True) + + # prints the top fifteen relays + + count = 1 + for bw_value in sorted_bw: + for nickname in bw_to_relay[bw_value]: + print "%i. %s (%i bytes/s)" % (count, nickname, bw_value) + count += 1 + + if count > 15: + sys.exit() + +:: + + % python example.py + 1. herngaard (42939655 bytes/s) + 2. chaoscomputerclub19 (42402911 bytes/s) + 3. chaoscomputerclub18 (41967097 bytes/s) + 4. chaoscomputerclub20 (40882989 bytes/s) + 5. wannabe (40514411 bytes/s) + 6. dorrisdeebrown (40349829 bytes/s) + 7. manning2 (40057719 bytes/s) + 8. chaoscomputerclub21 (38701399 bytes/s) + 9. TorLand1 (37983627 bytes/s) + 10. bolobolo1 (37676580 bytes/s) + 11. manning1 (37117034 bytes/s) + 12. gorz (35760527 bytes/s) + 13. ndnr1 (26595129 bytes/s) + 14. politkovskaja2 (26149682 bytes/s) + 15. wau (25929953 bytes/s) +

1 0

[stem/master] Adding a download page
by atagar＠torproject.org 15 Oct '12

15 Oct '12

commit 031ba36e8d67e13e0562b280ad5a89ca42c70236 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Oct 15 09:07:01 2012 -0700 Adding a download page Page that'll later have our download options. For now it just has git instructions and a 'coming soon' filler. --- docs/_static/buttons/download.png | Bin 0 -> 13702 bytes docs/_static/buttons/resources/download.xcf | Bin 0 -> 36033 bytes docs/_static/buttons/resources/tutorial.xcf | Bin 0 -> 32568 bytes docs/_static/buttons/unused/tutorial.xcf | Bin 32568 -> 0 bytes docs/_static/label/debian.png | Bin 0 -> 1339 bytes docs/_static/label/git.png | Bin 0 -> 790 bytes docs/_static/label/resources/debian.xcf | Bin 0 -> 3137 bytes docs/_static/label/resources/git.xcf | Bin 0 -> 2071 bytes docs/_static/section/debian.png | Bin 0 -> 5646 bytes docs/_static/section/git.png | Bin 0 -> 4749 bytes docs/download.rst | 23 +++++++++++++++++++++++ docs/index.rst | 3 +++ 12 files changed, 26 insertions(+), 0 deletions(-) diff --git a/docs/_static/buttons/download.png b/docs/_static/buttons/download.png new file mode 100644 index 0000000..48e22eb Binary files /dev/null and b/docs/_static/buttons/download.png differ diff --git a/docs/_static/buttons/resources/download.xcf b/docs/_static/buttons/resources/download.xcf new file mode 100644 index 0000000..d638ba1 Binary files /dev/null and b/docs/_static/buttons/resources/download.xcf differ diff --git a/docs/_static/buttons/resources/tutorial.xcf b/docs/_static/buttons/resources/tutorial.xcf new file mode 100644 index 0000000..5e9afed Binary files /dev/null and b/docs/_static/buttons/resources/tutorial.xcf differ diff --git a/docs/_static/buttons/unused/tutorial.xcf b/docs/_static/buttons/unused/tutorial.xcf deleted file mode 100644 index 5e9afed..0000000 Binary files a/docs/_static/buttons/unused/tutorial.xcf and /dev/null differ diff --git a/docs/_static/label/debian.png b/docs/_static/label/debian.png new file mode 100644 index 0000000..7f7b79d Binary files /dev/null and b/docs/_static/label/debian.png differ diff --git a/docs/_static/label/git.png b/docs/_static/label/git.png new file mode 100644 index 0000000..7fc5547 Binary files /dev/null and b/docs/_static/label/git.png differ diff --git a/docs/_static/label/resources/debian.xcf b/docs/_static/label/resources/debian.xcf new file mode 100644 index 0000000..35a5ff7 Binary files /dev/null and b/docs/_static/label/resources/debian.xcf differ diff --git a/docs/_static/label/resources/git.xcf b/docs/_static/label/resources/git.xcf new file mode 100644 index 0000000..900f09f Binary files /dev/null and b/docs/_static/label/resources/git.xcf differ diff --git a/docs/_static/section/debian.png b/docs/_static/section/debian.png new file mode 100644 index 0000000..659dc8d Binary files /dev/null and b/docs/_static/section/debian.png differ diff --git a/docs/_static/section/git.png b/docs/_static/section/git.png new file mode 100644 index 0000000..88e399e Binary files /dev/null and b/docs/_static/section/git.png differ diff --git a/docs/download.rst b/docs/download.rst new file mode 100644 index 0000000..ae3d8f0 --- /dev/null +++ b/docs/download.rst @@ -0,0 +1,23 @@ +Download +======== + +.. list-table:: + :widths: 1 10 + :header-rows: 0 + + * - .. image:: /_static/section/git.png + - .. image:: /_static/label/git.png + + For those wanting to live on the bleeding edge or contribute to stem, + its git repository can be fetched with... + + **git clone git://git.torproject.org/stem.git** (`browse <https://gitweb.torproject.org/stem.git>`_) + + * - .. image:: /_static/section/debian.png + - .. image:: /_static/label/debian.png + + **Coming soon-ish** + + Stem is very much in beta and, as such, there have yet to be any + releases. Check back later! + diff --git a/docs/index.rst b/docs/index.rst index 5cc754c..69c01b2 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -6,6 +6,9 @@ Stem is a python controller library for `Tor <https://www.torproject.org/>`_. Li .. image:: /_static/buttons/tutorial.png :target: tutorial.html +.. image:: /_static/buttons/download.png + :target: download.html + :mod:`stem.connection` ----------------------

1 0

[stem/master] Adding stub for API page
by atagar＠torproject.org 15 Oct '12

15 Oct '12

commit f996e24b794c0f96e8e8221cdde5f21d8c2cf900 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Oct 15 09:13:58 2012 -0700 Adding stub for API page Moving the old API docs to its own page. It's presently pretty minimal and sucky, but at least moving it to the right spot for now. --- docs/_static/buttons/api.png | Bin 0 -> 11189 bytes docs/_static/buttons/resources/api.xcf | Bin 0 -> 30814 bytes docs/_static/buttons/resources/tutorial.xcf | Bin 32568 -> 36318 bytes docs/_static/buttons/tutorial.png | Bin 12908 -> 14530 bytes docs/api.rst | 46 +++++++++++++++++++++++++ docs/index.rst | 48 +++------------------------ 6 files changed, 51 insertions(+), 43 deletions(-) diff --git a/docs/_static/buttons/api.png b/docs/_static/buttons/api.png new file mode 100644 index 0000000..5390376 Binary files /dev/null and b/docs/_static/buttons/api.png differ diff --git a/docs/_static/buttons/resources/api.xcf b/docs/_static/buttons/resources/api.xcf new file mode 100644 index 0000000..1fd067d Binary files /dev/null and b/docs/_static/buttons/resources/api.xcf differ diff --git a/docs/_static/buttons/resources/tutorial.xcf b/docs/_static/buttons/resources/tutorial.xcf index 5e9afed..00246cd 100644 Binary files a/docs/_static/buttons/resources/tutorial.xcf and b/docs/_static/buttons/resources/tutorial.xcf differ diff --git a/docs/_static/buttons/tutorial.png b/docs/_static/buttons/tutorial.png index 65e0f38..039f5a2 100644 Binary files a/docs/_static/buttons/tutorial.png and b/docs/_static/buttons/tutorial.png differ diff --git a/docs/api.rst b/docs/api.rst new file mode 100644 index 0000000..0e71afa --- /dev/null +++ b/docs/api.rst @@ -0,0 +1,46 @@ +API +=== + +:mod:`stem.connection` +---------------------- + +Connecting and authenticating to a Tor process. + +:mod:`stem.control` +------------------- + +Provides the :class:`~stem.control.Controller` class which, as the name implies, is used for talking with and controlling a Tor instance. As a user this is the primary class that you'll need. + +:mod:`stem.socket` +------------------ + +Base classes for communicating with a Tor control socket. + +:mod:`stem.process` +------------------- + +Used for launching Tor and managing the process. + +:mod:`stem.version` +------------------- + +Parsed versions that can be compared to the requirement for various features. + +`stem.descriptor <stem.descriptor.html>`_ +----------------------------------------- + +Utilities for working with the Tor consensus and descriptors. + +`stem.response <stem.response.html>`_ +------------------------------------- + +Parsed replies that we receive from the Tor control socket. + +`stem.util <stem.util.html>`_ +----------------------------- + +Utility functions available to stem and its users. + +.. toctree:: + :maxdepth: 2 + diff --git a/docs/index.rst b/docs/index.rst index 69c01b2..95c1589 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -6,52 +6,12 @@ Stem is a python controller library for `Tor <https://www.torproject.org/>`_. Li .. image:: /_static/buttons/tutorial.png :target: tutorial.html +.. image:: /_static/buttons/api.png + :target: api.html + .. image:: /_static/buttons/download.png :target: download.html -:mod:`stem.connection` ----------------------- - -Connecting and authenticating to a Tor process. - -:mod:`stem.control` ----------------------- - -Provides the :class:`~stem.control.Controller` class which, as the name implies, is used for talking with and controlling a Tor instance. As a user this is the primary class that you'll need. - -:mod:`stem.socket` ------------------- - -Base classes for communicating with a Tor control socket. - -:mod:`stem.process` -------------------- - -Used for launching Tor and managing the process. - -:mod:`stem.version` -------------------- - -Parsed versions that can be compared to the requirement for various features. - -`stem.descriptor <stem.descriptor.html>`_ -------------------------------------- - -Utilities for working with the Tor consensus and descriptors. - -`stem.response <stem.response.html>`_ -------------------------------------- - -Parsed replies that we receive from the Tor control socket. - -`stem.util <stem.util.html>`_ ------------------------------ - -Utility functions available to stem and its users. - -.. toctree:: - :maxdepth: 2 - Indices and tables ================== @@ -63,3 +23,5 @@ Indices and tables + +

1 0