- tor-commits - lists.torproject.org

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 22 Feb '12

22 Feb '12

commit 328b1521ce5ed3255114c3de8d065f8cffba9e07 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 22 09:45:31 2012 +0000 Update translations for torcheck --- fr/torcheck.po | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/fr/torcheck.po b/fr/torcheck.po index 1961a28..d149fd1 100644 --- a/fr/torcheck.po +++ b/fr/torcheck.po @@ -2,14 +2,15 @@ # Copyright (C) 2008-2012 The Tor Project, Inc # # Translators: +# arpalord <arpalord(a)gmail.com>, 2012. # skhaen <skhaen(a)gmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2010-11-30 04:59+0000\n" -"Last-Translator: Appelbaum <jacob(a)appelbaum.net>\n" +"PO-Revision-Date: 2012-02-22 09:44+0000\n" +"Last-Translator: arpalord <arpalord(a)gmail.com>\n" "Language-Team: Tor Translation <tor-translation(a)torproject.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,25 +26,25 @@ msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " "for further information about using Tor safely. You are now free to browse " "the Internet anonymously." -msgstr "" +msgstr "Merci de visiter le <a href=\"https://www.torproject.org/\">site web de Tor</a> pour plus amples informations concernant l'utilisation de Tor en toute sécurité. Vous êtes maintenant libre de naviguer anonymement sur Internet." msgid "There is a security update available for the Tor Browser Bundle." -msgstr "" +msgstr "Une mise à jour de sécurité est disponible pour Tor Browse Bundle." msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click " "here to go to the download page</a>" -msgstr "" +msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Cliquez ici pour aller sur la page de téléchargement</a>" msgid "Sorry. You are not using Tor." -msgstr "Désolé. Vous n'etes pas en train d'utiliser Tor." +msgstr "Désolé. Vous n'êtes pas en train d'utiliser Tor." msgid "" "If you are attempting to use a Tor client, please refer to the <a " "href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" " href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for " "configuring your Tor client</a>." -msgstr "" +msgstr "Si vous vous apprêtez à utiliser un client Tor, merci de visiter le <a href=\"https://www.torproject.org/\">site web de Tor</a> et tout particulièrement les <a href=\"https://www.torproject.org/docs/faq#DoesntWork\"> client Tor</a>.instructions de configuration de votre" msgid "Sorry, your query failed or an unexpected response was received." msgstr "Désolé, votre demande a échoué ou une réponse inattendue a été reçue." @@ -54,4 +55,4 @@ msgid "" msgstr "" msgid "Your IP address appears to be: " -msgstr "Votre adresse IP semble être :" +msgstr "Votre adresse IP semble être : "

1 0

r25468: {website} fix shadow icon sizing (website/trunk/projects/en)
by Arturo Filasto 22 Feb '12

22 Feb '12

Author: art Date: 2012-02-22 07:08:37 +0000 (Wed, 22 Feb 2012) New Revision: 25468 Modified: website/trunk/projects/en/projects.wml Log: fix shadow icon sizing Modified: website/trunk/projects/en/projects.wml =================================================================== --- website/trunk/projects/en/projects.wml 2012-02-22 07:02:18 UTC (rev 25467) +++ website/trunk/projects/en/projects.wml 2012-02-22 07:08:37 UTC (rev 25468) @@ -99,7 +99,7 @@ </div> <div class="projectbox"> -<a href="https://shadow.cs.umn.edu/"><img src="$(IMGROOT)/shadow-favicon.png" height="80px" alt=""></a> +<a href="https://shadow.cs.umn.edu/"><img src="$(IMGROOT)/shadow-favicon.png" height="80px" width="80px" alt=""></a> <div class="projectdesc"><div class="name"><a href="https://shadow.cs.umn.edu/">Shadow</a></div> <p>Shadow is a discrete-event network simulator that runs the real Tor software as a plug-in. Shadow is open-source software that enables

1 0

r25467: {website} restyle projects page and add shadow icon to images dir (in website/trunk: css projects/en)
by Arturo Filasto 22 Feb '12

22 Feb '12

