- tor-commits - lists.torproject.org

[torbutton/master] Do versioncheck at startup regardless of session restore status.
by mikeperry＠torproject.org 29 Nov '11

29 Nov '11

commit 5f3db1242d318713ac2848cac16692a9d41e42c4 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sun Oct 23 21:09:18 2011 -0700 Do versioncheck at startup regardless of session restore status. --- src/chrome/content/torbutton.js | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 966e574..6e076a9 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2908,9 +2908,10 @@ function torbutton_set_launch_state(state, session_restore) { torbutton_enable_tor(true); torbutton_log(3, "Tor state updated."); + torbutton_do_versioncheck(); + // Load our homepage again. We just killed it via the toggle. if (!session_restore) { - torbutton_do_versioncheck(); torbutton_reload_homepage(); } } else { @@ -2921,10 +2922,11 @@ function torbutton_set_launch_state(state, session_restore) { if(state) torbutton_enable_tor(true); else torbutton_disable_tor(); + + torbutton_do_versioncheck(); // Load our homepage again. We just killed it via the toggle. if (!session_restore) { - torbutton_do_versioncheck(); torbutton_reload_homepage(); } }

1 0

[torbutton/master] Bug #4453: Set SOCKS port and host only with recommended settings
by mikeperry＠torproject.org 29 Nov '11

29 Nov '11

commit d80b5b93e31836cef95ba984ed04a05f268df66f Author: Jérémy Bobbio <lunar(a)debian.org> Date: Fri Nov 11 17:49:52 2011 +0100 Bug #4453: Set SOCKS port and host only with recommended settings Both can always be overriden on startup using TOR_SOCKS_* environment variables. --- src/chrome/content/torbutton.js | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 6e076a9..4730048 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -3893,7 +3893,7 @@ function torbutton_do_startup() if (m_tb_tbb) { m_tb_prefs.setIntPref('network.proxy.socks_port', parseInt(environ.get("TOR_SOCKS_PORT"))); } - } else { + } else if (m_tb_prefs.getCharPref('extensions.torbutton.settings_method') == 'recommended') { m_tb_prefs.setIntPref('extensions.torbutton.socks_port', 9050); } @@ -3902,7 +3902,7 @@ function torbutton_do_startup() if (m_tb_tbb) { m_tb_prefs.setCharPref('network.proxy.socks', environ.get("TOR_SOCKS_HOST")); } - } else { + } else if (m_tb_prefs.getCharPref('extensions.torbutton.settings_method') == 'recommended') { m_tb_prefs.setCharPref('extensions.torbutton.socks_host', '127.0.0.1'); }

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 29 Nov '11

29 Nov '11

commit d4ed257ca8a3032924ad9342fe95a0fe7244dccc Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 29 00:45:04 2011 +0000 Update translations for tsum --- hu/tsum.po | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/hu/tsum.po b/hu/tsum.po index f3a1e7e..94b861b 100644 --- a/hu/tsum.po +++ b/hu/tsum.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-05 17:16+0000\n" -"PO-Revision-Date: 2011-11-29 00:13+0000\n" +"PO-Revision-Date: 2011-11-29 00:32+0000\n" "Last-Translator: vargaviktor <viktor.varga(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -413,6 +413,8 @@ msgid "" "### How to use the Tor Browser Bundle\n" "After downloading the Tor Browser Bundle and extracting the package, you should have a directory with a few files in it. One of the files is an executable called \"Start Tor Browser\" (or \"start-tor-browser\", depending on your operating system)." msgstr "" +"###Hogyan használhatom a Tor Böngésző csomagot\n" +"A Tor letöltése és kicsomagolása után látnia kell egy mappát, amelyben néhány fájl található. Az egyik fájl ebben a mappában egy futtatható állomány amelynek a neve \"Start Tor Browser\" (vagy \"start-tor-browser\", operációs rendszertől függően)." #. type: Plain text #: en/tsum.text:160 @@ -446,6 +448,8 @@ msgid "" "### What to do when Tor does not connect\n" "Some users will notice that Vidalia gets stuck when trying to connect to the Tor network. If this happens, make sure that you are connected to the Internet. If you need to connect to a proxy server, see *How to use an open proxy* below." msgstr "" +"### Mit csináljak, ha a Tor nem kapcsolódik\n" +"Néhány felhasználó tapasztalhatja, hogy a Vidalia lemerevedik a Tor hálózathoz csatlakozás megkísérlése közben. Ha ez történik, ellenőrizze, hogy csatlakozva van-e az internethez. Ha proxy-hoz kell csatlakoznia, tekintse meg a *Hogyan használjak nyílt proxy-t* alább." #. type: Plain text #: en/tsum.text:174 @@ -514,6 +518,9 @@ msgid "" "If you need help with figuring out why Tor can't connect, send an email to " "help(a)rt.torproject.org and include the relevant parts from the log file." msgstr "" +"Ha segítséget szeretne ahhoz, hogy kitalálja, miért nem tud a Tor " +"kapcsolódni, küldjön egy emailt, a help(a)rt.torproject.org címre és csatolja" +" a kapcsolodó részét a log fájlnak." #. type: Plain text #: en/tsum.text:203 @@ -521,6 +528,8 @@ msgid "" "### How to find a bridge\n" "To use a bridge, you will first have to locate one; you can either browse to [bridges.torproject.org](https://bridges.torproject.org/), or you can send an email to bridges(a)torproject.org. If you do send an email, please make sure that you write **get bridges** in the body of the email. Without this, you will not get a reply. Note that you need to send this email from either a gmail.com or a yahoo.com address." msgstr "" +"### Hogyan találjon egy hidat\n" +"Ahhoz, hogy hidat használjon előszor szereznie kell egyet; ehhez ellátogathat a [bridges.torproject.org](https://bridges.torproject.org/) címre vagy küldhet egy emailt a bridges(a)torproject.org címre. Ha emailt küld, akkor legyen benne biztos, hogy beleírja a **get bridges** (hidak lekérése) szöveget a levél törzsébe. E nélkül nem fog választ kapni. Jegyezze meg, hogy ezt az emailt egy gmail.com vagy a yahoo.com címről kell küldenie." #. type: Plain text #: en/tsum.text:208 @@ -541,6 +550,8 @@ msgid "" "### How to use a bridge\n" "Once you have a set of bridges to use, open the Vidalia control panel, click on *Settings*, *Network* and tick the box that says *My ISP blocks connections to the Tor network*. Enter the bridges in the box below, hit *OK* and start Tor again." msgstr "" +"### Hogyan használja a hidakat\n" +"Ha kapott egy készlet hidat, nyissa meg a Vidalia vezérlőpultját, és kattintson a *Beállítások*, *Hálózat* pontokra, majd jelölje az *A szolgáltatóm blokkolja a Tor-t* opciót. Adja meg a hidak címét az alatta található szövegdobozba, majd nyomjon OK gombot és indítsa újra a Tor-t." #. type: Plain text #: en/tsum.text:220 @@ -548,6 +559,8 @@ msgid "" "### How to use an open proxy\n" "If using a bridge does not work, try configuring Tor to use any HTTPS or SOCKS proxy to get access to the Tor network. This means even if Tor is blocked by your local network, open proxies can be safely used to connect to the Tor Network and on to the uncensored Internet." msgstr "" +"### Hogyan használjak nyílt proxy-t\n" +"Ha a híd használata nem segít, próbálja meg a Tor-t bekonfigurálni, hogy HTTPS vagy SOCKS proxy-t használjon a Tor hálózat eléréséhez. Ez azt jelenti, hogy ha a Tor blokkolva is van a helyi hálózatán, a nyílt proxy-k segítésével biztonságosan kapcsolódhat a Tor hálózathoz és a nem cenzorált internethez." #. type: Plain text #: en/tsum.text:223 @@ -672,7 +685,9 @@ msgstr "" msgid "" "### What to do with split packages\n" "When you request a split package, the parts may arrive out of order. You need to make sure you have received all the parts before you attempt to unpack them. Save all the parts into one directory on your computer, unzip them, and double-click the file that ends in \"..split.part01.exe\" to start the unpacking process." -msgstr "###Mit csináljak a darabolt csomagokkal" +msgstr "" +"### Mit csináljak a darabolt csomagokkal\n" +"Ha darabolt csomagokat kért, akkor az egyes részek kvert sorrendben is érkezhetnek. Biztosnak kell lennie abban ,hogy az összes csomagot megkapta, mielőtt megpróbálná kicsomagolni őket. Mentse le az összes részt egy mappába a gépen ,csomagolja ki őket, aztán kattintson duplán arra a fájlra, amelynek a fájlnév vége a \"..split.part01.exe\" szöveggel végződik; ez elindítja a kicsomagolást. " #. type: Plain text #: en/tsum.text:277 @@ -691,6 +706,8 @@ msgid "" "### Vidalia asks for a password\n" "You should not have to enter a password when starting Vidalia. If you are prompted for one, you are likely affected by one of these problems:" msgstr "" +"### A Vidalia jelszót kér\n" +"A Vidalia indításakor nem kell megadnia jelszót. Ha mégis kér a Vidalia jelszót, akkor a következő problémák valamelyike fordulhat elő:" #. type: Plain text #: en/tsum.text:287

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 29 Nov '11

29 Nov '11

commit 488c5ad682a766ccec89cc688f5ad12629a98de7 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 29 00:15:05 2011 +0000 Update translations for tsum --- hu/tsum.po | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 57 insertions(+), 2 deletions(-) diff --git a/hu/tsum.po b/hu/tsum.po index 635be13..f3a1e7e 100644 --- a/hu/tsum.po +++ b/hu/tsum.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-05 17:16+0000\n" -"PO-Revision-Date: 2011-11-28 00:40+0000\n" +"PO-Revision-Date: 2011-11-29 00:13+0000\n" "Last-Translator: vargaviktor <viktor.varga(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -82,6 +82,10 @@ msgid "" "The green monitors represent relays in the Tor network, while the three keys" " represent the layers of encryption between the user and each relay." msgstr "" +"A fenti kép azt illusztrálja, ahogy egy felhasználó különböző oldalakat " +"böngészik a Tor-on keresztül. A zöld monitorok Elosztókat szimbolizálnak a " +"Tor hálózaton, a három kulcs pedig a titkosítások rétegeit mutatja a " +"felhasználó, és az egyes Elosztók között." #. type: Plain text #: en/tsum.text:31 @@ -138,6 +142,9 @@ msgid "" " browse to the [Tor Project website](https://www.torproject.org/) and " "download it there, or you can use GetTor, the email autoresponder." msgstr "" +"Két lehetősége van a Tor szoftver beszerzésére. Egyszer böngészővel " +"ellátogathat a [Tor Project weboldalra](https://www.torproject.org/) és " +"letöltheti, vagy használhatja a GetTor-t, az email automatikus válaszadót." #. type: Plain text #: en/tsum.text:53 @@ -145,6 +152,8 @@ msgid "" "### How to get Tor via email\n" "To receive the English Tor Browser Bundle for Windows, send an email to gettor(a)torproject.org with **windows** in the body of the message. You can leave the subject blank." msgstr "" +"### Hogyan tudja beszerezni a Tor-t emailen keresztül\n" +"A Tor Böngésző csomag angol Windows verziójának beszerzéséhez küldjön egy emailt a gettor(a)torproject.org címre a **windows** szóval a elvél törzsében. A tárgy üresen maradhat." #. type: Plain text #: en/tsum.text:57 @@ -176,6 +185,11 @@ msgid "" "want, send an email to help(a)rt.torproject.org and we\n" "will give you a list of website mirrors to use.\n" msgstr "" +"** Megjegyzés **: A Tor Browser csomag Linux és Mac OS X verziója " +"meglehetősen nagy, és nem lesz képes fogadni az ilyen csomagokat a Gmail, " +"Hotmail vagy a Yahoo címekre. Ha nem kapja meg a kért csomagot, küldjön egy " +"e-mailt a help(a)rt.torproject.org címre, küldünk egy listát a használható " +"weboldal tükrökről.\n" #. type: Plain text #: en/tsum.text:73 @@ -183,6 +197,8 @@ msgid "" "#### How to get Tor as several small sized packages\n" "It is possible to request the Tor Browser Bundle for Windows as several small sized packages, instead of one big package. This can be useful if you don't have a lot of bandwidth available, or if your email provider does not allow you to receive large attachments." msgstr "" +"#### Hogyan kapjam meg a Tor-t több kisebb csomagban\n" +"Lehetőség van arra ,hogy beszerezze a Tor Böngésző csomagot Windows-ra több kisebb méretű csomagban, egy nagy helyett. Ez hasznos lehet, ha a sávszélessége kicsi, vagy az email szolgáltató nem teszi lehetővé nagy csatolmányok fogadását." #. type: Plain text #: en/tsum.text:76 @@ -210,6 +226,9 @@ msgid "" "*What to do with split packages* for information on how to unpack and re-" "assemble the small sized packages." msgstr "" +"Fontos, hogy a *split* (darabolás) kulcsszót külön sorba írja. Tekintse meg " +"a *Mit csináljak a darabolt csomagokkal* további információkért arról, hogy" +" hogyan csomagolja ki és szerelje össze a kis méretű csomagokat." #. type: Plain text #: en/tsum.text:89 @@ -237,6 +256,8 @@ msgid "" "### How to verify that you have the right version\n" "Before running the Tor Browser Bundle, you should make sure that you have the right version." msgstr "" +"###Hogyan ellenőrizzem, hogy jó verzióm van\n" +"Mielőtt futattná a Tor Böngésző csomagot, ellenőriznie kell, hogy a jó verzióval rendelkezik-e." #. type: Plain text #: en/tsum.text:102 @@ -363,6 +384,11 @@ msgid "" "about where you downloaded the package from, how you verified the signature," " and the output from GnuPG in an email to help(a)rt.torproject.org." msgstr "" +"Kimenetben az kell látnia, hogy *\"Good signature\"* (jó aláírás). Egy \"bad" +" signature\" (rossz aláírás) azt jelentheti, hogy a csomagot " +"megmódosították. Ha rossz aláírással találkozik, akkor küldje el a " +"részleteket, hogy honnan töltötte le, hogyan ellenőrizte az aláírást, és a " +"kimenetét a GnuPG szoftvernek emailben a help(a)rt.torproject.org címre." #. type: Plain text #: en/tsum.text:147 @@ -572,6 +598,8 @@ msgid "" "## Frequently Asked Questions\n" "This section will answer some of the most common questions. If your question is not mentioned here, please send an email to help(a)rt.torproject.org." msgstr "" +"## Gyakran ismételt kérdések\n" +"Ez a fejezet a leggyakrabban feltett kérdésekre ad választ. Ha a kérdése nem található itt, kérjük küldjön egy emailt a help(a)rt.torproject.org címre." #. type: Plain text #: en/tsum.text:244 @@ -579,6 +607,8 @@ msgid "" "### Unable to extract the archive\n" "If you are using Windows and find that you cannot extract the archive, download and install [7-Zip](http://www.7-zip.org/)." msgstr "" +"### Nem sikerült kicsomagolni a tömörített csomagot\n" +"Ha Windows-t használ és nem sikerül kibontani a csomagot, töltse le és telepítse a [7-Zip](http://www.7-zip.org/) szoftvert." #. type: Plain text #: en/tsum.text:248 @@ -587,6 +617,10 @@ msgid "" "and use winzip to extract the archive. Before renaming the file, tell " "Windows to show file extensions:" msgstr "" +"Ha nem tudja letölteni a 7-Zip programot, akkor próbálja meg átnevezni a " +"fájlt .z kiterjesztésről .zip kiterjesztésre, és használja a winzip-et a " +"kicsomagoláshoz. Az átnevezés előtt be kell állítania, hogy a Windows " +"mutassa a fájlkiterjesztéseket:" #. type: Plain text #: en/tsum.text:254 @@ -597,6 +631,11 @@ msgid "" "3. Click on the *View* tab\n" "4. Uncheck *Hide extensions for known file types* and click *OK*" msgstr "" +"#### Windows XP\n" +"1. Nyissa meg a *Sajátgép* menüpontot\n" +"2. Kattintson az *Eszközök* opcióra, majd válassza a *Mappa beállítások...* opciót a menüből\n" +"3. Kattintson a *Nézet* fülre\n" +"4. Vegye ki a jelölést a *Kiterjesztések elrejtése az ismert fájltípusokhoz* opció elől, és kattintson az *OK* gombra" #. type: Plain text #: en/tsum.text:260 @@ -607,6 +646,11 @@ msgid "" "3. Click on the *View* tab\n" "4. Uncheck *Hide extensions for known file types* and click *OK*" msgstr "" +"#### Windows Vista\n" +"1. Nyissa meg a *Sajátgép* menüpontot\n" +"2. Kattintson az *Rendezés* opcióra, majd válassza a *Mappa és keresési beállítások...* opciót a menüből\n" +"3. Kattintson a *Nézet* fülre\n" +"4. Vegye ki a jelölést a *Kiterjesztések elrejtése az ismert fájltípusokhoz* opció elől, és kattintson az *OK* gombra" #. type: Plain text #: en/tsum.text:266 @@ -617,13 +661,18 @@ msgid "" "3. Click on the *View* tab\n" " 4. Uncheck *Hide extensions for known file types* and click *OK*" msgstr "" +"#### Windows 7\n" +"1. Nyissa meg a *Sajátgép* menüpontot\n" +"2. Kattintson az *Rendezés* opcióra, majd válassza a *Mappa és keresési beállítások...* opciót a menüből\n" +"3. Kattintson a *Nézet* fülre\n" +"4. Vegye ki a jelölést a *Kiterjesztések elrejtése az ismert fájltípusokhoz* opció elől, és kattintson az *OK* gombra" #. type: Plain text #: en/tsum.text:273 msgid "" "### What to do with split packages\n" "When you request a split package, the parts may arrive out of order. You need to make sure you have received all the parts before you attempt to unpack them. Save all the parts into one directory on your computer, unzip them, and double-click the file that ends in \"..split.part01.exe\" to start the unpacking process." -msgstr "" +msgstr "###Mit csináljak a darabolt csomagokkal" #. type: Plain text #: en/tsum.text:277 @@ -687,6 +736,8 @@ msgid "" "### Flash does not work\n" "For security reasons, Flash, Java, and other plugins are currently disabled for Tor. Plugins operate independently from Firefox and can perform activity on your computer that ruins your anonymity." msgstr "" +"### A Flash nem működik\n" +"Biztonsági okokból a Flash, Java, és egyéb bővítmények tiltva vannak Tor üzemmódban. A bővítmények a Firefoól függetlenül működnek és képesek olyan műveletek végzésére, amelyek tönkretehetik az anonimitását." #. type: Plain text #: en/tsum.text:308 @@ -726,6 +777,8 @@ msgid "" "### I want to use another browser\n" "For security reasons, we recommend that you only browse the web through Tor using the Tor Browser Bundle. It is technically possible to use Tor with other browsers, but by doing so you open yourself up to potential attacks." msgstr "" +"### Más böngészőt használnék\n" +"Biztonsági okokból ajánljuk, hogy csak a Tor Böngésző csomagon keresztül böngésszen. Technikailag lehetséges, hogy más böngészőt használjon, de ezzel potenciális támadásoknak teszi ki magát." #. type: Plain text #: en/tsum.text:325 @@ -733,5 +786,7 @@ msgid "" "### Why Tor is slow\n" "Tor can sometimes be a bit slower than your normal Internet connection. After all, your traffic is sent through many different countries, sometimes across oceans around the world!" msgstr "" +"### Miért lassú a Tor \n" +"A Tor néha lassabb, mint a normális internet kapcsolata. Ez azért van mert a forgalom különböző országokon, néha az óceánok alatt is átküldésre kerül."

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 28 Nov '11

28 Nov '11

commit 94afb61b6c74a9041555398f5768682ca7ba8b71 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 28 21:17:48 2011 +0000 Update translations for vidalia_help --- es/troubleshooting.po | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/es/troubleshooting.po b/es/troubleshooting.po index baaf360..ceb7389 100644 --- a/es/troubleshooting.po +++ b/es/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: 2011-11-28 20:41+0000\n" +"PO-Revision-Date: 2011-11-28 21:09+0000\n" "Last-Translator: JosuaFalken <josua.falken(a)gmail.com>\n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n" "MIME-Version: 1.0\n" @@ -278,6 +278,10 @@ msgid "" " to see if any of the last few messages in the list are highlighted in " "yellow and contain a message similar to the following:" msgstr "" +"Si Tor se cierra inmediatamente despues de iniciarlo, seguramente tendra " +"otro proceso Tor en ejecucion. Compruebe <a href=\"log.html\">Registro de " +"mensajes</a> y revise los ultimos registros por si hay alguno resaltado en " +"amarillo, con un mensaje parecido al siguiente:" # type: Content of: <html><body><pre> #: en/troubleshooting.html:131 @@ -286,6 +290,8 @@ msgid "" "connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n" "Is Tor already running?\n" msgstr "" +"connection_create_listener (): No se pudo enlazar a 127.0.0.1:9050: La dirección ya está en uso. \n" +"Tor se está ejecutando?\n" # type: Content of: <html><body> #: en/troubleshooting.html:135 @@ -296,6 +302,11 @@ msgid "" "operating systems, the ps command can help you find the other Tor " "process." msgstr "" +"Si encuentra un mensaje de error como el que figura arriba, entonces tendra " +"que parar el otro proceso del Tor ,antes de iniciar uno nuevo con Vidalia. " +"En Windows, busque con el Administrador de Tareas tor.exe. En los " +"sistemas operativos *nix, el comandops puede ayudarle a encontrar el " +"proceso de Tor, que necesita parar." # type: Content of: <html><body> #: en/troubleshooting.html:141 @@ -305,6 +316,11 @@ msgid "" " information about any errors Tor experienced before it exited. Such errors " "will be highlighted in either red or yellow." msgstr "" +"Si Tor estuvo funcionando correctamente durante un rato (entendemos un rato," +" algo mas que unos segundos), entonces deberia comprobar <a " +"href=\"log.html\">Registro de Mensajes</a> Buscando informacion sobre algun " +"tipo de error que Tor haya dejado registrado antes de cerrarse. Los errores " +"si los hubiera, estarian resaltados en rojo y amarillo." # type: Content of: <html><body> #: en/troubleshooting.html:147

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 28 Nov '11

28 Nov '11

commit 21811bcfcf3e8b238287e368a73abed123db571b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 28 20:48:19 2011 +0000 Update translations for vidalia_help --- es/troubleshooting.po | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-) diff --git a/es/troubleshooting.po b/es/troubleshooting.po index 21f9e4f..baaf360 100644 --- a/es/troubleshooting.po +++ b/es/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: 2011-11-28 19:46+0000\n" +"PO-Revision-Date: 2011-11-28 20:41+0000\n" "Last-Translator: JosuaFalken <josua.falken(a)gmail.com>\n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n" "MIME-Version: 1.0\n" @@ -203,6 +203,9 @@ msgid "" "button, you can click the button and Vidalia will restart Tor with a new " "random control password." msgstr "" +"Si el cuadro de dialogo, que le solicita la contraseña de control tiene un " +"boton de Reinicio, puede hacer click en dicho boton, para reiniciar " +"la contraseña aleatoria de control, y le generara una nueva" # type: Content of: <html><body><ul><li> #: en/troubleshooting.html:99 @@ -212,6 +215,10 @@ msgid "" "process or task manager, and terminate the Tor process. Then use Vidalia to " "restart Tor and all will work again." msgstr "" +"Si no ve un botón de Reinicio, o si Vidalia no puede reiniciar Tor " +"para, todavía puede solucionar el problema de forma manual de la siguiente " +"manera. Arranque el administrador de tareas, busque y finalize el proceso " +"Tor. Ahora utilice Vidalia para iniciar Tor y todo volvera a funcionar." # type: Content of: <html><body><ul><li> #: en/troubleshooting.html:106 @@ -224,6 +231,19 @@ msgid "" "Tor. Vidalia generates a random password, but it is different than the saved" " password in the Tor service." msgstr "" +"Si durante la instalacion de Tor lo ha configurado como un servicio del " +"sistema operativo, Tor se iniciara automaticamente, cada vez que arranque " +"dicho sistema.Si a configurado Tor, como un proceso de la aplicacion " +"Vidalia, cuando ejecute por primera vez Vidalia, generara una contraseña " +"aleatoria, que configurara y sera guardada para el servicio Tor que Vidalia " +"ha detetectado en ejecucion. Ahora, cada vez que inicie el sistema " +"operativo, el servicio tor arrancara utilizando esta primera contraseña " +"guardada.Cada vez que inicie vidalia, detectara el servicio Tor funcionando " +"y tratara de comunicarse con el para asignarle otra vez una nueva contraseña" +" aleatoria, pero no podra, por que sera diferente de la primera contraseña " +"que genero Vidalia, que sera la que estara usando siempre el servicio Tor " +"cuando se inicia con el sistema operativo, por lo que no podra configurarlo " +"ni acceder a el." # type: Content of: <html><body><ul><li> #: en/troubleshooting.html:114 @@ -233,6 +253,12 @@ msgid "" "href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService\">" " Tor as a service</a> for more information on how to remove the Tor service." msgstr "" +"Es necesario volver a configurar Tor para que no arranque como un servicio " +"del sistema operativo. Vea la página wiki sobre Tor en el siguiente enlace " +"<a " +"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService\">Configurando" +" Tor como servicio</a> para obtener más información sobre cómo eliminar el " +"servicio Tor." # type: Content of: <html><body> #: en/troubleshooting.html:122

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 28 Nov '11

28 Nov '11

commit 4c9d5e2812c89359d27f649e01fee437e9fc357b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 28 19:48:17 2011 +0000 Update translations for vidalia_help --- es/troubleshooting.po | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/es/troubleshooting.po b/es/troubleshooting.po index bc1cc3e..21f9e4f 100644 --- a/es/troubleshooting.po +++ b/es/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: 2011-11-27 21:20+0000\n" +"PO-Revision-Date: 2011-11-28 19:46+0000\n" "Last-Translator: JosuaFalken <josua.falken(a)gmail.com>\n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n" "MIME-Version: 1.0\n" @@ -147,6 +147,13 @@ msgid "" "applications from also connecting to the control port and potentially " "compromising your anonymity." msgstr "" +"Vidalia interactua con la aplicacion Tor a traves del \"Puerto de Control\"," +" El puerto de control permite recibir de tor las actualizaciones de " +"estado,la solicitud de nueva identidad, establecer la configuracion de Tor " +"ademas de otras cosas.Cada vez que Vidalia, inicia la sesion en la red Tor, " +"establece una contraseña aleatoria, para este puerto de control, para evitar" +" que otras aplicaciones se conecten, comprometiendo, y poniendo en peligro " +"su anonimato" # type: Content of: <html><body> #: en/troubleshooting.html:75 @@ -155,6 +162,9 @@ msgid "" "happens in the background. There are three common situations, though, where " "Vidalia may prompt you for a password:" msgstr "" +"Por lo general, este proceso de generar y establecer una contraseña de " +"control aleatorio ocurre en segundo plano. Hay tres situaciones comunes, sin" +" embargo, en las que Vidalia le pedirá una contraseña:" # type: Content of: <html><body><ul><li> #: en/troubleshooting.html:82 @@ -164,6 +174,11 @@ msgid "" "Tor Browser Bundle. In that case, you'll need to close the old Vidalia and " "Tor before you can run this one." msgstr "" +"Si ya esta ejecutando la aplicacion Vidalia en conjunto con Tor, englobado " +"en el paquete Vidalia Bundle, e intenta ahora ejecutar al mismo tiempo la " +"aplicacion Vidalia del paquete Vidalia+navegador (paquete Browser Bundle), " +"primero ha de cerrar las aplicaciones de Vidalia Bundle, para poder arrancar" +" El vidalia del paquete Browser Bundle (Vidalia+Navegador anonimizado)" # type: Content of: <html><body><ul><li> #: en/troubleshooting.html:89 @@ -172,6 +187,14 @@ msgid "" "After you restart Vidalia, it generates a new random password, but Vidalia " "can't talk to Tor, because the random passwords are different." msgstr "" +"Vidalia ha generado un error y se cerro inesperadamente, si esto ocurre,a " +"pesar del cierre de Vidalia Tor continuara ejecutandose, con la ultima " +"contraseña aleatoria configurada por Vidalia, al volver a iniciar Vidalia " +"volvera a generar una contraseña aleatoria, pero no podra acceder a Tor, por" +" que las dos contraseñas, la que genera Vidalia tras el reinicio, y la que " +"Tor tiene configurada, seran diferentes, entonces se hara necesario en estos" +" casos cerrar tambien el proceso Tor cuando Vidalia se cierre " +"inesperadamente, y despues, si, iniciar Vidalia." # type: Content of: <html><body><ul><li> #: en/troubleshooting.html:94

1 0

[stem/master] Specialized subclasses for ControlSocket
by atagar＠torproject.org 28 Nov '11

28 Nov '11

commit 7bae33db31f26440810596b0b702d7f85bbfb1cd Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Nov 28 06:18:03 2011 -0800 Specialized subclasses for ControlSocket Adding a ControlSocket subclass for control ports and control sockets. This allows for a connect() method which we'll need when trying multiple connection types since the socket becomes detached after a failed authentication attempt. This is also gonna be a bit nicer for callers since it bundles the connection information (the port/path we're using) with the socket. --- stem/connection.py | 66 +++++++++----------- stem/control.py | 5 ++ stem/socket.py | 176 ++++++++++++++++++++++++++++++++++++++++++++-------- 3 files changed, 184 insertions(+), 63 deletions(-) diff --git a/stem/connection.py b/stem/connection.py index cb8425a..fe17d6b 100644 --- a/stem/connection.py +++ b/stem/connection.py @@ -14,11 +14,7 @@ ProtocolInfoResponse - Reply from a PROTOCOLINFO query. +- convert - parses a ControlMessage, turning it into a ProtocolInfoResponse """ -from __future__ import absolute_import -import Queue -import socket import logging -import threading import stem.socket import stem.version @@ -62,14 +58,24 @@ def get_protocolinfo_by_port(control_addr = "127.0.0.1", control_port = 9051, ke socket """ - control_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - connection_args = (control_addr, control_port) - protocolinfo_response = _get_protocolinfo_impl(control_socket, connection_args, keep_alive) - - # attempt to expand relative cookie paths using our port to infer the pid - protocolinfo_response.cookie_path = _expand_cookie_path(protocolinfo_response.cookie_path, stem.util.system.get_pid_by_port, control_port) - - return protocolinfo_response + try: + control_socket = stem.socket.ControlPort(control_addr, control_port) + control_socket.connect() + control_socket.send("PROTOCOLINFO 1") + protocolinfo_response = control_socket.recv() + ProtocolInfoResponse.convert(protocolinfo_response) + + if keep_alive: protocolinfo_response.socket = control_socket + else: control_socket.close() + + # attempt to expand relative cookie paths using our port to infer the pid + if control_addr == "127.0.0.1": + _expand_cookie_path(protocolinfo_response, stem.util.system.get_pid_by_port, control_port) + + return protocolinfo_response + except stem.socket.ControllerError, exc: + control_socket.close() + raise exc def get_protocolinfo_by_socket(socket_path = "/var/run/tor/control", keep_alive = False): """ @@ -87,27 +93,9 @@ def get_protocolinfo_by_socket(socket_path = "/var/run/tor/control", keep_alive socket """ - control_socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) - protocolinfo_response = _get_protocolinfo_impl(control_socket, socket_path, keep_alive) - - # attempt to expand relative cookie paths using our socket to infer the pid - protocolinfo_response.cookie_path = _expand_cookie_path(protocolinfo_response.cookie_path, stem.util.system.get_pid_by_open_file, socket_path) - - return protocolinfo_response - -def _get_protocolinfo_impl(control_socket, connection_args, keep_alive): - """ - Common implementation behind the get_protocolinfo_by_* functions. This - connects the given socket and issues a PROTOCOLINFO query with it. - """ - - try: - control_socket.connect(connection_args) - control_socket = stem.socket.ControlSocket(control_socket) - except socket.error, exc: - raise stem.socket.SocketError(exc) - try: + control_socket = stem.socket.ControlSocketFile(socket_path) + control_socket.connect() control_socket.send("PROTOCOLINFO 1") protocolinfo_response = control_socket.recv() ProtocolInfoResponse.convert(protocolinfo_response) @@ -115,18 +103,22 @@ def _get_protocolinfo_impl(control_socket, connection_args, keep_alive): if keep_alive: protocolinfo_response.socket = control_socket else: control_socket.close() + # attempt to expand relative cookie paths using our port to infer the pid + _expand_cookie_path(protocolinfo_response, stem.util.system.get_pid_by_open_file, socket_path) + return protocolinfo_response except stem.socket.ControllerError, exc: control_socket.close() raise exc -def _expand_cookie_path(cookie_path, pid_resolver, pid_resolution_arg): +def _expand_cookie_path(protocolinfo_response, pid_resolver, pid_resolution_arg): """ Attempts to expand a relative cookie path with the given pid resolver. This - returns the input path if it's already absolute, None, or the system calls - fail. + leaves the cookie_path alone if it's already absolute, None, or the system + calls fail. """ + cookie_path = protocolinfo_response.cookie_path if cookie_path and stem.util.system.is_relative_path(cookie_path): try: tor_pid = pid_resolver(pid_resolution_arg) @@ -146,7 +138,7 @@ def _expand_cookie_path(cookie_path, pid_resolver, pid_resolution_arg): pid_resolver_label = resolver_labels.get(pid_resolver, "") LOGGER.debug("unable to expand relative tor cookie path%s: %s" % (pid_resolver_label, exc)) - return cookie_path + protocolinfo_response.cookie_path = cookie_path class ProtocolInfoResponse(stem.socket.ControlMessage): """ @@ -276,7 +268,7 @@ class ProtocolInfoResponse(stem.socket.ControlMessage): self.cookie_path = line.pop_mapping(True, True)[1] # attempt to expand relative cookie paths - self.cookie_path = _expand_cookie_path(self.cookie_path, stem.util.system.get_pid_by_name, "tor") + _expand_cookie_path(self, stem.util.system.get_pid_by_name, "tor") elif line_type == "VERSION": # Line format: # VersionLine = "250-VERSION" SP "Tor=" TorVersion OptArguments CRLF diff --git a/stem/control.py b/stem/control.py index f372b57..3d55b62 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1,6 +1,11 @@ # The following is very much a work in progress and mostly scratch (I just # wanted to make sure other work would nicely do the async event handling). +import Queue +import threading + +import stem.socket + class ControlConnection: """ Connection to a Tor control port. This is a very lightweight wrapper around diff --git a/stem/socket.py b/stem/socket.py index 8add15f..0d2a84e 100644 --- a/stem/socket.py +++ b/stem/socket.py @@ -9,9 +9,17 @@ ControllerError - Base exception raised when using the controller. +- SocketClosed - Socket has been shut down. ControlSocket - Socket wrapper that speaks the tor control protocol. + |- ControlPort - Control connection via a port. + | |- get_address - provides the ip address of our socket + | +- get_port - provides the port of our socket + | + |- ControlSocketFile - Control connection via a local file socket. + | +- get_socket_path - provides the path of the socket we connect to + | |- send - sends a message to the socket |- recv - receives a ControlMessage from the socket |- is_alive - reports if the socket is known to be closed + |- connect - connects a new socket +- close - shuts down the socket ControlMessage - Message that's read from the control socket. @@ -74,20 +82,14 @@ class ControlSocket: Wrapper for a socket connection that speaks the Tor control protocol. To the better part this transparently handles the formatting for sending and receiving complete messages. All methods are thread safe. + + Callers should not instantiate this class directly, but rather use subclasses + which are expected to implement the _make_socket method. """ - def __init__(self, control_socket): - """ - Constructs as a wrapper around an established socket connection. Further - interaction with the raw socket is discouraged. - - Arguments: - control_socket (socket.socket) - established tor control socket - """ - - self._socket = control_socket - self._socket_file = control_socket.makefile() - self._is_alive = True + def __init__(self): + self._socket, self._socket_file = None, None + self._is_alive = False # Tracks sending and receiving separately. This should be safe, and doing # so prevents deadlock where we block writes because we're waiting to read @@ -162,35 +164,157 @@ class ControlSocket: return self._is_alive - def close(self): + def connect(self): """ - Shuts down the socket. If it's already closed then this is a no-op. + Connects to a new socket, closing our previous one if we're already + attached. + + Raises: + stem.socket.SocketError if unable to make a socket """ # we need both locks for this self._send_cond.acquire() self._recv_cond.acquire() - # if we haven't yet established a connection then this raises an error - # socket.error: [Errno 107] Transport endpoint is not connected - try: self._socket.shutdown(socket.SHUT_RDWR) - except socket.error: pass + # close the socket if we're currently attached to one + if self.is_alive(): self.close() - # Suppressing unexpected exceptions from close. For instance, if the - # socket's file has already been closed then with python 2.7 that raises - # with... - # error: [Errno 32] Broken pipe + try: + control_socket = self._make_socket() + self._socket = control_socket + self._socket_file = control_socket.makefile() + self._is_alive = True + finally: + self._send_cond.release() + self._recv_cond.release() + + def close(self): + """ + Shuts down the socket. If it's already closed then this is a no-op. + """ - try: self._socket.close() - except: pass + # we need both locks for this + self._send_cond.acquire() + self._recv_cond.acquire() + + if self._socket: + # if we haven't yet established a connection then this raises an error + # socket.error: [Errno 107] Transport endpoint is not connected + try: self._socket.shutdown(socket.SHUT_RDWR) + except socket.error: pass + + # Suppressing unexpected exceptions from close. For instance, if the + # socket's file has already been closed then with python 2.7 that raises + # with... + # error: [Errno 32] Broken pipe + + try: self._socket.close() + except: pass - try: self._socket_file.close() - except: pass + if self._socket_file: + try: self._socket_file.close() + except: pass self._is_alive = False self._send_cond.release() self._recv_cond.release() + + def _make_socket(self): + """ + Constructs and connects new socket. This is implemented by subclasses. + + Returns: + socket.socket for our configuration + + Raises: + stem.socket.SocketError if unable to make a socket + """ + + raise SocketError("Unsupported Operation: this should be implemented by the ControlSocket subclass") + +class ControlPort(ControlSocket): + """ + Control connection to tor. For more information see tor's ControlPort torrc + option. + """ + + def __init__(self, control_addr = "127.0.0.1", control_port = 9051): + """ + ControlPort constructor. + + Arguments: + control_addr (str) - ip address of the controller + control_port (int) - port number of the controller + """ + + ControlSocket.__init__(self) + self._control_addr = control_addr + self._control_port = control_port + + def get_address(self): + """ + Provides the ip address our socket connects to. + + Returns: + str with the ip address of our socket + """ + + return self._control_addr + + def get_port(self): + """ + Provides the port our socket connects to. + + Returns: + int with the port of our socket + """ + + return self._control_port + + def _make_socket(self): + try: + control_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + control_socket.connect((self._control_addr, self._control_port)) + return control_socket + except socket.error, exc: + raise SocketError(exc) + +class ControlSocketFile(ControlSocket): + """ + Control connection to tor. For more information see tor's ControlSocket torrc + option. + """ + + def __init__(self, socket_path = "/var/run/tor/control"): + """ + ControlSocketFile constructor. + + Arguments: + socket_path (str) - path where the control socket is located + """ + + ControlSocket.__init__(self) + self._socket_path = socket_path + + def get_socket_path(self): + """ + Provides the path our socket connects to. + + Returns: + str with the path for our control socket + """ + + return self._socket_path + + def _make_socket(self): + try: + control_socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + control_socket.connect(self._socket_path) + return control_socket + except socket.error, exc: + raise SocketError(exc) class ControlMessage: """

1 0

[stem/master] Exercising the get_socket arg with integ testing
by atagar＠torproject.org 28 Nov '11

28 Nov '11

commit 206e4de3ffab8764aefbc02d969092cc47dfc37a Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Nov 28 07:00:45 2011 -0800 Exercising the get_socket arg with integ testing The get_socket (previously keep_alive) argument wasn't being exercised so adding that to the test for fetching a protocolinfo response via the control socket. --- test/integ/connection/protocolinfo.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/test/integ/connection/protocolinfo.py b/test/integ/connection/protocolinfo.py index e1436f8..b22d0c9 100644 --- a/test/integ/connection/protocolinfo.py +++ b/test/integ/connection/protocolinfo.py @@ -101,8 +101,13 @@ class TestProtocolInfo(unittest.TestCase): connection_type = test.runner.get_runner().get_connection_type() if test.runner.OPT_SOCKET in test.runner.CONNECTION_OPTS[connection_type]: - protocolinfo_response = stem.connection.get_protocolinfo_by_socket(socket_path = test.runner.CONTROL_SOCKET_PATH) + protocolinfo_response, control_socket = stem.connection.get_protocolinfo_by_socket(socket_path = test.runner.CONTROL_SOCKET_PATH, get_socket = True) self.assert_protocolinfo_attr(protocolinfo_response, connection_type) + + # also exercising the get_socket argument - we should have a usable + # socket at this point + self.assertTrue(control_socket.is_alive()) + control_socket.close() else: # we don't have a control socket self.assertRaises(stem.socket.SocketError, stem.connection.get_protocolinfo_by_socket, test.runner.CONTROL_SOCKET_PATH)

1 0

[stem/master] Splitting socket attribute from protocolinfo
by atagar＠torproject.org 28 Nov '11

28 Nov '11

commit 04975ff9d149d8a881edd8ce26925d785150eda1 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Nov 28 06:56:38 2011 -0800 Splitting socket attribute from protocolinfo Bundling the requesting socket with the protocolinfo response was kinda clunky. I thought that it owuld make the api a little nicer, but in retrospect it's just weird so going to a more conventional tuple response instead. --- stem/connection.py | 41 +++++++++++++++++++------------- test/integ/connection/protocolinfo.py | 3 -- test/unit/connection/protocolinfo.py | 2 - 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/stem/connection.py b/stem/connection.py index fe17d6b..b740d0d 100644 --- a/stem/connection.py +++ b/stem/connection.py @@ -38,7 +38,7 @@ LOGGER = logging.getLogger("stem") AuthMethod = stem.util.enum.Enum("NONE", "PASSWORD", "COOKIE", "UNKNOWN") -def get_protocolinfo_by_port(control_addr = "127.0.0.1", control_port = 9051, keep_alive = False): +def get_protocolinfo_by_port(control_addr = "127.0.0.1", control_port = 9051, get_socket = False): """ Issues a PROTOCOLINFO query to a control port, getting information about the tor process running on it. @@ -46,11 +46,13 @@ def get_protocolinfo_by_port(control_addr = "127.0.0.1", control_port = 9051, ke Arguments: control_addr (str) - ip address of the controller control_port (int) - port number of the controller - keep_alive (bool) - keeps the socket used to issue the PROTOCOLINFO query - open if True, closes otherwise + get_socket (bool) - provides the socket with the response if True, + otherwise the socket is closed when we're done Returns: - ProtocolInfoResponse with the response given by the tor process + stem.connection.ProtocolInfoResponse provided by tor, if get_socket is True + then this provides a tuple instead with both the response and connected + socket (stem.socket.ControlPort) Raises: stem.socket.ProtocolError if the PROTOCOLINFO response is malformed @@ -65,27 +67,33 @@ def get_protocolinfo_by_port(control_addr = "127.0.0.1", control_port = 9051, ke protocolinfo_response = control_socket.recv() ProtocolInfoResponse.convert(protocolinfo_response) - if keep_alive: protocolinfo_response.socket = control_socket - else: control_socket.close() - # attempt to expand relative cookie paths using our port to infer the pid if control_addr == "127.0.0.1": _expand_cookie_path(protocolinfo_response, stem.util.system.get_pid_by_port, control_port) - return protocolinfo_response + if get_socket: + return (protocolinfo_response, control_socket) + else: + control_socket.close() + return protocolinfo_response except stem.socket.ControllerError, exc: control_socket.close() raise exc -def get_protocolinfo_by_socket(socket_path = "/var/run/tor/control", keep_alive = False): +def get_protocolinfo_by_socket(socket_path = "/var/run/tor/control", get_socket = False): """ Issues a PROTOCOLINFO query to a control socket, getting information about the tor process running on it. Arguments: socket_path (str) - path where the control socket is located - keep_alive (bool) - keeps the socket used to issue the PROTOCOLINFO query - open if True, closes otherwise + get_socket (bool) - provides the socket with the response if True, + otherwise the socket is closed when we're done + + Returns: + stem.connection.ProtocolInfoResponse provided by tor, if get_socket is True + then this provides a tuple instead with both the response and connected + socket (stem.socket.ControlSocketFile) Raises: stem.socket.ProtocolError if the PROTOCOLINFO response is malformed @@ -100,13 +108,14 @@ def get_protocolinfo_by_socket(socket_path = "/var/run/tor/control", keep_alive protocolinfo_response = control_socket.recv() ProtocolInfoResponse.convert(protocolinfo_response) - if keep_alive: protocolinfo_response.socket = control_socket - else: control_socket.close() - # attempt to expand relative cookie paths using our port to infer the pid _expand_cookie_path(protocolinfo_response, stem.util.system.get_pid_by_open_file, socket_path) - return protocolinfo_response + if get_socket: + return (protocolinfo_response, control_socket) + else: + control_socket.close() + return protocolinfo_response except stem.socket.ControllerError, exc: control_socket.close() raise exc @@ -160,7 +169,6 @@ class ProtocolInfoResponse(stem.socket.ControlMessage): auth_methods (tuple) - AuthMethod types that tor will accept unknown_auth_methods (tuple) - strings of unrecognized auth methods cookie_path (str) - path of tor's authentication cookie - socket (stem.socket.ControlSocket) - socket used to make the query """ def convert(control_message): @@ -196,7 +204,6 @@ class ProtocolInfoResponse(stem.socket.ControlMessage): self.protocol_version = None self.tor_version = None self.cookie_path = None - self.socket = None auth_methods, unknown_auth_methods = [], [] diff --git a/test/integ/connection/protocolinfo.py b/test/integ/connection/protocolinfo.py index 8c23329..e1436f8 100644 --- a/test/integ/connection/protocolinfo.py +++ b/test/integ/connection/protocolinfo.py @@ -46,7 +46,6 @@ class TestProtocolInfo(unittest.TestCase): self.assertNotEqual(None, protocolinfo_response.tor_version) self.assertNotEqual(None, protocolinfo_response.auth_methods) - self.assertEqual(None, protocolinfo_response.socket) self.assert_protocolinfo_attr(protocolinfo_response, connection_type) def test_get_protocolinfo_by_port(self): @@ -77,7 +76,6 @@ class TestProtocolInfo(unittest.TestCase): if test.runner.OPT_PORT in test.runner.CONNECTION_OPTS[connection_type]: protocolinfo_response = stem.connection.get_protocolinfo_by_port(control_port = test.runner.CONTROL_PORT) - self.assertEqual(None, protocolinfo_response.socket) self.assert_protocolinfo_attr(protocolinfo_response, connection_type) else: # we don't have a control port @@ -104,7 +102,6 @@ class TestProtocolInfo(unittest.TestCase): if test.runner.OPT_SOCKET in test.runner.CONNECTION_OPTS[connection_type]: protocolinfo_response = stem.connection.get_protocolinfo_by_socket(socket_path = test.runner.CONTROL_SOCKET_PATH) - self.assertEqual(None, protocolinfo_response.socket) self.assert_protocolinfo_attr(protocolinfo_response, connection_type) else: # we don't have a control socket diff --git a/test/unit/connection/protocolinfo.py b/test/unit/connection/protocolinfo.py index ecca8b6..bc0fef3 100644 --- a/test/unit/connection/protocolinfo.py +++ b/test/unit/connection/protocolinfo.py @@ -92,7 +92,6 @@ class TestProtocolInfoResponse(unittest.TestCase): self.assertEquals((stem.connection.AuthMethod.NONE, ), control_message.auth_methods) self.assertEquals((), control_message.unknown_auth_methods) self.assertEquals(None, control_message.cookie_path) - self.assertEquals(None, control_message.socket) def test_password_auth(self): """ @@ -148,7 +147,6 @@ class TestProtocolInfoResponse(unittest.TestCase): self.assertEquals((), control_message.auth_methods) self.assertEquals((), control_message.unknown_auth_methods) self.assertEquals(None, control_message.cookie_path) - self.assertEquals(None, control_message.socket) def test_relative_cookie(self): """

1 0