tor-commits January 2012

tor-commits@lists.torproject.org

14 participants
852 discussions

[tor/master] Make openssl 0.9.8l log message accurate
by nickm＠torproject.org 11 Jan '12

11 Jan '12

commit 411cf8f71455926db119259545ac8d5c80a5fb58 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 11 15:41:46 2012 -0500 Make openssl 0.9.8l log message accurate fixes 4837 --- changes/bug4837 | 4 ++++ src/common/tortls.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/bug4837 b/changes/bug4837 new file mode 100644 index 0000000..16a61d1 --- /dev/null +++ b/changes/bug4837 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Fix the log message describing how we work around discovering + that our version is the ill-fated OpenSSL 0.9.8l. Fixes bug + 4837; bugfix on 0.2.2.9-alpha. diff --git a/src/common/tortls.c b/src/common/tortls.c index 28bb3f9..908337f 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -475,8 +475,10 @@ tor_tls_init(void) * a test of intelligence and determination. */ if (version > OPENSSL_V(0,9,8,'k') && version <= OPENSSL_V(0,9,8,'l')) { - log_notice(LD_GENERAL, "OpenSSL %s looks like version 0.9.8l; " - "I will try SSL3_FLAGS to enable renegotation.", + log_notice(LD_GENERAL, "OpenSSL %s looks like version 0.9.8l, but " + "some vendors have backported renegotiation code from " + "0.9.8m without updating the version number. " + "I will try SSL3_FLAGS and SSL_OP to enable renegotation.", SSLeay_version(SSLEAY_VERSION)); use_unsafe_renegotiation_flag = 1; use_unsafe_renegotiation_op = 1;

1 0

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

11 Jan '12

commit 0ffb7cb470ecc0310ba1f98ef47934f68a126e17 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 11 19:15:16 2012 +0000 Update translations for vidalia --- ca/qt_ca.po | 84 ++++++++++++++++++++++++++++++++-------------------------- 1 files changed, 46 insertions(+), 38 deletions(-) diff --git a/ca/qt_ca.po b/ca/qt_ca.po index 87bc48c..ec991de 100644 --- a/ca/qt_ca.po +++ b/ca/qt_ca.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: 2008-08-20 03:25+0000\n" -"PO-Revision-Date: 2012-01-11 18:43+0000\n" +"PO-Revision-Date: 2012-01-11 18:49+0000\n" "Last-Translator: Gerard Farràs Ballabriga <>\n" "Language-Team: none\n" "MIME-Version: 1.0\n" @@ -30,12 +30,12 @@ msgstr "L'executable '%1' requereix Qt %2 i s'ha trobat Qt %3." #: qmessagebox.h:321 msgctxt "QApplication" msgid "Incompatible Qt Library Error" -msgstr "" +msgstr "Error d'incompatibilitat amb la llibreria Qt" #: qapplication.cpp:2095 msgctxt "QApplication" msgid "QT_LAYOUT_DIRECTION" -msgstr "" +msgstr "QT_LAYOUT_DIRECTION" #: qaccessibleobject.cpp:350 msgctxt "QApplication" @@ -245,27 +245,27 @@ msgstr "Enrere" #: ui_qfiledialog.h:274 msgctxt "QFileDialog" msgid "Parent Directory" -msgstr "" +msgstr "Directori superior" #: ui_qfiledialog.h:284 msgctxt "QFileDialog" msgid "List View" -msgstr "" +msgstr "Vista com a llistat" #: ui_qfiledialog.h:289 msgctxt "QFileDialog" msgid "Detail View" -msgstr "" +msgstr "Vista en detall" #: ui_qfiledialog.h:292 msgctxt "QFileDialog" msgid "Files of type:" -msgstr "" +msgstr "Tipus de fitxers:" #: qfiledialog.cpp:883 msgctxt "QFileDialog" msgid "Directory:" -msgstr "" +msgstr "Directori:" #: qfiledialog.cpp:2476 msgctxt "QFileDialog" @@ -274,6 +274,10 @@ msgid "" "Directory not found.\n" "Please verify the correct directory name was given." msgstr "" +"%1\n" +"\n" +"Directori no trobat.\n" +"Si us plau, verifiqueu que s'ha proporcionat un nom de directori correcte." #: qfiledialog.cpp:2281 msgctxt "QFileDialog" @@ -281,96 +285,98 @@ msgid "" "'%1' is write protected.\n" "Do you want to delete it anyway?" msgstr "" +"'%1' està protegit per escriptura.\n" +"El desitgeu suprimir igualment?" #: qfiledialog.cpp:2286 msgctxt "QFileDialog" msgid "Are sure you want to delete '%1'?" -msgstr "" +msgstr "Esteu segur que desitgeu suprimir '%1'?" #: qfiledialog.cpp:2299 msgctxt "QFileDialog" msgid "Could not delete directory." -msgstr "" +msgstr "Podria no suprimir aquest directori." #: qfiledialog_win.cpp:128 msgctxt "QFileDialog" msgid "All Files (*.*)" -msgstr "" +msgstr "Tots els fitxers (*.*)" #: qfiledialog.cpp:437 msgctxt "QFileDialog" msgid "Save As" -msgstr "" +msgstr "Desa com a" #: qfileiconprovider.cpp:379 msgctxt "QFileDialog" msgid "Drive" -msgstr "" +msgstr "Unitat" #: qfileiconprovider.cpp:383 msgctxt "QFileDialog" msgid "File" -msgstr "" +msgstr "Fitxer" #: qfileiconprovider.cpp:412 msgctxt "QFileDialog" msgid "Unknown" -msgstr "" +msgstr "Desconegut" #: qfiledialog.cpp:439 msgctxt "QFileDialog" msgid "Find Directory" -msgstr "" +msgstr "Cerca directori" #: qfiledialog.cpp:458 msgctxt "QFileDialog" msgid "Show " -msgstr "" +msgstr "Mostra" #: ui_qfiledialog.h:269 msgctxt "QFileDialog" msgid "Forward" -msgstr "" +msgstr "Reenvia" #: qfiledialog.cpp:2137 msgctxt "QFileDialog" msgid "New Folder" -msgstr "" +msgstr "Nova carpeta" #: qfiledialog.cpp:465 msgctxt "QFileDialog" msgid "&New Folder" -msgstr "" +msgstr "&Nova carpeta" #: qfiledialog.cpp:917 msgctxt "QFileDialog" msgid "&Choose" -msgstr "" +msgstr "&Escolliu" #: qsidebar.cpp:388 msgctxt "QFileDialog" msgid "Remove" -msgstr "" +msgstr "Suprimeix" #: qfiledialog.cpp:886 msgctxt "QFileDialog" msgid "File &name:" -msgstr "" +msgstr "Nom de fitxer:" #: ui_qfiledialog.h:261 msgctxt "QFileDialog" msgid "Look in:" -msgstr "" +msgstr "Mira a:" #: ui_qfiledialog.h:279 msgctxt "QFileDialog" msgid "Create New Folder" -msgstr "" +msgstr "Crea nova carpeta" #: qfilesystemmodel.cpp:761 msgctxt "QFileSystemModel" msgid "Invalid filename" -msgstr "" +msgstr "Nom de fitxer invàlid" #: qfilesystemmodel.cpp:763 msgctxt "QFileSystemModel" @@ -378,65 +384,67 @@ msgid "" "The name \"%1\" can not be used.Try using another name, with fewer" " characters or no punctuations marks." msgstr "" +"No es pot utilitzar el nom \"%1\".Intenteu utilitzar un altre nom," +" amb menys caracters o sense marques de puntuació." #: qfilesystemmodel.cpp:832 msgctxt "QFileSystemModel" msgid "Name" -msgstr "" +msgstr "Nom" #: qfilesystemmodel.cpp:834 msgctxt "QFileSystemModel" msgid "Size" -msgstr "" +msgstr "Mida" #: qfilesystemmodel.cpp:838 msgctxt "QFileSystemModel" msgid "Kind" -msgstr "" +msgstr "Tipus" #: qfilesystemmodel.cpp:840 msgctxt "QFileSystemModel" msgid "Type" -msgstr "" +msgstr "Tipus" #: qfilesystemmodel.cpp:847 msgctxt "QFileSystemModel" msgid "Date Modified" -msgstr "" +msgstr "Data de modificació" #: qfilesystemmodel_p.h:198 msgctxt "QFileSystemModel" msgid "My Computer" -msgstr "" +msgstr "El meu ordinador" #: qfilesystemmodel_p.h:200 msgctxt "QFileSystemModel" msgid "Computer" -msgstr "" +msgstr "Ordinador" #: qfilesystemmodel.cpp:677 msgctxt "QFileSystemModel" msgid "%1 TB" -msgstr "" +msgstr "%1 TB" #: qfilesystemmodel.cpp:679 msgctxt "QFileSystemModel" msgid "%1 GB" -msgstr "" +msgstr "%1 GB" #: qfilesystemmodel.cpp:681 msgctxt "QFileSystemModel" msgid "%1 MB" -msgstr "" +msgstr "%1 MB" #: qfilesystemmodel.cpp:683 msgctxt "QFileSystemModel" msgid "%1 KB" -msgstr "" +msgstr "%1 KB" #: qfilesystemmodel.cpp:684 msgctxt "QFileSystemModel" msgid "%1 bytes" -msgstr "" +msgstr "%1 bytes"

1 0

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

11 Jan '12

commit 2b140dfe716a9f0b1414281ee77a947affa89052 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 11 18:45:16 2012 +0000 Update translations for vidalia --- ca/qt_ca.po | 7 +++-- ca/vidalia_ca.po | 66 +++++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 60 insertions(+), 13 deletions(-) diff --git a/ca/qt_ca.po b/ca/qt_ca.po index a73f11e..87bc48c 100644 --- a/ca/qt_ca.po +++ b/ca/qt_ca.po @@ -1,13 +1,14 @@ # # Translators: +# Gerard Farràs Ballabriga <>, 2012. # runasand <runa.sandvik(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: 2008-08-20 03:25+0000\n" -"PO-Revision-Date: 2010-12-05 19:59+0000\n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2012-01-11 18:43+0000\n" +"Last-Translator: Gerard Farràs Ballabriga <>\n" "Language-Team: none\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,7 +25,7 @@ msgstr "Activa" #: qmessagebox.h:319 msgctxt "QApplication" msgid "Executable '%1' requires Qt %2, found Qt %3." -msgstr "" +msgstr "L'executable '%1' requereix Qt %2 i s'ha trobat Qt %3." #: qmessagebox.h:321 msgctxt "QApplication" diff --git a/ca/vidalia_ca.po b/ca/vidalia_ca.po index 168460d..9d32a7a 100755 --- a/ca/vidalia_ca.po +++ b/ca/vidalia_ca.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-01-11 17:58+0000\n" +"PO-Revision-Date: 2012-01-11 18:40+0000\n" "Last-Translator: Gerard Farràs Ballabriga <>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -3284,6 +3284,9 @@ msgid "" "software, which may contain important security, reliability and performance " "fixes." msgstr "" +"Esteu executant la versió \"%1\" del Tor, la qual ja no està suportada. Si " +"us plau, actualitzeu-vos a la versió més recent, que conté correccions " +"relacionades amb la seguretat, la fiabilitat i el rendiment. " msgctxt "StatusEventWidget" msgid "" @@ -3292,30 +3295,38 @@ msgid "" "version of the software, which may contain important security, reliability " "and performance fixes." msgstr "" +"Esteu executant la versió \"%1\" del Tor, que probablement ja no funciona " +"amb la xarxa de Tor actual. Si us plau, actualitze-vos a la versió més " +"recent, que conté correccions relacionades amb la seguretat, la fibilitat i " +"el rendiment." msgctxt "StatusEventWidget" msgid "Your Tor Software is Out-of-date" -msgstr "" +msgstr "El seu Tor està desactualitzat" msgctxt "StatusEventWidget" msgid "Connected to the Tor Network" -msgstr "" +msgstr "S'ha connectat a la xarxa Tor" msgctxt "StatusEventWidget" msgid "" "We were able to successfully establish a connection to the Tor network. You " "can now configure your applications to use the Internet anonymously." msgstr "" +"Estem en condicions de connectar-nos correctament a la xarxa Tor. Ara, podeu" +" configurar aplicacions per tal d'utilitzar Internet de manera anònima." msgctxt "StatusEventWidget" msgid "Tor Software Error" -msgstr "" +msgstr "Error del Tor" 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 "" +"El Tor ha topat amb un error de programació. Si us plau, informeu als " +"desenvolupadors de l'error següent a bugs.torproject.org: \"%1\"" msgctxt "StatusEventWidget" msgid "" @@ -3324,6 +3335,10 @@ msgid "" "will not be able to function. Please verify your computer displays the " "correct time." msgstr "" +"El Tor ha determinat que el rellotge del seu sistema està establert %1 " +"seconds en el passat que el de la font de \"%2\". Si l'hora del seu rellotge" +" no és correcta, el Tor no podrà funcionar correctament. Si us plau, " +"verifiqueu que el seu sistema tingui l'hrora correcta." msgctxt "StatusEventWidget" msgid "" @@ -3332,10 +3347,14 @@ msgid "" "will not be able to function. Please verify your computer displays the " "correct time." msgstr "" +"El Tor ha determinat que el rellotge del seu sistema està establert %1 " +"seconds en el futur que el de la font de \"%2\". Si l'hora del seu rellotge " +"no és correcta, el Tor no podrà funcionar correctament. Si us plau, " +"verifiqueu que el seu sistema tingui l'hrora correcta." msgctxt "StatusEventWidget" msgid "Your Computer's Clock is Potentially Incorrect" -msgstr "" +msgstr "L'hora del seu sistema és potencialment incorrecta" msgctxt "StatusEventWidget" msgid "" @@ -3344,6 +3363,10 @@ msgid "" "information over the Tor network is dangerous and not recommended. For your " "protection, Tor has automatically closed this connection." msgstr "" +"Una de les aplicacions del seu sistema ha intentat realitzar una connexió no" +" xifrada al Tor a través del port %1. Enviar informació en clar a través de " +"la xarxa Tor és perillós i no està recomanat. Per la seva protecció, el Tor " +"ha tancat de manera automàtica aquesta connexió." msgctxt "StatusEventWidget" msgid "" @@ -3351,10 +3374,13 @@ msgid "" "unencrypted connection through Tor to port %1. Sending unencrypted " "information over the Tor network is dangerous and not recommended." msgstr "" +"Una de les aplicacions del seu sistema ha intentat realitzar una connexió no" +" xifrada al Tor a través del port %1. Enviar informació en clar a través de " +"la xarxa Tor és perillós i no està recomanat. " msgctxt "StatusEventWidget" msgid "Potentially Dangerous Connection!" -msgstr "" +msgstr "Connexió potencialment perillosa!" msgctxt "StatusEventWidget" msgid "" @@ -3363,10 +3389,15 @@ msgid "" "ensure you configure your applications to use only SOCKS4a or SOCKS5 with " "remote hostname resolution." msgstr "" +"Una de les vostres aplicacions ha establert una connexió a través del Tor a " +"\"%1\" utilitzant un protocol que podria proporcionar informació sobre la " +"seva destinació. Si us plau, assegureu-vos que heu configurat les vostres " +"aplicacions per tal d'utilitzar solament SOCKS4 i SOCKS5 amb resolució " +"d'objectiu remot." msgctxt "StatusEventWidget" msgid "Unknown SOCKS Protocol" -msgstr "" +msgstr "Protocol SOCKS desconegut" msgctxt "StatusEventWidget" msgid "" @@ -3374,10 +3405,14 @@ msgid "" " protocol that Tor does not understand. Please ensure you configure your " "applications to use only SOCKS4a or SOCKS5 with remote hostname resolution." msgstr "" +"Una de les vostres aplicacions ha establert una connexió a través del Tor " +"emprant un protocol que aquest no compren. Si us plau, assegureu-vos que heu" +" configurat les vostres aplicacions per tal d'utilitzar solament SOCKS4 i " +"SOCKS5 amb resolució d'objectiu remot." msgctxt "StatusEventWidget" msgid "Invalid Destination Hostname" -msgstr "" +msgstr "Destinació d'objectiu invàlida" msgctxt "StatusEventWidget" msgid "" @@ -3385,10 +3420,13 @@ msgid "" "\"%1\", which Tor does not recognize as a valid hostname. Please check your " "application's configuration." msgstr "" +"Una de les vostres aplicacions ha intentat establir una connexió via el Tor " +"a \"%1\", que aquest no reconeix com a objectiu vàlid. Si us plau, reviseu " +"la configuració de la seva aplicació." msgctxt "StatusEventWidget" msgid "External IP Address Changed" -msgstr "" +msgstr "L'adreça IP externa s'ha canviat" msgctxt "StatusEventWidget" msgid "" @@ -3399,7 +3437,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "DNS Hijacking Detected" -msgstr "" +msgstr "Detecció de DNS Hijacking" msgctxt "StatusEventWidget" msgid "" @@ -3407,6 +3445,10 @@ msgid "" " that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are " "known to do this in order to display their own search or advertising pages." msgstr "" +"El Tor ha detectat que el seu proveïdor de DNS està proveïnt de respostes " +"falses per dominis que no existeixen. És conegut que alguns ISPs i d'altres " +"proveïdors de DNS, com per exemple, OpenDNS, fan això per tal de mostrar les" +" seves pròpies pàgines de cerca o de publicitat." msgctxt "StatusEventWidget" msgid "" @@ -3414,6 +3456,10 @@ msgid "" "known domains. Since clients rely on Tor network relays to provide accurate " "DNS repsonses, your relay will not be configured as an exit relay." msgstr "" +"El Tor ha detectat que el seu proveïdor de DNS està proveïnt de respostes " +"falses per a dominis reconeguts. Since clients rely on Tor network relays to" +" provide accurate DNS repsonses, your relay will not be configured as an " +"exit relay." msgctxt "StatusEventWidget" msgid "Checking Server Port Reachability"

1 0

[stem/master] Testing argument to run with a tor binary
by atagar＠torproject.org 11 Jan '12

11 Jan '12

commit 13c3975bc3585847dd204d074a66394786bf2007 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jan 11 10:20:30 2012 -0800 Testing argument to run with a tor binary Adding a '--tor PATH' argument so the caller can select the tor binary they want to run against. --- run_tests.py | 12 ++++++++++-- stem/process.py | 8 ++++++-- test/runner.py | 12 +++++++----- 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/run_tests.py b/run_tests.py index 1b252df..f458a80 100755 --- a/run_tests.py +++ b/run_tests.py @@ -33,7 +33,7 @@ import stem.util.log as log import stem.util.term as term OPT = "uic:t:l:h" -OPT_EXPANDED = ["unit", "integ", "config=", "targets=", "log=", "help"] +OPT_EXPANDED = ["unit", "integ", "config=", "targets=", "log=", "tor=", "help"] DIVIDER = "=" * 70 # Tests are ordered by the dependencies so the lowest level tests come first. @@ -86,6 +86,7 @@ Runs tests for the stem library. -t, --target TARGET comma separated list of extra targets for integ tests -l, --log RUNLEVEL includes logging output with test results, runlevels: TRACE, DEBUG, INFO, NOTICE, WARN, ERROR + --tor PATH custom tor binary to run testing against -h, --help presents this help Integration targets: @@ -123,6 +124,7 @@ if __name__ == '__main__': config_path = None test_config = stem.util.conf.get_config("test") logging_runlevel = None + tor_cmd = "tor" # parses user input, noting any issues try: @@ -158,6 +160,12 @@ if __name__ == '__main__': print "'%s' isn't a logging runlevel, use one of the following instead:" % arg print " TRACE, DEBUG, INFO, NOTICE, WARN, ERROR" sys.exit(1) + elif opt in ("--tor"): + if not os.path.exists(arg): + print "Unable to start tor, '%s' does not exists." % arg + sys.exit(1) + + tor_cmd = arg elif opt in ("-h", "--help"): # Prints usage information and quits. This includes a listing of the # valid integration targets. @@ -260,7 +268,7 @@ if __name__ == '__main__': for connection_type in connection_types: try: - integ_runner.start(connection_type = connection_type) + integ_runner.start(tor_cmd, connection_type = connection_type) print term.format("Running tests...", term.Color.BLUE, term.Attr.BOLD) print diff --git a/stem/process.py b/stem/process.py index 0bb9740..2b00117 100644 --- a/stem/process.py +++ b/stem/process.py @@ -13,7 +13,7 @@ import subprocess # number of seconds before we time out our attempt to start a tor instance DEFAULT_INIT_TIMEOUT = 90 -def launch_tor(torrc_path, completion_percent = 100, init_msg_handler = None, timeout = DEFAULT_INIT_TIMEOUT): +def launch_tor(tor_cmd = "tor", torrc_path = None, completion_percent = 100, init_msg_handler = None, timeout = DEFAULT_INIT_TIMEOUT): """ Initializes a tor process. This blocks until initialization completes or we error out. @@ -24,6 +24,7 @@ def launch_tor(torrc_path, completion_percent = 100, init_msg_handler = None, ti to get stuck, taking well over the default timeout. Arguments: + tor_cmd (str) - command for starting tor torrc_path (str) - location of the torrc for us to use completion_percent (int) - percent of bootstrap completion at which this'll return @@ -45,7 +46,10 @@ def launch_tor(torrc_path, completion_percent = 100, init_msg_handler = None, ti raise OSError("torrc doesn't exist (%s)" % torrc_path) # starts a tor subprocess, raising an OSError if it fails - tor_process = subprocess.Popen(["tor", "-f", torrc_path], stdout = subprocess.PIPE, stderr = subprocess.PIPE) + runtime_args = [tor_cmd] + if torrc_path: runtime_args += ["-f", torrc_path] + + tor_process = subprocess.Popen(runtime_args, stdout = subprocess.PIPE, stderr = subprocess.PIPE) if timeout: def timeout_handler(signum, frame): diff --git a/test/runner.py b/test/runner.py index 10c4699..cfe6dbb 100644 --- a/test/runner.py +++ b/test/runner.py @@ -139,12 +139,13 @@ class Runner: self._connection_type = None self._tor_process = None - def start(self, connection_type = DEFAULT_TOR_CONNECTION, quiet = False): + def start(self, tor_cmd, connection_type = DEFAULT_TOR_CONNECTION, quiet = False): """ Makes temporary testing resources and starts tor, blocking until it completes. Arguments: + tor_cmd (str) - command to start tor with connection_type (TorConnection) - method for controllers to authenticate to tor quiet (bool) - if False then this prints status information as we start @@ -190,7 +191,7 @@ class Runner: try: self._tor_cwd = os.getcwd() self._run_setup(quiet) - self._start_tor(quiet) + self._start_tor(tor_cmd, quiet) # revert our cwd back to normal if self._config["test.integ.target.relative_data_dir"]: @@ -478,13 +479,14 @@ class Runner: _print_status("failed (%s)\n\n" % exc, ERROR_ATTR, quiet) raise OSError(exc) - def _start_tor(self, quiet): + def _start_tor(self, tor_cmd, quiet): """ Initializes a tor process. This blocks until initialization completes or we error out. Arguments: - quiet (bool) - prints status information to stdout if False + tor_cmd (str) - command to start tor with + quiet (bool) - prints status information to stdout if False Raises: OSError if we either fail to create the tor process or reached a timeout @@ -503,7 +505,7 @@ class Runner: print_init_line = lambda line: _print_status(" %s\n" % line, SUBSTATUS_ATTR, quiet) torrc_dst = os.path.join(self._test_dir, "torrc") - self._tor_process = stem.process.launch_tor(torrc_dst, complete_percent, print_init_line) + self._tor_process = stem.process.launch_tor(tor_cmd, torrc_dst, complete_percent, print_init_line) runtime = time.time() - start_time _print_status(" done (%i seconds)\n\n" % runtime, STATUS_ATTR, quiet)

1 0

[stem/master] Mocking utility functions
by atagar＠torproject.org 11 Jan '12

11 Jan '12

commit 11cbf61c2dca7cde628e5eec4f3dd4da7867860f Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jan 10 09:49:26 2012 -0800 Mocking utility functions As the tests grow I've found that I'm repeating a lot of mocking logic. Making a nice, general purpose utility to make mocking easier and less error prone. A benefit of this (and the original goal) is that we'll be able to remove stem.util.system.CALL_MOCKING. Testing code in the library is icky, and once we swap over the system integ tests we'll be able to remove this override function. --- test/__init__.py | 2 +- test/mocking.py | 75 ++++++++++++++++++++++++++++++++++++++++++++++ test/unit/util/system.py | 40 ++++++++++++++---------- 3 files changed, 100 insertions(+), 17 deletions(-) diff --git a/test/__init__.py b/test/__init__.py index a663300..93250e2 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -2,5 +2,5 @@ Unit and integration tests for the stem library. """ -__all__ = ["output", "runner"] +__all__ = ["mocking", "output", "runner"] diff --git a/test/mocking.py b/test/mocking.py new file mode 100644 index 0000000..740bcb7 --- /dev/null +++ b/test/mocking.py @@ -0,0 +1,75 @@ +""" +Helper functions for creating mock objects and monkey patching to help with +testing. +""" + +import inspect +import itertools + +# Once we've mocked a function we can't rely on its __module__ or __name__ +# attributes, so instead we associate a unique 'mock_id' attribute that maps +# back to the original attributes. + +MOCK_ID = itertools.count(0) + +# mock_id => (module, function_name, original_function) + +MOCK_STATE = {} + +def no_op(): + def _no_op(*args): pass + return _no_op + +def return_value(value): + def _return_value(*args): return value + return _return_value + +def return_true(): return return_value(True) +def return_false(): return return_value(False) +def return_none(): return return_value(None) + +def mock(target, mock_call): + """ + Mocks the given function, saving the initial implementation so it can be + reverted later. + + Arguments: + target (function) - function to be mocked + mock_call (functor) - mocking to replace the function with + """ + + if "mock_id" in target.__dict__: + # we're overriding an already mocked function + mocking_id = target.__dict__["mock_id"] + target_module, target_function, _ = MOCK_STATE[mocking_id] + else: + # this is a new mocking, save the original state + mocking_id = MOCK_ID.next() + target_module = inspect.getmodule(target) + target_function = target.__name__ + MOCK_STATE[mocking_id] = (target_module, target_function, target) + + mock_wrapper = lambda *args: mock_call(*args) + mock_wrapper.__dict__["mock_id"] = mocking_id + + # mocks the function with this wrapper + target_module.__dict__[target_function] = mock_wrapper + +def revert_mocking(): + """ + Reverts any mocking done by this function. + """ + + # Reverting mocks in reverse order. If we properly reuse mock_ids then this + # shouldn't matter, but might as well be safe. + + mock_ids = MOCK_STATE.keys() + mock_ids.sort() + mock_ids.reverse() + + for mock_id in mock_ids: + module, function, impl = MOCK_STATE[mock_id] + module.__dict__[function] = impl + + MOCK_STATE.clear() + diff --git a/test/unit/util/system.py b/test/unit/util/system.py index e3d1225..4821073 100644 --- a/test/unit/util/system.py +++ b/test/unit/util/system.py @@ -7,6 +7,8 @@ system running the tests. import functools import unittest +import test.mocking +import stem.util.proc import stem.util.system as system # Base responses for the get_pid_by_name tests. The 'success' and @@ -74,9 +76,13 @@ class TestSystem(unittest.TestCase): Tests the stem.util.system contents. """ + def setUp(self): + test.mocking.mock(stem.util.proc.is_available, test.mocking.return_false()) + test.mocking.mock(system.is_available, test.mocking.return_true()) + test.mocking.mock(system.call, test.mocking.return_none()) + def tearDown(self): - # resets call mocking back to being disabled - system.CALL_MOCKING = None + test.mocking.revert_mocking() def test_is_running(self): """ @@ -87,7 +93,7 @@ class TestSystem(unittest.TestCase): running_commands = ["irssi", "moc", "tor", "ps", " firefox "] for ps_cmd in (system.IS_RUNNING_PS_LINUX, system.IS_RUNNING_PS_BSD): - system.CALL_MOCKING = functools.partial(mock_call, ps_cmd, running_commands) + test.mocking.mock(system.call, functools.partial(mock_call, ps_cmd, running_commands)) self.assertTrue(system.is_running("irssi")) self.assertTrue(system.is_running("moc")) @@ -97,7 +103,7 @@ class TestSystem(unittest.TestCase): self.assertEqual(False, system.is_running("something_else")) # mock both calls failing - system.CALL_MOCKING = lambda cmd: None + test.mocking.mock(system.call, test.mocking.return_none()) self.assertFalse(system.is_running("irssi")) self.assertEquals(None, system.is_running("irssi")) @@ -109,7 +115,7 @@ class TestSystem(unittest.TestCase): responses = dict(GET_PID_BY_NAME_BASE_RESULTS) responses["success"] = ["1111"] responses["multiple_results"] = ["123", "456", "789"] - system.CALL_MOCKING = functools.partial(mock_call, system.GET_PID_BY_NAME_PGREP, responses) + test.mocking.mock(system.call, functools.partial(mock_call, system.GET_PID_BY_NAME_PGREP, responses)) for test_input in responses: expected_response = 1111 if test_input == "success" else None @@ -123,7 +129,7 @@ class TestSystem(unittest.TestCase): responses = dict(GET_PID_BY_NAME_BASE_RESULTS) responses["success"] = ["1111"] responses["multiple_results"] = ["123 456 789"] - system.CALL_MOCKING = functools.partial(mock_call, system.GET_PID_BY_NAME_PIDOF, responses) + test.mocking.mock(system.call, functools.partial(mock_call, system.GET_PID_BY_NAME_PIDOF, responses)) for test_input in responses: expected_response = 1111 if test_input == "success" else None @@ -134,10 +140,11 @@ class TestSystem(unittest.TestCase): Tests the get_pid_by_name function with the linux variant of ps. """ + test.mocking.mock(system.is_bsd, test.mocking.return_false()) responses = dict(GET_PID_BY_NAME_BASE_RESULTS) responses["success"] = ["PID", " 1111"] responses["multiple_results"] = ["PID", " 123", " 456", " 789"] - system.CALL_MOCKING = functools.partial(mock_call, system.GET_PID_BY_NAME_PS_LINUX, responses) + test.mocking.mock(system.call, functools.partial(mock_call, system.GET_PID_BY_NAME_PS_LINUX, responses)) for test_input in responses: expected_response = 1111 if test_input == "success" else None @@ -148,7 +155,8 @@ class TestSystem(unittest.TestCase): Tests the get_pid_by_name function with the bsd variant of ps. """ - system.CALL_MOCKING = functools.partial(mock_call, system.GET_PID_BY_NAME_PS_BSD, GET_PID_BY_NAME_PS_BSD) + test.mocking.mock(system.is_bsd, test.mocking.return_true()) + test.mocking.mock(system.call, functools.partial(mock_call, system.GET_PID_BY_NAME_PS_BSD, GET_PID_BY_NAME_PS_BSD)) self.assertEquals(1, system.get_pid_by_name("launchd")) self.assertEquals(11, system.get_pid_by_name("DirectoryService")) self.assertEquals(None, system.get_pid_by_name("blarg")) @@ -161,7 +169,7 @@ class TestSystem(unittest.TestCase): responses = dict(GET_PID_BY_NAME_BASE_RESULTS) responses["success"] = ["1111"] responses["multiple_results"] = ["123", "456", "789"] - system.CALL_MOCKING = functools.partial(mock_call, system.GET_PID_BY_NAME_LSOF, responses) + test.mocking.mock(system.call, functools.partial(mock_call, system.GET_PID_BY_NAME_LSOF, responses)) for test_input in responses: expected_response = 1111 if test_input == "success" else None @@ -172,7 +180,7 @@ class TestSystem(unittest.TestCase): Tests the get_pid_by_port function with a netstat response. """ - system.CALL_MOCKING = functools.partial(mock_call, system.GET_PID_BY_PORT_NETSTAT, GET_PID_BY_PORT_NETSTAT_RESULTS) + test.mocking.mock(system.call, functools.partial(mock_call, system.GET_PID_BY_PORT_NETSTAT, GET_PID_BY_PORT_NETSTAT_RESULTS)) self.assertEquals(1641, system.get_pid_by_port(9051)) self.assertEquals(1641, system.get_pid_by_port("9051")) self.assertEquals(None, system.get_pid_by_port(631)) @@ -183,7 +191,7 @@ class TestSystem(unittest.TestCase): Tests the get_pid_by_port function with a sockstat response. """ - system.CALL_MOCKING = functools.partial(mock_call, system.GET_PID_BY_PORT_SOCKSTAT % 9051, GET_PID_BY_PORT_SOCKSTAT_RESULTS) + test.mocking.mock(system.call, functools.partial(mock_call, system.GET_PID_BY_PORT_SOCKSTAT % 9051, GET_PID_BY_PORT_SOCKSTAT_RESULTS)) self.assertEquals(4397, system.get_pid_by_port(9051)) self.assertEquals(4397, system.get_pid_by_port("9051")) self.assertEquals(None, system.get_pid_by_port(123)) @@ -193,7 +201,7 @@ class TestSystem(unittest.TestCase): Tests the get_pid_by_port function with a lsof response. """ - system.CALL_MOCKING = functools.partial(mock_call, system.GET_PID_BY_PORT_LSOF, GET_PID_BY_PORT_LSOF_RESULTS) + test.mocking.mock(system.call, functools.partial(mock_call, system.GET_PID_BY_PORT_LSOF, GET_PID_BY_PORT_LSOF_RESULTS)) self.assertEquals(1745, system.get_pid_by_port(9051)) self.assertEquals(1745, system.get_pid_by_port("9051")) self.assertEquals(329, system.get_pid_by_port(80)) @@ -205,7 +213,7 @@ class TestSystem(unittest.TestCase): """ lsof_query = system.GET_PID_BY_FILE_LSOF % "/tmp/foo" - system.CALL_MOCKING = functools.partial(mock_call, lsof_query, ["4762"]) + test.mocking.mock(system.call, functools.partial(mock_call, lsof_query, ["4762"])) self.assertEquals(4762, system.get_pid_by_open_file("/tmp/foo")) self.assertEquals(None, system.get_pid_by_open_file("/tmp/somewhere_else")) @@ -221,7 +229,7 @@ class TestSystem(unittest.TestCase): "7878": None, } - system.CALL_MOCKING = functools.partial(mock_call, system.GET_CWD_PWDX, responses) + test.mocking.mock(system.call, functools.partial(mock_call, system.GET_CWD_PWDX, responses)) for test_input in responses: expected_response = "/home/atagar" if test_input == "3799" else None @@ -238,7 +246,7 @@ class TestSystem(unittest.TestCase): "7878": None, } - system.CALL_MOCKING = functools.partial(mock_call, system.GET_CWD_LSOF, responses) + test.mocking.mock(system.call, functools.partial(mock_call, system.GET_CWD_LSOF, responses)) for test_input in responses: expected_response = "/Users/atagar/tor/src/or" if test_input == "75717" else None @@ -258,7 +266,7 @@ class TestSystem(unittest.TestCase): "6666": None } - system.CALL_MOCKING = functools.partial(mock_call, system.GET_BSD_JAIL_ID_PS, responses) + test.mocking.mock(system.call, functools.partial(mock_call, system.GET_BSD_JAIL_ID_PS, responses)) for test_input in responses: expected_response = 1 if test_input == "1111" else 0

1 0

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

11 Jan '12

commit 9d1c66683a80d4f63fd92907a13c112b056cea02 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 11 18:15:17 2012 +0000 Update translations for vidalia --- ca/vidalia_ca.po | 213 ++++++++++++++++++++++++++++-------------------------- 1 files changed, 112 insertions(+), 101 deletions(-) diff --git a/ca/vidalia_ca.po b/ca/vidalia_ca.po index 54150bf..168460d 100755 --- a/ca/vidalia_ca.po +++ b/ca/vidalia_ca.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-01-11 17:43+0000\n" +"PO-Revision-Date: 2012-01-11 17:58+0000\n" "Last-Translator: Gerard Farràs Ballabriga <>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -963,155 +963,155 @@ msgstr "Rússia" msgctxt "CountryInfo" msgid "Rwanda" -msgstr "" +msgstr "Ruanda" msgctxt "CountryInfo" msgid "Saint Kitts & Nevis" -msgstr "" +msgstr "Saint Kitts i Nevis" msgctxt "CountryInfo" msgid "Saint Lucia" -msgstr "" +msgstr "Santa Llúcia" msgctxt "CountryInfo" msgid "Saint Vincent & the Grenadines" -msgstr "" +msgstr "Saint Vincent i les Grenadines" msgctxt "CountryInfo" msgid "Samoa" -msgstr "" +msgstr "Samoa" msgctxt "CountryInfo" msgid "San Marino" -msgstr "" +msgstr "Sant Marino" msgctxt "CountryInfo" msgid "Sao Tome & Principe" -msgstr "" +msgstr "São Tomé i Príncipe " msgctxt "CountryInfo" msgid "Saudi Arabia" -msgstr "" +msgstr "Aràbia Saudita" msgctxt "CountryInfo" msgid "Senegal" -msgstr "" +msgstr "Senegal" msgctxt "CountryInfo" msgid "Serbia" -msgstr "" +msgstr "Sèrbia" msgctxt "CountryInfo" msgid "Seychelles" -msgstr "" +msgstr "Seychelles" msgctxt "CountryInfo" msgid "Sierra Leone" -msgstr "" +msgstr "Sierra Leona" msgctxt "CountryInfo" msgid "Singapore" -msgstr "" +msgstr "Singapur" msgctxt "CountryInfo" msgid "Slovakia" -msgstr "" +msgstr "Eslovàquia" msgctxt "CountryInfo" msgid "Slovenia" -msgstr "" +msgstr "Eslovènia" msgctxt "CountryInfo" msgid "Solomon Islands" -msgstr "" +msgstr "Illes Salomó" msgctxt "CountryInfo" msgid "Somalia" -msgstr "" +msgstr "Somàlia" msgctxt "CountryInfo" msgid "South Africa" -msgstr "" +msgstr "Àfrica del Sud" msgctxt "CountryInfo" msgid "Spain" -msgstr "" +msgstr "Espanya" msgctxt "CountryInfo" msgid "Sri Lanka" -msgstr "" +msgstr "Sri Lanka" msgctxt "CountryInfo" msgid "Sudan" -msgstr "" +msgstr "Sudan" msgctxt "CountryInfo" msgid "Suriname" -msgstr "" +msgstr "Surinam" msgctxt "CountryInfo" msgid "Swaziland" -msgstr "" +msgstr "Suazilàndia" msgctxt "CountryInfo" msgid "Sweden" -msgstr "" +msgstr "Suècia" msgctxt "CountryInfo" msgid "Switzerland" -msgstr "" +msgstr "Suïssa" msgctxt "CountryInfo" msgid "Syria" -msgstr "" +msgstr "Síria" msgctxt "CountryInfo" msgid "Tajikistan" -msgstr "" +msgstr "Tatgiquistan" msgctxt "CountryInfo" msgid "Tanzania" -msgstr "" +msgstr "Tanzània" msgctxt "CountryInfo" msgid "Thailand" -msgstr "" +msgstr "Tailàndia" msgctxt "CountryInfo" msgid "Timor-Leste (East Timor)" -msgstr "" +msgstr "Timor Oriental" msgctxt "CountryInfo" msgid "Togo" -msgstr "" +msgstr "Togo" msgctxt "CountryInfo" msgid "Tonga" -msgstr "" +msgstr "Tonga" msgctxt "CountryInfo" msgid "Trinidad & Tobago" -msgstr "" +msgstr "Trinitat i Tobago " msgctxt "CountryInfo" msgid "Tunisia" -msgstr "" +msgstr "Tuníssia" msgctxt "CountryInfo" msgid "Turkey" -msgstr "" +msgstr "Turquia" msgctxt "CountryInfo" msgid "Turkmenistan" -msgstr "" +msgstr "Turcmenistan" msgctxt "CountryInfo" msgid "Tuvalu" -msgstr "" +msgstr "Tuvalu" msgctxt "CountryInfo" msgid "Uganda" -msgstr "" +msgstr "Uganda" msgctxt "CountryInfo" msgid "Ukraine" @@ -1294,6 +1294,8 @@ msgid "" "We were unable to automatically restart Vidalia. Please restart Vidalia " "manually." msgstr "" +"Hem estat incapaços de reiniciar Vidalia de manera automàtica. Si us plau, " +"reinicieu Vidalia manualment." msgctxt "CrashReportDialog" msgid "Please fill a ticket in:" @@ -1603,7 +1605,7 @@ msgstr "" msgctxt "LogTreeItem" msgid "Info" -msgstr "" +msgstr "Info" msgctxt "LogTreeItem" msgid "Notice" @@ -1611,15 +1613,15 @@ msgstr "" msgctxt "LogTreeItem" msgid "Warning" -msgstr "" +msgstr "Avís" msgctxt "LogTreeItem" msgid "Error" -msgstr "" +msgstr "Error" msgctxt "LogTreeItem" msgid "Unknown" -msgstr "" +msgstr "Desconegut" msgctxt "MainWindow" msgid "Start Tor" @@ -2105,6 +2107,9 @@ msgid "" "application's configuration and use only encrypted protocols, such as SSL, " "if possible." msgstr "" +"Tot el que s'envïi per aquesta connexió serà monitoritzat. Si us plau, " +"reviseu la configuració de la vostra aplicació i utilitzeu només protocols " +"xifrats, com SSL." msgctxt "MainWindow" msgid "failed (%1)" @@ -2405,15 +2410,15 @@ msgstr "" msgctxt "MessageLog" msgid "Basic" -msgstr "" +msgstr "Bàsic" msgctxt "MessageLog" msgid "Tor Status" -msgstr "" +msgstr "Estat del Tor" msgctxt "MessageLog" msgid "Advanced" -msgstr "" +msgstr "Avançat" msgctxt "MessageLog" msgid "Always Save New Log Messages" @@ -2444,6 +2449,8 @@ msgid "" "Messages that appear frequently \n" "during normal Tor operation." msgstr "" +"Missatges que apareixen sovient\n" +"durant l'operació normal del Tor" msgctxt "MessageLog" msgid "" @@ -2696,31 +2703,31 @@ msgstr "" msgctxt "NetworkPage" msgid "Address:" -msgstr "" +msgstr "Adreça:" msgctxt "NetworkPage" msgid "Type:" -msgstr "" +msgstr "Tipus:" msgctxt "NetworkPage" msgid "You must select the proxy type." -msgstr "" +msgstr "Heu de seleccionar el tipus de proxy." msgctxt "NetworkPage" msgid "SOCKS 4" -msgstr "" +msgstr "SOCKS 4" msgctxt "NetworkPage" msgid "SOCKS 5" -msgstr "" +msgstr "SOCKS 5" msgctxt "NetworkPage" msgid "HTTP" -msgstr "" +msgstr "HTTP" msgctxt "NetworkPage" msgid "HTTP / HTTPS" -msgstr "" +msgstr "HTTP / HTTPS" msgctxt "Policy" msgid "accept" @@ -2736,11 +2743,11 @@ msgstr "En línia" msgctxt "RouterDescriptor" msgid "Hibernating" -msgstr "" +msgstr "S'està hibernant" msgctxt "RouterDescriptor" msgid "Offline" -msgstr "" +msgstr "Fora de línia:" msgctxt "RouterDescriptorView" msgid "Location:" @@ -2772,7 +2779,7 @@ msgstr "Copia" msgctxt "RouterInfoDialog" msgid "Hibernating" -msgstr "" +msgstr "S'està hibernant:" msgctxt "RouterInfoDialog" msgid "Online" @@ -2840,7 +2847,7 @@ msgstr "Fora de línia" msgctxt "RouterListItem" msgid "Hibernating" -msgstr "" +msgstr "S'està hibernant" msgctxt "RouterListItem" msgid "%1 KB/s" @@ -3104,7 +3111,7 @@ msgstr "" msgctxt "ServerPage" msgid "No Recent Usage" -msgstr "" +msgstr "No hi ha ús recent" msgctxt "ServerPage" msgid "No clients have used your relay recently." @@ -3118,7 +3125,7 @@ msgstr "" msgctxt "ServerPage" msgid "Bridge History" -msgstr "" +msgstr "Història del pont" msgctxt "ServerPage" msgid "Vidalia was unable to retrieve your bridge's usage history." @@ -3132,11 +3139,11 @@ msgstr "" msgctxt "ServerPage" msgid "The returned response was: %1" -msgstr "" +msgstr "La resposta retornada ha estat: %1" msgctxt "ServerPage" msgid "Help censored users reach the Tor network" -msgstr "" +msgstr "Ajudeu als usuaris censurats d'accedir a la xarxa del Tor" msgctxt "ServerPage" msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>" @@ -3144,11 +3151,11 @@ msgstr "" msgctxt "ServerPage" msgid "<a href=\"#bridgeHelp\">What's this?</a>" -msgstr "" +msgstr "<a href=\"#bridgeHelp\">Què és això?</a>" msgctxt "ServerPage" msgid "Automatically distribute my bridge address" -msgstr "" +msgstr "Distribueix de manera automàtica l'adreça del meu pont" msgctxt "ServerPage" msgid "Mirror the Relay Directory" @@ -3246,19 +3253,19 @@ msgstr "Creat pel Tor" msgctxt "StatusEventWidget" msgid "Copy to Clipboard" -msgstr "" +msgstr "Copia al porta-retalls" msgctxt "StatusEventWidget" msgid "The Tor Software is Running" -msgstr "" +msgstr "S'està executant el Tor" msgctxt "StatusEventWidget" msgid "You are currently running version \"%1\" of the Tor software." -msgstr "" +msgstr "Esteu executant la versió \"%1\" del Tor" msgctxt "StatusEventWidget" msgid "The Tor Software is not Running" -msgstr "" +msgstr "El Tor no s'està executant" msgctxt "StatusEventWidget" msgid "" @@ -3266,6 +3273,9 @@ msgid "" "software. If Tor exited unexpectedly, select the \"Advanced\" tab above for " "details about any errors encountered." msgstr "" +"Feu clic a \"Inicia el Tor\" en el panell de control de Vidalia per a " +"reiniciar el programari. En el cas que el Tor aborti de manera inesperada, " +"seleccioneu \"Avançat\" per a conéixer més detalls sobre els errors" msgctxt "StatusEventWidget" msgid "" @@ -3540,6 +3550,7 @@ msgstr "Incapaç d'iniciar el servei del Tor." msgctxt "TorSettings" msgid "Failed to hash the control password." msgstr "" +"La generació d'una funció resum per a la contrasenya de control ha fallit." msgctxt "TorrcDialog" msgid "Editing torrc" @@ -3609,7 +3620,7 @@ msgstr "Èxit" msgctxt "UPNPControl" msgid "No UPnP-enabled devices found" -msgstr "" +msgstr "No s'han trobat dispositius UPnP habilitats" msgctxt "UPNPControl" msgid "No valid UPnP-enabled Internet gateway devices found" @@ -3617,7 +3628,7 @@ msgstr "" msgctxt "UPNPControl" msgid "WSAStartup failed" -msgstr "" +msgstr "WSAStartup ha fallat" msgctxt "UPNPControl" msgid "Failed to add a port mapping" @@ -3633,7 +3644,7 @@ msgstr "" msgctxt "UPNPControl" msgid "Unknown error" -msgstr "" +msgstr "Error desconegut" msgctxt "UPNPTestDialog" msgid "Discovering UPnP-enabled devices" @@ -3649,7 +3660,7 @@ msgstr "" msgctxt "UPNPTestDialog" msgid "Test completed successfully!" -msgstr "" +msgstr "El test ha estat completat correctament!" msgctxt "UPNPTestDialog" msgid "Testing UPnP Support" @@ -3673,31 +3684,31 @@ msgstr "" msgctxt "UpdateProgressDialog" msgid "Checking for available updates..." -msgstr "" +msgstr "S'està verificant actualitzacions disponibles..." msgctxt "UpdateProgressDialog" msgid "Hide" -msgstr "" +msgstr "Oculta" msgctxt "UpdateProgressDialog" msgid "Downloading updates..." -msgstr "" +msgstr "S'estan descarregant actualitzacions..." msgctxt "UpdateProgressDialog" msgid "Installing updated software..." -msgstr "" +msgstr "S'està actualitzant el programari..." msgctxt "UpdateProgressDialog" msgid "Done! Your software is now up to date." -msgstr "" +msgstr "Fet! El seu programari està actualitzat." msgctxt "UpdateProgressDialog" msgid "OK" -msgstr "" +msgstr "OK" msgctxt "UpdateProgressDialog" msgid "Software Updates" -msgstr "" +msgstr "Actualitzacions de programari" msgctxt "UpdateProgressDialog" msgid "Checking for updates..." @@ -3705,11 +3716,11 @@ msgstr "" msgctxt "UpdateProgressDialog" msgid "Cancel" -msgstr "" +msgstr "Cancel·la" msgctxt "UpdatesAvailableDialog" msgid "Software Updates Available" -msgstr "" +msgstr "Actualitzacions de programari disponibles" msgctxt "UpdatesAvailableDialog" msgid "Remind Me Later" @@ -3717,7 +3728,7 @@ msgstr "" msgctxt "UpdatesAvailableDialog" msgid "Install" -msgstr "" +msgstr "Instal·la" msgctxt "UpdatesAvailableDialog" msgid "The following updated software packages are ready for installation:" @@ -3725,35 +3736,35 @@ msgstr "" msgctxt "UpdatesAvailableDialog" msgid "Package" -msgstr "" +msgstr "Paquet" msgctxt "UpdatesAvailableDialog" msgid "Version" -msgstr "" +msgstr "Versió" msgctxt "VMessageBox" msgid "OK" -msgstr "" +msgstr "OK" msgctxt "VMessageBox" msgid "Cancel" -msgstr "" +msgstr "Cancel·la" msgctxt "VMessageBox" msgid "Yes" -msgstr "" +msgstr "Sí" msgctxt "VMessageBox" msgid "No" -msgstr "" +msgstr "No" msgctxt "VMessageBox" msgid "Help" -msgstr "" +msgstr "Ajuda" msgctxt "VMessageBox" msgid "Retry" -msgstr "" +msgstr "Reintenta" msgctxt "VMessageBox" msgid "Show Log" @@ -3761,51 +3772,51 @@ msgstr "" msgctxt "VMessageBox" msgid "Show Settings" -msgstr "" +msgstr "Mostra les preferències" msgctxt "VMessageBox" msgid "Continue" -msgstr "" +msgstr "Continua" msgctxt "VMessageBox" msgid "Quit" -msgstr "" +msgstr "Surt" msgctxt "VMessageBox" msgid "Browse" -msgstr "" +msgstr "Navega" msgctxt "Vidalia" msgid "Invalid Argument" -msgstr "" +msgstr "Argument invàlid" msgctxt "Vidalia" msgid "Vidalia is already running" -msgstr "" +msgstr "Vidalia ja s'està executant" msgctxt "Vidalia" msgid "Displays this usage message and exits." -msgstr "" +msgstr "Mostra el missatge d'ús i surt." msgctxt "Vidalia" msgid "Resets ALL stored Vidalia settings." -msgstr "" +msgstr "Reinicialitza TOTES les preferències de Vidalia emmagatzemades." msgctxt "Vidalia" msgid "Sets the directory Vidalia uses for data files." -msgstr "" +msgstr "Estableix la carpeta que Vidalia utilitza per als fitxers de dades." msgctxt "Vidalia" msgid "Sets the name and location of Vidalia's pidfile." -msgstr "" +msgstr "Estableix el nom i la ubicació del pidfile de Vidalia" msgctxt "Vidalia" msgid "Sets the name and location of Vidalia's logfile." -msgstr "" +msgstr "Estableix el nom i la ubicació del fitxer de registre de Vidalia." msgctxt "Vidalia" msgid "Sets the verbosity of Vidalia's logging." -msgstr "" +msgstr "Estableix el nivell de detall del fitxer de registre de Vidalia." msgctxt "Vidalia" msgid "Sets Vidalia's interface style."

1 0

r25304: {website} Updating my people page entry Changing the wording a bit and (website/trunk/about/en)
by Damian Johnson 11 Jan '12

11 Jan '12

Author: atagar Date: 2012-01-11 17:45:34 +0000 (Wed, 11 Jan 2012) New Revision: 25304 Modified: website/trunk/about/en/corepeople.wml Log: Updating my people page entry Changing the wording a bit and noting the project that I'm currently working on (stem). Modified: website/trunk/about/en/corepeople.wml =================================================================== --- website/trunk/about/en/corepeople.wml 2012-01-11 17:23:06 UTC (rev 25303) +++ website/trunk/about/en/corepeople.wml 2012-01-11 17:45:34 UTC (rev 25304) @@ -87,11 +87,12 @@ Arora fork</a>, the <a href="http://code.google.com/p/torsocks/">torsocks scripts</a>, and other useful peripheral tools.</dd> - <dt>Damian Johnson, Arm Developer</dt> - <dd>Builds <a href="http://atagar.com/arm">Arm</a>, - a command-line application for monitoring Tor relays and - providing real-time status information such as the current - configuration, bandwidth usage, message log, etc.</dd> + <dt>Damian Johnson, Developer</dt> + <dd>Author of <a href="http://atagar.com/arm">arm</a>, a command-line + application that provides real-time status information for Tor relays + and <a + href="https://trac.torproject.org/projects/tor/wiki/doc/stem">Stem</a>, + a controller library for interacting with Tor.</dd> <dt>George Kadianakis, Developer</dt> <dd>Developer of pluggable transports and bridge-scanning resistance.</dd>

1 0

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

11 Jan '12

commit 61da6cc21cbeb4612cb5383ecb04759536048cc4 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 11 17:45:16 2012 +0000 Update translations for vidalia --- ca/vidalia_ca.po | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ca/vidalia_ca.po b/ca/vidalia_ca.po index 9e4e2b7..54150bf 100755 --- a/ca/vidalia_ca.po +++ b/ca/vidalia_ca.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-01-11 13:26+0000\n" +"PO-Revision-Date: 2012-01-11 17:43+0000\n" "Last-Translator: Gerard Farràs Ballabriga <>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -919,47 +919,47 @@ msgstr "" msgctxt "CountryInfo" msgid "Palestine" -msgstr "" +msgstr "Palestina" msgctxt "CountryInfo" msgid "Panama" -msgstr "" +msgstr "Panamà" msgctxt "CountryInfo" msgid "Papua New Guinea" -msgstr "" +msgstr "Nova Guinea Pàpua" msgctxt "CountryInfo" msgid "Paraguay" -msgstr "" +msgstr "Paraguai" msgctxt "CountryInfo" msgid "Peru" -msgstr "" +msgstr "Perú" msgctxt "CountryInfo" msgid "Philippines" -msgstr "" +msgstr "Filipines" msgctxt "CountryInfo" msgid "Poland" -msgstr "" +msgstr "Polònia" msgctxt "CountryInfo" msgid "Portugal" -msgstr "" +msgstr "Portugal" msgctxt "CountryInfo" msgid "Qatar" -msgstr "" +msgstr "Qatar" msgctxt "CountryInfo" msgid "Romania" -msgstr "" +msgstr "Romania" msgctxt "CountryInfo" msgid "Russia" -msgstr "" +msgstr "Rússia" msgctxt "CountryInfo" msgid "Rwanda"

1 0

[torspec/master] Rename "geoip-start" to "geoip-start-time".
by nickm＠torproject.org 11 Jan '12

11 Jan '12

commit 164351f8b4ccb470c3056057979090601bdf9880 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jan 11 18:10:28 2012 +0100 Rename "geoip-start" to "geoip-start-time". "geoip-start-time" was replaced by "bridge-stats-end" in e1e5c1b3. However, it was always written as "geoip-start-time" in the code whereas dir-spec.txt says "geoip-start". Fixing dir-spec.txt. --- dir-spec.txt | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index f1aef64..9506d74 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -628,7 +628,7 @@ SHA1 digest of the GeoIP database file that is used to resolve IP addresses to country codes. - ("geoip-start" YYYY-MM-DD HH:MM:SS NL) + ("geoip-start-time" YYYY-MM-DD HH:MM:SS NL) ("geoip-client-origins" CC=N,CC=N,... NL) Only generated by bridge routers (see blocking.pdf), and only @@ -639,13 +639,13 @@ country (approximate, and rounded up to the nearest multiple of 8 in order to hamper traffic analysis). A country is included only if it has at least one address. The time in - "geoip-start" is the time at which we began collecting geoip + "geoip-start-time" is the time at which we began collecting geoip statistics. - "geoip-start" and "geoip-client-origins" have been replaced by + "geoip-start-time" and "geoip-client-origins" have been replaced by "bridge-stats-end" and "bridge-stats-ips" in 0.2.2.4-alpha. The reason is that the measurement interval with "geoip-stats" as - determined by subtracting "geoip-start" from "published" could + determined by subtracting "geoip-start-time" from "published" could have had a variable length, whereas the measurement interval in 0.2.2.4-alpha and later is set to be exactly 24 hours long. In order to clearly distinguish the new measurement intervals from

1 0

[tor/master] defensive programming to catch duplicate calls to connection_init_or_handshake_state
by nickm＠torproject.org 11 Jan '12

11 Jan '12

commit ce703bd53edec2ee123dd747d6cc975a259c68f9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 26 20:19:25 2011 -0400 defensive programming to catch duplicate calls to connection_init_or_handshake_state --- src/or/connection_or.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 7609138..76402a5 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1583,6 +1583,10 @@ int connection_init_or_handshake_state(or_connection_t *conn, int started_here) { or_handshake_state_t *s; + if (conn->handshake_state) { + log_warn(LD_BUG, "Duplicate call to connection_init_or_handshake_state!"); + return 0; + } s = conn->handshake_state = tor_malloc_zero(sizeof(or_handshake_state_t)); s->started_here = started_here ? 1 : 0; s->digest_sent_data = 1;

1 0

← Newer
1
...
49
50
51
52
53
54
55
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits January 2012