Author: art Date: 2012-02-22 07:02:18 +0000 (Wed, 22 Feb 2012) New Revision: 25467 Modified: website/trunk/css/layout.css website/trunk/projects/en/projects.wml Log: restyle projects page and add shadow icon to images dir Modified: website/trunk/css/layout.css =================================================================== --- website/trunk/css/layout.css 2012-02-22 07:01:08 UTC (rev 25466) +++ website/trunk/css/layout.css 2012-02-22 07:02:18 UTC (rev 25467) @@ -1211,7 +1211,40 @@ font-size: 11px; line-height: 13px; } + /* + Project page +*/ + + #projectpage td { + width: 50%; + } + + .projectbox { + width: 710px; + position: relative; + margin-bottom: 80px; + } + + + .projectbox .name { + font-size: 1.5em; + font-weight: bold; + } + + .projectbox a img { + float: none; + position: absolute; + top: 0; + left: 0; + } + + .projectbox .projectdesc { + margin-left: 100px; + } +/* END */ + +/* ** Markup free clearing ** Details: http://www.positioniseverything.net/easyclearing.html */ Modified: website/trunk/projects/en/projects.wml =================================================================== --- website/trunk/projects/en/projects.wml 2012-02-22 07:01:08 UTC (rev 25466) +++ website/trunk/projects/en/projects.wml 2012-02-22 07:02:18 UTC (rev 25467) @@ -12,112 +12,102 @@ <h1>Software & Services</h1> <p>The Tor community of software and services aims to make your Internet experience safer and better.</p> -<table class="topforty"> -<tr> -<td> -<a href="<page torbutton/index>"><img class="icon" - src="$(IMGROOT)/icon-TorButton.jpg" alt="TorButton Icon"></a> -<div class="name"><a href="<page torbutton/index>">Torbutton</a></div> -<p>Torbutton is integrated into <a href="<page projects/torbrowser>">Tor -Browser</a>. Torbutton disables many types of active content and threats + +<div class="projectbox"> +<a href="https://www.torproject.org/torbutton/index.html.en"><img class="icon" src="$(IMGROOT)/icon-TorButton.jpg" alt="TorButton Icon" width="75" height="75"></a> + +<div class="projectdesc"><div class="name"><a href="https://www.torproject.org/torbutton/index.html.en">Torbutton</a></div> +<p>Torbutton is integrated into <a href="https://www.torproject.org/projects/torbrowser.html.en">Tor Browser</a>.Torbutton disables many types of active content and threats to your privacy when using a web browser.</p> -</td> -<td> -<a href="<page projects/torbrowser>"><img class="icon" - src="$(IMGROOT)/icon-TorBrowser.jpg" alt="TorBrowser Icon"></a> -<div class="name"><a href="<page projects/torbrowser>">Tor Browser Bundle</a></div> +</div></div> + +<div class="projectbox"> +<a href="https://www.torproject.org/projects/torbrowser.html.en"><img class="icon" src="$(IMGROOT)/icon-TorBrowser.jpg" alt="TorBrowser Icon" width="75" height="75"></a> +<div class="projectdesc"><div class="name"><a href="https://www.torproject.org/projects/torbrowser.html.en">Tor Browser Bundle</a></div> <p>The Tor Browser Bundle contains everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.</p> -</td> -</tr> -<tr> -<td> -<a href="<page projects/vidalia>"><img class="icon" - src="$(IMGROOT)/icon-Vidalia.jpg" alt="Vidalia Icon"></a> -<div class="name"><a href="<page projects/vidalia>">Vidalia</a></div> -<p>Vidalia is a graphical Tor controller. It allows you to +</div></div> + +<div class="projectbox"> +<a href="https://www.torproject.org/projects/vidalia.html.en"><img class="icon" src="$(IMGROOT)/icon-Vidalia.jpg" alt="Vidalia Icon" width="75" height="75"></a> +<div class="projectdesc"><div class="name"><a href="https://www.torproject.org/projects/vidalia.html.en">Vidalia</a></div> +<p>Vidalia is a graphical Tor controller. It allows you to see where your connections are in the world and configure Tor without getting into configuration files and code.</p> -</td> -<td> -<a href="http://www.atagar.com/arm/"><img class="icon" - src="$(IMGROOT)/icon-Arm.jpg" alt="Arm Icon"></a> -<div class="name"><a href="<page projects/arm>">Arm</a></div> +</div></div> + +<div class="projectbox"> +<a href="http://www.atagar.com/arm/"><img class="icon" src="$(IMGROOT)/icon-Arm.jpg" alt="Arm Icon" width="75" height="75"></a> +<div class="projectdesc"><div class="name"><a href="https://www.torproject.org/projects/arm.html.en">Arm</a></div> <p>Arm is a terminal status monitor for Tor, intended for command-line aficionados and ssh connections. This functions much like top does for system usage, providing real time information on -Tor's resource utilization and state.</p> </td> </tr> -<tr> -<td> -<a href="https://guardianproject.info/apps/orbot/"><img class="icon" - src="$(IMGROOT)/icon-Orbot.jpg" alt="Orbot Icon"></a> -<div class="name"><a -href="https://guardianproject.info/apps/orbot/">Orbot</a></div> -<p>In collaboration with <a href="https://guardianproject.info">The +Tor's resource utilization and state.</p> </div></div> + +<div class="projectbox"> +<a href="https://guardianproject.info/apps/orbot/"><img class="icon" src="$(IMGROOT)/icon-Orbot.jpg" alt="Orbot Icon" width="75" height="75"></a> +<div class="projectdesc"><div class="name"><a href="https://guardianproject.info/apps/orbot/">Orbot</a></div> +<p>In collaboration with <a href="https://guardianproject.info/">The Guardian Project</a>, we're developing Tor on the Google Android mobile -operating system. A related application is <a -href="https://guardianproject.info/apps/orlib/">Orlib</a>; a library for +operating system. A related application is <a href="https://guardianproject.info/apps/orlib/">Orlib</a>; a library for use by any Android application to route Internet traffic through Orbot/Tor.</p> -</td> -<td> -<a href="http://tails.boum.org/"><img class="icon" - src="$(IMGROOT)/icon-Tails.jpg" alt="Tails Icon"></a> -<div class="name"><a href="https://tails.boum.org/">Tails</a></div> +</div></div> + +<div class="projectbox"> +<a href="http://tails.boum.org/"><img class="icon" src="$(IMGROOT)/icon-Tails.jpg" alt="Tails Icon" width="75" height="75"></a> +<div class="projectdesc"><div class="name"><a href="https://tails.boum.org/">Tails</a></div> <p>The Amnesic Incognito Live System is a live CD/USB distribution preconfigured so that everything is safely routed through Tor and leaves no trace on the local system.</p> -</td> -</tr> -<tr> -<td> -<a href="http://torstatus.blutmagie.de/"><img class="icon" - src="$(IMGROOT)/icon-TorStatus.jpg" alt="TorStatus Icon"></a> -<div class="name"><a href="http://torstatus.blutmagie.de/">TorStatus</a></div> +</div></div> + + +<div class="projectbox"> +<a href="http://torstatus.blutmagie.de/"><img class="icon" src="$(IMGROOT)/icon-TorStatus.jpg" alt="TorStatus Icon" width="75" height="75"></a> +<div class="projectdesc"><div class="name"><a href="http://torstatus.blutmagie.de/">TorStatus</a></div> <p>Portal providing an overview of the Tor network, including a list of its -current relays and details on each. Mirrors are also available from <a -href="http://torstatus.cyberphunk.org/">cyberphunk</a> and others.</p> -</td> -<td> -<a href="https://metrics.torproject.org/"><img class="icon" src="$(IMGROOT)/onion.jpg" height="80px"/></a> -<div class="name"><a href="https://metrics.torproject.org/">Metrics Portal</a></div> +current relays and details on each. Mirrors are also available from <a href="http://torstatus.cyberphunk.org/">cyberphunk</a> and others.</p> +</div></div> + +<div class="projectbox"> +<a href="https://metrics.torproject.org/"><img class="icon" src="$(IMGROOT)/onion.jpg" height="80px" alt="" width="78"></a> +<div class="projectdesc"><div class="name"><a href="https://metrics.torproject.org/">Metrics Portal</a></div> <p>Analytics for the Tor network, including graphs of its available bandwidth and estimated userbase. This is a great resource for researchers interested in detailed statistics about Tor.</p> -</td> -</tr> -<tr> -<td> -<a href="https://cloud.torproject.org"><img class="icon" - src="$(IMGROOT)/icon-Cloud.jpg" alt="Cloud Icon"></a> -<div class="name"><a href="https://cloud.torproject.org/">Tor Cloud</a></div> +</div></div> + + +<div class="projectbox"> +<a href="https://cloud.torproject.org/"><img class="icon" src="$(IMGROOT)/icon-Cloud.jpg" alt="Cloud Icon" width="75" height="75"></a> +<div class="projectdesc"><div class="name"><a href="https://cloud.torproject.org/">Tor Cloud</a></div> <p>The Tor Cloud project gives you a user-friendly way of deploying bridges to help users access an uncensored Internet via the Amazon EC2 cloud. By setting up a bridge, you donate bandwidth to the Tor network and help improve the safety and speed at which users can access the Internet. -Get started with <a href="https://cloud.torproject.org">Tor Cloud</a>.</p> -</td> -<td> -<a href="<page projects/obfsproxy>"><img class="icon" src="$(IMGROOT)/onion.jpg" height="80px"/></a> -<div class="name"><a href="<page projects/obfsproxy>">Obfsproxy</a></div> +Get started with <a href="https://cloud.torproject.org/">Tor Cloud</a>.</p> +</div></div> +<div class="projectbox"> +<a href="https://www.torproject.org/projects/obfsproxy.html.en"><img class="icon" src="$(IMGROOT)/onion.jpg" height="80px" alt="" width="78"></a> +<div class="projectdesc"><div class="name"><a href="https://www.torproject.org/projects/obfsproxy.html.en">Obfsproxy</a></div> <p>Obfsproxy is a pluggable transports proxy written in C. It shapes Tor traffic, making it harder for censors to detect and block the Tor protocol.</p> -</td> -</tr> +</div> +</div> -<tr> -<td> -<a href="https://shadow.cs.umn.edu/"><img class="icon" - src="http://shadow.cs.umn.edu/shadow-favicon.png" height="80px"/></a> -<div class="name"><a href="https://shadow.cs.umn.edu/">Shadow</a></div> +<div class="projectbox"> +<a href="https://shadow.cs.umn.edu/"><img src="$(IMGROOT)/shadow-favicon.png" height="80px" alt=""></a> +<div class="projectdesc"><div class="name"><a href="https://shadow.cs.umn.edu/">Shadow</a></div> <p>Shadow is a discrete-event network simulator that runs the real Tor software as a plug-in. Shadow is open-source software that enables accurate, efficient, controlled, and repeatable Tor experimentation.</p> -</td> -</tr> +</div> +</div> + #<td class="beige"> #<div class="name">Project Name</div> #<div class="caps">By Author</div>

