September 2012 - tor-commits - lists.torproject.org

[translation/tsum] Update translations for tsum
by translation＠torproject.org 24 Sep '12

24 Sep '12

commit 76abe2d370c13450af021baede47e5caa7c968a3 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 24 09:15:08 2012 +0000 Update translations for tsum --- fr/short-user-manual_fr_noimg.xhtml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fr/short-user-manual_fr_noimg.xhtml b/fr/short-user-manual_fr_noimg.xhtml index 5aefcb4..7247d7b 100644 --- a/fr/short-user-manual_fr_noimg.xhtml +++ b/fr/short-user-manual_fr_noimg.xhtml @@ -57,7 +57,7 @@ sub 2048R/EB399FD7 2003-10-16 Si tout est bon &quot;Signature correcte&quot; devrait s'afficher. Une mauvaise signature signifie que le fichier peut avoir été altéré ou corrompu. Si vous voyez une signature incorrecte, envoyer les informations concernant le site où vous avez téléchargé le paquet, comment vous avez vous vérifié la signature, et le résultat de GnuPG par email à help(a)rt.torproject.org. Dès lors que vous avez vérifié la signature et vu le message &quot;signature correcte&quot;, poursuivez en décompactant le package. Vous devez obtenir un dossier identique à tor-browser_en-US. A l'intérieur de ce dossier vous trouverez un sous-dossier nommé Docs contenant un fichier nommé changelog. Vous devez vous assurer que le numéro de version apparaissant en haut du fichier changelog correspond au numéro de version du nom du fichier. <h3 id="how-to-use-the-tor-browser-bundle">Comment utiliser le Navigateur Tor?</h3> - After downloading the Tor Browser Bundle, extract the package onto your desktop or a USB stick. You should have a directory containing a few files. One of the files is an executable called "Start Tor Browser" (or "start-tor-browser", depending on your operating system). + Après avoir téléchargé Tor Browser Bundle, décompresser l'archive sur votre bureau ou sur une clé USB. Vous devriez obtenir un répertoire contenant quelques fichiers. Un de ces fichiers est un exécutable appelé "Start Tor Browser" (ou "start-tor-browser", selon votre système d'exploitation). Lorsque que vous démarrerez le package navigateur, vous verrez Vidalia démarrer et se connecter au réseau. Après cela, vous verrez le navigateur vous confirmez que vous utilisez à présent Tor. Cela s'obtient en visualisant <a href="https://check.torproject.org/">https://check.torproject.org/</a>. Vous naviguez dès lors sur Internet à travers Tor. Veuillez noter qu'il est important que vous utilisiez le navigateur fourni avec le paquet, et non pas votre navigateur.

1 0

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

24 Sep '12

