- tor-commits - lists.torproject.org

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 10 Oct '12

10 Oct '12

commit 5b1f37b126ed946189311b8475b73d4ae8d9812d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 10 07:45:39 2012 +0000 Update translations for tails-persistence-setup_completed --- it/it.po | 320 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 320 insertions(+), 0 deletions(-) diff --git a/it/it.po b/it/it.po new file mode 100644 index 0000000..b356578 --- /dev/null +++ b/it/it.po @@ -0,0 +1,320 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Tails developers +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# <fswitch20(a)hotmail.com>, 2012. +# <jan.reister(a)unimi.it>, 2012. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2012-10-03 16:16+0200\n" +"PO-Revision-Date: 2012-10-10 07:27+0000\n" +"Last-Translator: jan <jan.reister(a)unimi.it>\n" +"Language-Team: Italian (http://www.transifex.com/projects/p/torproject/language/it/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: it\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:48 +msgid "Personal Data" +msgstr "Dati Personali" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:50 +msgid "Keep files stored in the `Persistent' directory" +msgstr "Mantieni i files in una directory 'Persistent'" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:58 +msgid "GnuPG" +msgstr "GnuPG" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:60 +msgid "GnuPG keyrings and configuration" +msgstr "Portachiavi GnuPG e configurazione" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:68 +msgid "SSH Client" +msgstr "Client SSH" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:70 +msgid "SSH keys, configuration and known hosts" +msgstr "Chiavi SSH, configurazione e hosts conosciuti " + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:78 +msgid "Pidgin" +msgstr "Pidgin" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:80 +msgid "Pidgin profiles and OTR keyring" +msgstr "Profili Pidgin e portachiavi OTR" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:88 +msgid "Claws Mail" +msgstr "Claws Mail" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:90 +msgid "Claws Mail profiles and locally stored email" +msgstr "Claws Mail profili e email locali" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:98 +msgid "GNOME Keyring" +msgstr "Portachiavi GNOME" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:100 +msgid "Secrets stored by GNOME Keyring" +msgstr "Segreti contenuti in GNOME Keyring" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:108 +msgid "Network Connections" +msgstr "Connessioni di Rete" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:110 +msgid "Configuration of network devices and connections" +msgstr "Configurazione dei dispositivi e delle connessioni di rete" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:118 +msgid "APT Packages" +msgstr "Pacchetti APT" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:120 +msgid "Packages downloaded by APT" +msgstr "Pacchetti scaricati da APT" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:128 +msgid "APT Lists" +msgstr "Liste APT" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:130 +msgid "Lists downloaded by APT" +msgstr "Liste scaricate da APT" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:138 +msgid "Dotfiles" +msgstr "Dotfiles" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:140 +msgid "" +"Symlink into $HOME every file or directory found in the `dotfiles' directory" +msgstr "Crea un symlink in $HOME per ogni file o cartella dentro la cartella `dotfiles'" + +#: ../lib/Tails/Persistence/Setup.pm:259 +msgid "" +"The device Tails is running from cannot be found. Maybe you used the `toram'" +" option?" +msgstr "Il dispositivo su cui Tails è in esecuzione non può essere trovato. Forse hai utilitzzato l'opzione 'toram' ?" + +#: ../lib/Tails/Persistence/Setup.pm:284 +msgid "'Unparseable partition path.'" +msgstr "'Percorso della partizione non valido'" + +#: ../lib/Tails/Persistence/Setup.pm:298 +msgid "Setup Tails persistent volume" +msgstr "Configura volume persistente Tails" + +#: ../lib/Tails/Persistence/Setup.pm:442 +#, perl-format +msgid "Device %s already has a persistent volume." +msgstr "Il dispositivo %s ha già un volume persistente" + +#: ../lib/Tails/Persistence/Setup.pm:450 +#, perl-format +msgid "Device %s has not enough unallocated space." +msgstr "Il dispositivo %s non ha abbastanza spazio libero" + +#: ../lib/Tails/Persistence/Setup.pm:458 ../lib/Tails/Persistence/Setup.pm:472 +#, perl-format +msgid "Device %s has no persistent volume." +msgstr "Il dispositivo %s non ha un volume persistente" + +#: ../lib/Tails/Persistence/Setup.pm:464 +msgid "" +"Cannot delete the persistent volume while in use. You should restart Tails " +"without persistence." +msgstr "Impossibile cancellare un volume persistente mentre è in uso. Dovresti riavviare Tails senza persistenza" + +#: ../lib/Tails/Persistence/Setup.pm:483 +msgid "Persistence volume is not unlocked." +msgstr "Il volume persistente non è sbloccato" + +#: ../lib/Tails/Persistence/Setup.pm:488 +msgid "Persistence volume is not mounted." +msgstr "Il volume persistente non è montato" + +#: ../lib/Tails/Persistence/Setup.pm:493 +msgid "Persistence volume is not readable. Permissions or ownership problems?" +msgstr "Il volume persistente non è leggibile. Problemi con permessi o di proprietà ?" + +#: ../lib/Tails/Persistence/Setup.pm:498 +msgid "Persistence volume is not writable. Maybe it was mounted read-only?" +msgstr "Il volume persistente non è scrivibile. Potrebbe essere montato in sola lettura ?" + +#: ../lib/Tails/Persistence/Setup.pm:507 +#, perl-format +msgid "Tails is running from non-USB device %s." +msgstr "Tail è attivo su device non USB %s" + +#: ../lib/Tails/Persistence/Setup.pm:513 +#, perl-format +msgid "Device %s is optical." +msgstr "Il dispositivo %s è ottico" + +#: ../lib/Tails/Persistence/Setup.pm:520 +#, perl-format +msgid "Device %s was not created using Tails USB installer." +msgstr "Il dispositivo %s non è stato creato utilizzando Tails USB installer." + +#: ../lib/Tails/Persistence/Setup.pm:554 +msgid "Error" +msgstr "Errore" + +#: ../lib/Tails/Persistence/Setup.pm:861 +msgid "Persistence wizard - Finished" +msgstr "Procedura guidata Persistenza - Fine" + +#: ../lib/Tails/Persistence/Setup.pm:864 +msgid "" +"Any changes you have made will only take effect after restarting Tails.\n" +"\n" +"You may now close this application." +msgstr "Tutte le modifiche effettuate saranno applicate solo dopo il riavvio di Tails.\n\nE' possibile chiudere l'applicazione." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:54 +msgid "Persistence wizard - Persistent volume creation" +msgstr "Procedura guidata Persistenza - Creazione volume persistente" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:57 +msgid "Choose a passphrase to protect the persistent volume" +msgstr "Scegli una frase segret per proteggere il volume persistente" + +#. TRANSLATORS: size, device vendor, device model +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:61 +#, perl-format +msgid "" +"A %s persistent volume will be created on the %s %s device. Data on " +"this device will be stored in an encrypted form protected by a passphrase." +msgstr "Un volume persistente %s sarà creato sul dispositivo %s %s. I dati saranno salvati in formato criptato protetti da una frase segreta." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:66 +msgid "Create" +msgstr "Crea" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:110 +msgid "" +"Beware! Using persistence has consequences that must be well " +"understood. Tails can't help you if you use it wrong! See <a " +"href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'>Tails" +" documentation about persistence</a> to learn more." +msgstr "Attenzione! Usare la persistenza comporta delle conseguenza che vanno valutate. Tails non può fare nulla se vengono usate in maniera sbagliata! Leggere la documentazione <a href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'>Tails sulla persistenza</a> per ulteriori dettagli." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:144 +msgid "Passphrase:" +msgstr "Frase segreta" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:154 +msgid "Verify Passphrase:" +msgstr "Verifica la frase segreta" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:167 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:231 +msgid "Passphrase can't be empty" +msgstr "La frase segreta non può essere vuota" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:222 +msgid "Passphrases do not match" +msgstr "La frase segreta non corrisponde" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:262 +#: ../lib/Tails/Persistence/Step/Configure.pm:189 +msgid "Failed" +msgstr "Fallito" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:269 +#: ../lib/Tails/Persistence/Step/Delete.pm:84 +msgid "Correcting attributes on Tails system partition." +msgstr "Correzione attributi sulla partizione si sistema di Tails in corso" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:272 +#: ../lib/Tails/Persistence/Step/Delete.pm:87 +msgid "The attributes of the Tails system partition will be corrected." +msgstr "Gli attributi sulla partizione di sistema di Tails saranno corretti." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:280 +msgid "Mounting Tails persistence partition." +msgstr "Mount della partizione persistente Tails in corso." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 +msgid "The Tails persistence partition will be mounted." +msgstr "La partizione persistente di Tails sarà montata." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:304 +msgid "Creating..." +msgstr "Creazione..." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:307 +msgid "Creating the persistent volume..." +msgstr "Creazione del volume persistente..." + +#: ../lib/Tails/Persistence/Step/Configure.pm:60 +msgid "Persistence wizard - Persistent volume configuration" +msgstr "Procedura guidata Persistenza - Configurazione volume persistente" + +#: ../lib/Tails/Persistence/Step/Configure.pm:63 +msgid "Specify the files that will be saved in the persistent volume" +msgstr "Specificare quali files verranno salvati nella partizione persistente" + +#. TRANSLATORS: partition, size, device vendor, device model +#: ../lib/Tails/Persistence/Step/Configure.pm:67 +#, perl-format +msgid "" +"The selected files will be stored in the encrypted partition %s (%s), on the" +" %s %s device." +msgstr "Il file selezionato sarà salvato in una partizione criptata %s (%s), sul dispositivo %s %s." + +#: ../lib/Tails/Persistence/Step/Configure.pm:73 +msgid "Save" +msgstr "Salva" + +#: ../lib/Tails/Persistence/Step/Configure.pm:135 +msgid "Make custom directory persistent (absolute path):" +msgstr "Rendi una directory personalizzata persistente (path assoluto):" + +#: ../lib/Tails/Persistence/Step/Configure.pm:141 +msgid "Destination:" +msgstr "Destinazione:" + +#: ../lib/Tails/Persistence/Step/Configure.pm:204 +msgid "Saving..." +msgstr "Salvataggio..." + +#: ../lib/Tails/Persistence/Step/Configure.pm:207 +msgid "Saving persistence configuration..." +msgstr "Salvataggio configurazione persistenza..." + +#: ../lib/Tails/Persistence/Step/Delete.pm:41 +msgid "Persistence wizard - Persistent volume deletion" +msgstr "Procedura guidata Persistenza - Cancellazione volume persistente" + +#: ../lib/Tails/Persistence/Step/Delete.pm:44 +msgid "Your persistent data will be deleted." +msgstr "I dati persistenti verranno cancellati." + +#: ../lib/Tails/Persistence/Step/Delete.pm:48 +#, perl-format +msgid "" +"The persistent volume %s (%s), on the %s %s device, will be deleted." +msgstr "Il volume persistente %s (%s), sul device %s %s, sarà cancellato." + +#: ../lib/Tails/Persistence/Step/Delete.pm:54 +msgid "Delete" +msgstr "Cancella" + +#: ../lib/Tails/Persistence/Step/Delete.pm:99 +msgid "Deleting..." +msgstr "Cancellazione..." + +#: ../lib/Tails/Persistence/Step/Delete.pm:102 +msgid "Deleting the persistent volume..." +msgstr "Cancellazione volume persistente..."

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 10 Oct '12