1 0

r25466: {} restyle projects page and add shadow icon to images dir (website/trunk/images)
by Arturo Filasto 22 Feb '12

22 Feb '12

Author: art Date: 2012-02-22 07:01:08 +0000 (Wed, 22 Feb 2012) New Revision: 25466 Added: website/trunk/images/shadow-favicon.png Log: restyle projects page and add shadow icon to images dir Added: website/trunk/images/shadow-favicon.png =================================================================== (Binary files differ) Property changes on: website/trunk/images/shadow-favicon.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r25465: {website} fix icon border in shadow (website/trunk/projects/en)
by Arturo Filasto 22 Feb '12

22 Feb '12

Author: art Date: 2012-02-22 06:29:37 +0000 (Wed, 22 Feb 2012) New Revision: 25465 Modified: website/trunk/projects/en/projects.wml Log: fix icon border in shadow Modified: website/trunk/projects/en/projects.wml =================================================================== --- website/trunk/projects/en/projects.wml 2012-02-22 05:59:55 UTC (rev 25464) +++ website/trunk/projects/en/projects.wml 2012-02-22 06:29:37 UTC (rev 25465) @@ -109,7 +109,8 @@ <tr> <td> -<a href="https://shadow.cs.umn.edu/"><img src="http://shadow.cs.umn.edu/shadow-favicon.png" height="80px"/></a> +<a href="https://shadow.cs.umn.edu/"><img class="icon" + src="http://shadow.cs.umn.edu/shadow-favicon.png" height="80px"/></a> <div class="name"><a href="https://shadow.cs.umn.edu/">Shadow</a></div> <p>Shadow is a discrete-event network simulator that runs the real Tor software as a plug-in. Shadow is open-source software that enables