commit e4825f0cab8d0d2ee4230ee0d9d0e2dde07dc0a1 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 24 08:45:17 2012 +0000 Update translations for vidalia --- fr/vidalia_fr.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fr/vidalia_fr.po b/fr/vidalia_fr.po index 6446f99..8b07eb2 100644 --- a/fr/vidalia_fr.po +++ b/fr/vidalia_fr.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-09-24 08:13+0000\n" +"PO-Revision-Date: 2012-09-24 08:33+0000\n" "Last-Translator: arpalord <arpalord(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -2128,7 +2128,7 @@ msgid "" "It seems Tor has stopped running since Vidalia started it.\n" "\n" "See the Advanced Message Log for more information." -msgstr "Tor semble être arrêté depuis le lancement de Vidalia.\n\nSee the Advanced Message Log for more information." +msgstr "Tor semble être arrêté depuis le lancement de Vidalia.\n\nVeuillez consulter le journal des messages avancé pour plus d'informations." msgctxt "MainWindow" msgid "" @@ -3276,7 +3276,7 @@ msgctxt "StatusEventWidget" msgid "" "The Tor software encountered an internal bug. Please report the following " "error message to the Tor developers at bugs.torproject.org: \"%1\"" -msgstr "Le programme Tor a rencontré une erreur interne. Merci de transmettre le message d'erruer suivant aux développeurs de Tor à bugs.torproject.org: \"%1\"\n" +msgstr "Le programme Tor a rencontré une erreur interne. Merci de transmettre le message d'erreur suivant aux développeurs de Tor à bugs.torproject.org: \"%1\"" msgctxt "StatusEventWidget" msgid ""

1 0

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

24 Sep '12

commit 571dbfbd93e70e523cb7b55d29d27e985659f1e8 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 24 08:15:11 2012 +0000 Update translations for vidalia --- fr/vidalia_fr.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fr/vidalia_fr.po b/fr/vidalia_fr.po index bb1460f..6446f99 100644 --- a/fr/vidalia_fr.po +++ b/fr/vidalia_fr.po @@ -10,14 +10,14 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-05-22 06:30+0000\n" -"Last-Translator: Jonathan Metzman <jon.metzman(a)gmail.com>\n" +"PO-Revision-Date: 2012-09-24 08:13+0000\n" +"Last-Translator: arpalord <arpalord(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: fr\n" -"Plural-Forms: nplurals=2; plural=(n > 1)\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Vidalia ts2po 0.2\n" msgctxt "AboutDialog" @@ -2128,7 +2128,7 @@ msgid "" "It seems Tor has stopped running since Vidalia started it.\n" "\n" "See the Advanced Message Log for more information." -msgstr "" +msgstr "Tor semble être arrêté depuis le lancement de Vidalia.\n\nSee the Advanced Message Log for more information." msgctxt "MainWindow" msgid ""

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 24 Sep '12

24 Sep '12

commit 18498d526bf8f41b099715a7d9bacb98cbc9cfce Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 24 08:15:07 2012 +0000 Update translations for tsum --- fr/short-user-manual_fr_noimg.xhtml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fr/short-user-manual_fr_noimg.xhtml b/fr/short-user-manual_fr_noimg.xhtml index 78ca405..5aefcb4 100644 --- a/fr/short-user-manual_fr_noimg.xhtml +++ b/fr/short-user-manual_fr_noimg.xhtml @@ -27,7 +27,7 @@ Avant de lancer le Navigateur Tor, vous devriez vous assurer que vous avez la bonne version. Le logiciel que vous allez recevoir est accompagné d'un fichier qui porte le même nom que le package avec l'extension .asc. Ce fichier .asc est un signature GPG et va vous permettre de vérifier que le fichier que vous avez téléchargé est exactement celui que vous souhaitez obtenir. Avant de pouvoir vérifier la signature, vous devez télécharger et installer GnuPG: - Windows: <a href="http://gpg4win.org/download.html">http://gpg4win.org/download.html</a> Mac OS X: <a href="http://www.gpgtools.org/">http://www.gpgtools.org/</a> Linux: Most Linux distributions come with GnuPG preinstalled. + Windows: <a href="http://gpg4win.org/download.html">http://gpg4win.org/download.html</a> Mac OS X: <a href="http://www.gpgtools.org/">http://www.gpgtools.org/</a> Linux: La plupart des distributions Linux embarque une version pré-installée de GnuPG. Veuillez noter qu'il est peut-être nécessaire de modifier les chemins et les commandes utilisés ci-dessous pour fonctionner sur votre PC. Le package Navigateur Tor est signé avec la clé 0x63FEE659 par Erinn Clark. Pour importer la clé de Erinn, lancer: <pre>

1 0

[flashproxy/master] Don't hold the registration lock while registration is happening.
by dcf＠torproject.org 24 Sep '12

24 Sep '12

commit dcfe508ec921df23e2fc4464c40c5d636d8881dd Author: David Fifield <david(a)bamsoftware.com> Date: Sun Sep 23 18:33:53 2012 -0700 Don't hold the registration lock while registration is happening. Do it only for the sake of waking up when the parent thread calls register. --- flashproxy-client | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flashproxy-client b/flashproxy-client index efdfafe..83f620a 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -678,11 +678,11 @@ def register_one(): log("Registration helper ended with status %d." % p.returncode) def registration_thread_func(): - register_condvar.acquire() while True: + register_condvar.acquire() register_condvar.wait() + register_condvar.release() register_one() - register_condvar.release() def proxy_chunk_local_to_remote(local, remote, data = None): if data is None:

1 0

[flashproxy/master] Start the registration thread only after background forking.
by dcf＠torproject.org 24 Sep '12

24 Sep '12

commit e4bccbfe468dc32302bdbdab91ad7ddee79af151 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Sep 23 23:03:57 2012 -0700 Start the registration thread only after background forking. I don't know the exact cause, but something was causing the registration thread to hand at the subprocess.Popen call, but only when the program was run with the --daemon option, which causes it to fork at startup. Starting the thread after the fork seems to make the problem go away. It might be this bugs I found while searching: http://bugs.python.org/issue13817 --- flashproxy-client | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/flashproxy-client b/flashproxy-client index 746f5eb..efdfafe 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -980,12 +980,6 @@ if __name__ == "__main__": # Locals not yet linked with a remote. This is a subset of remotes. unlinked_locals = [] - if options.register: - registration_thread = threading.Thread(target=registration_thread_func, name="register") - registration_thread.daemon = True - registration_thread.start() - register() - if options.daemonize: log(u"Daemonizing.") pid = os.fork() @@ -995,6 +989,13 @@ if __name__ == "__main__": print >> f, pid f.close() sys.exit(0) + + if options.register: + registration_thread = threading.Thread(target=registration_thread_func, name="register") + registration_thread.daemon = True + registration_thread.start() + register() + try: main() except Exception:

1 0

[flashproxy/master] Bail out after OSError on running registration helper.
by dcf＠torproject.org 24 Sep '12

24 Sep '12

commit 9e0953c2fd595f0640d68147471a48dca4480756 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Sep 23 21:42:20 2012 -0700 Bail out after OSError on running registration helper. --- flashproxy-client | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/flashproxy-client b/flashproxy-client index 83f620a..692a0f0 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -670,6 +670,7 @@ def register_one(): stdout, stderr = p.communicate() except OSError, e: log(u"Error running registration helper: %s" % str(e)) + return for line in stdout.splitlines(): log(line) for line in stderr.splitlines():

1 0

[flashproxy/master] Allow --register-addr to inherit from the remote spec.
by dcf＠torproject.org 24 Sep '12

24 Sep '12

commit 4b0292e01bca5aa6e2585340f8bd8a2a09034682 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Sep 23 16:30:12 2012 -0700 Allow --register-addr to inherit from the remote spec. That is, if you've set a remote port, but gave no port for --register-addr, then --register-addr takes the port from the remote spec. --- flashproxy-client | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/flashproxy-client b/flashproxy-client index 637cdc5..f0491dd 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -870,6 +870,8 @@ def main(): report_pending() if __name__ == "__main__": + register_addr_spec = None + opts, args = getopt.gnu_getopt(sys.argv[1:], "f:hl:r", ["daemon", "facilitator=", "help", "log=", "pidfile=", "register", "register-addr=", "unsafe-logging"]) for o, a in opts: if o == "--daemon": @@ -890,7 +892,7 @@ if __name__ == "__main__": print >> sys.stderr, "%s: only one --register-addr is allowed." % sys.argv[0] sys.exit(1) options.register = True - options.register_addr = parse_addr_spec(a, defport=DEFAULT_REMOTE_PORT) + register_addr_spec = a elif o == "--unsafe-logging": options.safe_logging = False @@ -927,8 +929,7 @@ if __name__ == "__main__": options.remote_addrs.append(("0.0.0.0", remote_addr[1])) if socket.has_ipv6: options.remote_addrs.append(("::", remote_addr[1])) - if options.register_addr is None: - options.register_addr = remote_addr + options.register_addr = parse_addr_spec(register_addr_spec or ":", *remote_addr) # Local sockets, accepting SOCKS requests from localhost local_listen = []

1 0

[flashproxy/master] Capture registration helper stdout, stderr, and exit status.
by dcf＠torproject.org 24 Sep '12

24 Sep '12

commit 89e54229a9e94c7cfb385d42d195f65a885a50ff Author: David Fifield <david(a)bamsoftware.com> Date: Sun Sep 23 17:28:15 2012 -0700 Capture registration helper stdout, stderr, and exit status. The registration helpers run in a thread, waiting in an infinite loop until the main process asks for a registration. This is necessary now because flashproxy-client needs to register multiple times in order to keep getting service. When #5426 is done, it should only be necessary to register once in the common case, and the thread won't be necessary. --- flashproxy-client | 39 ++++++++++++++++++++++++++++++++++----- 1 files changed, 34 insertions(+), 5 deletions(-) diff --git a/flashproxy-client b/flashproxy-client index f0491dd..746f5eb 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -13,6 +13,7 @@ import socket import struct import subprocess import sys +import threading import time import traceback import urllib @@ -91,9 +92,14 @@ def safe_str(s): else: return s +log_lock = threading.Lock() def log(msg): - print >> options.log_file, (u"%s %s" % (time.strftime(LOG_DATE_FORMAT), msg)).encode("UTF-8") - options.log_file.flush() + log_lock.acquire() + try: + print >> options.log_file, (u"%s %s" % (time.strftime(LOG_DATE_FORMAT), msg)).encode("UTF-8") + options.log_file.flush() + finally: + log_lock.release() def parse_addr_spec(spec, defhost = None, defport = None): host = None @@ -639,10 +645,15 @@ def report_pending(): log(u"locals (%d): %s" % (len(locals), [safe_format_peername(x) for x in locals])) log(u"remotes (%d): %s" % (len(remotes), [safe_format_peername(x) for x in remotes])) +register_condvar = threading.Condition() def register(): if not options.register: return + register_condvar.acquire() + register_condvar.notify() + register_condvar.release() +def register_one(): # sys.path[0] is initialized to the directory containing the Python script file. script_dir = sys.path[0] if not script_dir: @@ -655,9 +666,23 @@ def register(): command += ["-f", options.facilitator_url] command += [spec] try: - p = subprocess.Popen(command) + p = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + stdout, stderr = p.communicate() except OSError, e: - log(u"Failed to register: %s" % str(e)) + log(u"Error running registration helper: %s" % str(e)) + for line in stdout.splitlines(): + log(line) + for line in stderr.splitlines(): + log(line) + if p.returncode != 0: + log("Registration helper ended with status %d." % p.returncode) + +def registration_thread_func(): + register_condvar.acquire() + while True: + register_condvar.wait() + register_one() + register_condvar.release() def proxy_chunk_local_to_remote(local, remote, data = None): if data is None: @@ -955,7 +980,11 @@ if __name__ == "__main__": # Locals not yet linked with a remote. This is a subset of remotes. unlinked_locals = [] - register() + if options.register: + registration_thread = threading.Thread(target=registration_thread_func, name="register") + registration_thread.daemon = True + registration_thread.start() + register() if options.daemonize: log(u"Daemonizing.")

1 0

[flashproxy/master] 127.0.0.1 no longer needed in flashproxy-exercise.
by dcf＠torproject.org 23 Sep '12

23 Sep '12

commit 71123ed7c7ce22b2a0a92e6d01e4ab469c786668 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Sep 23 16:18:32 2012 -0700 127.0.0.1 no longer needed in flashproxy-exercise. --- experiments/exercise/exercise.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/experiments/exercise/exercise.sh b/experiments/exercise/exercise.sh index 8cfd5b3..24c1342 100755 --- a/experiments/exercise/exercise.sh +++ b/experiments/exercise/exercise.sh @@ -21,7 +21,7 @@ trap stop EXIT date cd "$FLASHPROXY_DIR" -./flashproxy-client --register "127.0.0.1:$LOCAL_PORT" ":$REMOTE_PORT" & +./flashproxy-client --register ":$LOCAL_PORT" ":$REMOTE_PORT" & PIDS_TO_KILL+=($!) sleep 20

1 0