10 Oct '12

commit 4f963f868b3becd17ff4fe52dcada4dfe9325ae2 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 10 07:45:37 2012 +0000 Update translations for tails-persistence-setup --- it/it.po | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/it/it.po b/it/it.po index 034efe6..b356578 100644 --- a/it/it.po +++ b/it/it.po @@ -4,13 +4,14 @@ # # Translators: # <fswitch20(a)hotmail.com>, 2012. +# <jan.reister(a)unimi.it>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-10-03 16:16+0200\n" -"PO-Revision-Date: 2012-10-09 12:49+0000\n" -"Last-Translator: spawned76 <fswitch20(a)hotmail.com>\n" +"PO-Revision-Date: 2012-10-10 07:27+0000\n" +"Last-Translator: jan <jan.reister(a)unimi.it>\n" "Language-Team: Italian (http://www.transifex.com/projects/p/torproject/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -64,7 +65,7 @@ msgstr "Portachiavi GNOME" #: ../lib/Tails/Persistence/Configuration/Presets.pm:100 msgid "Secrets stored by GNOME Keyring" -msgstr "" +msgstr "Segreti contenuti in GNOME Keyring" #: ../lib/Tails/Persistence/Configuration/Presets.pm:108 msgid "Network Connections" @@ -92,12 +93,12 @@ msgstr "Liste scaricate da APT" #: ../lib/Tails/Persistence/Configuration/Presets.pm:138 msgid "Dotfiles" -msgstr "" +msgstr "Dotfiles" #: ../lib/Tails/Persistence/Configuration/Presets.pm:140 msgid "" "Symlink into $HOME every file or directory found in the `dotfiles' directory" -msgstr "" +msgstr "Crea un symlink in $HOME per ogni file o cartella dentro la cartella `dotfiles'" #: ../lib/Tails/Persistence/Setup.pm:259 msgid ""