1 0

r25464: {website} fix size in Shadow (website/trunk/projects/en)
by Arturo Filasto 22 Feb '12

22 Feb '12

Author: art Date: 2012-02-22 05:59:55 +0000 (Wed, 22 Feb 2012) New Revision: 25464 Modified: website/trunk/projects/en/projects.wml Log: fix size in Shadow Modified: website/trunk/projects/en/projects.wml =================================================================== --- website/trunk/projects/en/projects.wml 2012-02-22 05:59:19 UTC (rev 25463) +++ website/trunk/projects/en/projects.wml 2012-02-22 05:59:55 UTC (rev 25464) @@ -109,7 +109,7 @@ <tr> <td> -<a href="https://shadow.cs.umn.edu/"><img src="http://shadow.cs.umn.edu/shadow-favicon.png"/></a> +<a href="https://shadow.cs.umn.edu/"><img src="http://shadow.cs.umn.edu/shadow-favicon.png" height="80px"/></a> <div class="name"><a href="https://shadow.cs.umn.edu/">Shadow</a></div> <p>Shadow is a discrete-event network simulator that runs the real Tor software as a plug-in. Shadow is open-source software that enables

1 0

r25463: {website} add Shadow to the projects page (website/trunk/projects/en)
by Arturo Filasto 22 Feb '12