1 0

[tor/master] Merge branch 'bug7014_023_squashed' into maint-0.2.3
by nickm＠torproject.org 10 Oct '12

10 Oct '12

commit e2549c3b745313d6647c7e1d05025a84e1d33873 Merge: 0a3dfd0 721f99e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 9 23:46:56 2012 -0400 Merge branch 'bug7014_023_squashed' into maint-0.2.3 changes/bug7014 | 5 +++++ src/or/circuitbuild.c | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-)

1 0

[tor/master] Don't call fmt_addr() twice in a parameter list.
by nickm＠torproject.org 10 Oct '12

10 Oct '12

commit 721f99e495474fc7b80250ba52351b5771f0ed36 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Oct 4 20:54:29 2012 -0400 Don't call fmt_addr() twice in a parameter list. --- changes/bug7014 | 5 +++++ src/or/circuitbuild.c | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/changes/bug7014 b/changes/bug7014 new file mode 100644 index 0000000..1d39103 --- /dev/null +++ b/changes/bug7014 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Fix two cases in src/or/transports.c where we were calling + fmt_addr() twice in a parameter list. Bug found by David + Fifield. Fixes bug 7014; bugfix on 0.2.3.9-alpha. + diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index a7d370c..f8521c5 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -5310,19 +5310,22 @@ transport_resolve_conflicts(transport_t *t) t_tmp->marked_for_removal = 0; return 1; } else { /* same name but different addrport */ + char *new_transport_addr = tor_strdup(fmt_addr(&t->addr)); if (t_tmp->marked_for_removal) { /* marked for removal */ log_notice(LD_GENERAL, "You tried to add transport '%s' at '%s:%u' " "but there was already a transport marked for deletion at " "'%s:%u'. We deleted the old transport and registered the " - "new one.", t->name, fmt_addr(&t->addr), t->port, + "new one.", t->name, new_transport_addr, t->port, fmt_addr(&t_tmp->addr), t_tmp->port); smartlist_remove(transport_list, t_tmp); transport_free(t_tmp); + tor_free(new_transport_addr); } else { /* *not* marked for removal */ log_notice(LD_GENERAL, "You tried to add transport '%s' at '%s:%u' " "but the same transport already exists at '%s:%u'. " - "Skipping.", t->name, fmt_addr(&t->addr), t->port, + "Skipping.", t->name, new_transport_addr, t->port, fmt_addr(&t_tmp->addr), t_tmp->port); + tor_free(new_transport_addr); return -1; } }