22 Feb '12

Author: art Date: 2012-02-22 05:59:19 +0000 (Wed, 22 Feb 2012) New Revision: 25463 Modified: website/trunk/projects/en/projects.wml Log: add Shadow to the projects page Modified: website/trunk/projects/en/projects.wml =================================================================== --- website/trunk/projects/en/projects.wml 2012-02-22 05:45:51 UTC (rev 25462) +++ website/trunk/projects/en/projects.wml 2012-02-22 05:59:19 UTC (rev 25463) @@ -107,6 +107,16 @@ </td> </tr> +<tr> +<td> +<a href="https://shadow.cs.umn.edu/"><img src="http://shadow.cs.umn.edu/shadow-favicon.png"/></a> +<div class="name"><a href="https://shadow.cs.umn.edu/">Shadow</a></div> +<p>Shadow is a discrete-event network simulator that runs the real +Tor software as a plug-in. Shadow is open-source software that enables +accurate, efficient, controlled, and repeatable Tor experimentation.</p> +</td> +</tr> + #<td class="beige"> #<div class="name">Project Name</div> #<div class="caps">By Author</div>

1 0

r25462: {website} fix icon sizing and typo in projects page (website/trunk/projects/en)
by Arturo Filasto 22 Feb '12

22 Feb '12