1 0

[tor/master] Merge branch 'bug7014_squashed'
by nickm＠torproject.org 10 Oct '12

10 Oct '12

commit ec97319464aab204740acb013b504abb0e13d989 Merge: a01736e 634d24c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 9 23:50:09 2012 -0400 Merge branch 'bug7014_squashed' changes/bug7014 | 5 +++++ src/or/transports.c | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-)

1 0

[tor/master] Don't call fmt_addr() twice in a parameter list.
by nickm＠torproject.org 10 Oct '12

10 Oct '12

commit 634d24c58815a8754fb94f9abc0edc2aa8ba5a80 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Oct 4 20:48:56 2012 -0400 Don't call fmt_addr() twice in a parameter list. --- changes/bug7014 | 5 +++++ src/or/transports.c | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/changes/bug7014 b/changes/bug7014 new file mode 100644 index 0000000..1d39103 --- /dev/null +++ b/changes/bug7014 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Fix two cases in src/or/transports.c where we were calling + fmt_addr() twice in a parameter list. Bug found by David + Fifield. Fixes bug 7014; bugfix on 0.2.3.9-alpha. + diff --git a/src/or/transports.c b/src/or/transports.c index 34fe679..f9cd125 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -270,19 +270,22 @@ transport_resolve_conflicts(const transport_t *t) t_tmp->marked_for_removal = 0; return 1; } else { /* same name but different addrport */ + char *new_transport_addr = tor_strdup(fmt_addr(&t->addr)); if (t_tmp->marked_for_removal) { /* marked for removal */ log_notice(LD_GENERAL, "You tried to add transport '%s' at '%s:%u' " "but there was already a transport marked for deletion at " "'%s:%u'. We deleted the old transport and registered the " - "new one.", t->name, fmt_addr(&t->addr), t->port, + "new one.", t->name, new_transport_addr, t->port, fmt_addr(&t_tmp->addr), t_tmp->port); smartlist_remove(transport_list, t_tmp); transport_free(t_tmp); + tor_free(new_transport_addr); } else { /* *not* marked for removal */ log_notice(LD_GENERAL, "You tried to add transport '%s' at '%s:%u' " "but the same transport already exists at '%s:%u'. " - "Skipping.", t->name, fmt_addr(&t->addr), t->port, + "Skipping.", t->name, new_transport_addr, t->port, fmt_addr(&t_tmp->addr), t_tmp->port); + tor_free(new_transport_addr); return -1; } }

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'
by nickm＠torproject.org 10 Oct '12

10 Oct '12

commit a01736e8b2017f313f178503bf55e8e7f15a7d39 Merge: 016c21d e2549c3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 9 23:49:26 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3'

1 0

[tor/master] Downgrade "Failed to hand off onionskin" messages
by nickm＠torproject.org 10 Oct '12

10 Oct '12

commit 016c21d871a8fedcd07b7aaca43e47315013c1d4 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Oct 5 13:35:13 2012 -0400 Downgrade "Failed to hand off onionskin" messages They're typically redundant with the "Your computer is too slow" messages. Fixes bug 7038; bugfix on 0.2.2.16-alpha. (In retrospect, we should have fixed this bug back in ticket 1042.) --- changes/bug7038 | 5 +++++ src/or/command.c | 9 +-------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/changes/bug7038 b/changes/bug7038 new file mode 100644 index 0000000..3805d86 --- /dev/null +++ b/changes/bug7038 @@ -0,0 +1,5 @@ + o Minor bugfixes (log messages): + - Downgrade "Failed to hand off onionskin" messages to "debug" + severity, since they're typically redundant with the "Your computer + is too slow" messages. Fixes bug 7038; bugfix on 0.2.2.16-alpha. + diff --git a/src/or/command.c b/src/or/command.c index a5ae239..d04509b 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -420,14 +420,7 @@ command_process_create_cell(cell_t *cell, or_connection_t *conn) /* hand it off to the cpuworkers, and then return. */ if (assign_onionskin_to_cpuworker(NULL, circ, onionskin) < 0) { -#define WARN_HANDOFF_FAILURE_INTERVAL (6*60*60) - static ratelim_t handoff_warning = - RATELIM_INIT(WARN_HANDOFF_FAILURE_INTERVAL); - char *m; - if ((m = rate_limit_log(&handoff_warning, approx_time()))) { - log_warn(LD_GENERAL,"Failed to hand off onionskin. Closing.%s",m); - tor_free(m); - } + log_debug(LD_GENERAL,"Failed to hand off onionskin. Closing."); circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_RESOURCELIMIT); return; }

1 0

[tor/maint-0.2.3] Merge branch 'bug7014_023_squashed' into maint-0.2.3
by nickm＠torproject.org 10 Oct '12

10 Oct '12

commit e2549c3b745313d6647c7e1d05025a84e1d33873 Merge: 0a3dfd0 721f99e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 9 23:46:56 2012 -0400 Merge branch 'bug7014_023_squashed' into maint-0.2.3 changes/bug7014 | 5 +++++ src/or/circuitbuild.c | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.3] Don't call fmt_addr() twice in a parameter list.
by nickm＠torproject.org 10 Oct '12

10 Oct '12

commit 721f99e495474fc7b80250ba52351b5771f0ed36 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Oct 4 20:54:29 2012 -0400 Don't call fmt_addr() twice in a parameter list. --- changes/bug7014 | 5 +++++ src/or/circuitbuild.c | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/changes/bug7014 b/changes/bug7014 new file mode 100644 index 0000000..1d39103 --- /dev/null +++ b/changes/bug7014 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Fix two cases in src/or/transports.c where we were calling + fmt_addr() twice in a parameter list. Bug found by David + Fifield. Fixes bug 7014; bugfix on 0.2.3.9-alpha. + diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index a7d370c..f8521c5 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -5310,19 +5310,22 @@ transport_resolve_conflicts(transport_t *t) t_tmp->marked_for_removal = 0; return 1; } else { /* same name but different addrport */ + char *new_transport_addr = tor_strdup(fmt_addr(&t->addr)); if (t_tmp->marked_for_removal) { /* marked for removal */ log_notice(LD_GENERAL, "You tried to add transport '%s' at '%s:%u' " "but there was already a transport marked for deletion at " "'%s:%u'. We deleted the old transport and registered the " - "new one.", t->name, fmt_addr(&t->addr), t->port, + "new one.", t->name, new_transport_addr, t->port, fmt_addr(&t_tmp->addr), t_tmp->port); smartlist_remove(transport_list, t_tmp); transport_free(t_tmp); + tor_free(new_transport_addr); } else { /* *not* marked for removal */ log_notice(LD_GENERAL, "You tried to add transport '%s' at '%s:%u' " "but the same transport already exists at '%s:%u'. " - "Skipping.", t->name, fmt_addr(&t->addr), t->port, + "Skipping.", t->name, new_transport_addr, t->port, fmt_addr(&t_tmp->addr), t_tmp->port); + tor_free(new_transport_addr); return -1; } }

1 0