Author: art Date: 2012-02-22 05:45:51 +0000 (Wed, 22 Feb 2012) New Revision: 25462 Modified: website/trunk/projects/en/projects.wml Log: fix icon sizing and typo in projects page Modified: website/trunk/projects/en/projects.wml =================================================================== --- website/trunk/projects/en/projects.wml 2012-02-21 23:25:22 UTC (rev 25461) +++ website/trunk/projects/en/projects.wml 2012-02-22 05:45:51 UTC (rev 25462) @@ -80,7 +80,7 @@ href="http://torstatus.cyberphunk.org/">cyberphunk</a> and others.</p> </td> <td> -<a href="https://metrics.torproject.org/"><img class="icon" src="$(IMGROOT)/onion.jpg"/>Metrics Portal</a> +<a href="https://metrics.torproject.org/"><img class="icon" src="$(IMGROOT)/onion.jpg" height="80px"/></a> <div class="name"><a href="https://metrics.torproject.org/">Metrics Portal</a></div> <p>Analytics for the Tor network, including graphs of its available bandwidth and estimated userbase. This is a great resource for researchers interested in @@ -99,7 +99,7 @@ Get started with <a href="https://cloud.torproject.org">Tor Cloud</a>.</p> </td> <td> -<a href="<page projects/obfsproxy>"><img class="icon" src="$(IMGROOT)/onion.jpg"/></a> +<a href="<page projects/obfsproxy>"><img class="icon" src="$(IMGROOT)/onion.jpg" height="80px"/></a> <div class="name"><a href="<page projects/obfsproxy>">Obfsproxy</a></div> <p>Obfsproxy is a pluggable transports proxy written in C. It shapes Tor traffic, making it harder for censors to detect and block the Tor

1 0

[stem/master] Stop running (all) integ tests on receiving a SIGINT. Fix #5199
by atagar＠torproject.org 22 Feb '12

22 Feb '12

commit 9a7b383c18e42cbce093803e8cdd04d98aa900c5 Author: Ravi Chandra Padmala <neenaoffline(a)gmail.com> Date: Wed Feb 22 10:13:52 2012 +0530 Stop running (all) integ tests on receiving a SIGINT. Fix #5199 --- run_tests.py | 5 +++++ test/runner.py | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/run_tests.py b/run_tests.py index 25cd0f2..b59d3c3 100755 --- a/run_tests.py +++ b/run_tests.py @@ -69,6 +69,8 @@ Target = stem.util.enum.UppercaseEnum( DEFAULT_RUN_TARGET = Target.RUN_OPEN +ERROR_ATTR = (term.Color.RED, term.Attr.BOLD) + # Tests are ordered by the dependencies so the lowest level tests come first. # This is because a problem in say, controller message parsing, will cause all # higher level tests to fail too. Hence we want the test that most narrowly @@ -302,6 +304,9 @@ if __name__ == '__main__': print test.output.print_logging(logging_buffer) + except KeyboardInterrupt: + test.output.print_line(" aborted starting tor: keyboard interrupt\n", *ERROR_ATTR) + break except OSError: pass finally: diff --git a/test/runner.py b/test/runner.py index cf596d8..564f503 100644 --- a/test/runner.py +++ b/test/runner.py @@ -548,9 +548,6 @@ class Runner: runtime = time.time() - start_time test.output.print_line(" done (%i seconds)\n" % runtime, *STATUS_ATTR) - except KeyboardInterrupt: - test.output.print_line(" aborted starting tor: keyboard interrupt\n", *ERROR_ATTR) - raise OSError("keyboard interrupt") except OSError, exc: test.output.print_line(" failed to start tor: %s\n" % exc, *ERROR_ATTR) raise exc

1 0

[stem/master] Fixing an unexpected issue during test interrupts
by atagar＠torproject.org 22 Feb '12

22 Feb '12

commit e447d3e24cc852795dce9b77da703c2ec77cd2d0 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Feb 21 15:36:14 2012 -0800 Fixing an unexpected issue during test interrupts When we get a KeyboardInterrupt (ie, the user presses ctrl+c) we sometimes don't have a tor process to kill which results in an unexpected stacktrace. I'm not quite sure why, but if a process doesn't exist then... well... guess we don't need to kill it. --- test/runner.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/test/runner.py b/test/runner.py index 564f503..4b61e8a 100644 --- a/test/runner.py +++ b/test/runner.py @@ -214,7 +214,12 @@ class Runner: test.output.print_noline("Shutting down tor... ", *STATUS_ATTR) if self._tor_process: - self._tor_process.kill() + # if the tor process has stopped on its own then the following raises + # an OSError ([Errno 3] No such process) + + try: self._tor_process.kill() + except OSError: pass + self._tor_process.communicate() # blocks until the process is done # if we've made a temporary data directory then clean it up

1 0