- tor-commits - lists.torproject.org

[tor/release-0.2.2] Merge branch 'bug4822_021_v2_squashed' into maint-0.2.1
by arma＠torproject.org 05 Jan '12

05 Jan '12

commit b839ace7d092fe073b66a2d7d329644e82ec843b Merge: df17b62 4752b34 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 5 14:11:42 2012 -0500 Merge branch 'bug4822_021_v2_squashed' into maint-0.2.1 changes/bug4822 | 13 +++++++++++++ src/common/tortls.c | 37 ++++++++++++++++++++++++++++++++++--- 2 files changed, 47 insertions(+), 3 deletions(-)

1 0

[tor/release-0.2.2] Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
by arma＠torproject.org 05 Jan '12

05 Jan '12

commit ccd8289958b6d81cd5575c15dc6c1218d8ecb2d0 Merge: a1074c7 b839ace Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 5 14:16:30 2012 -0500 Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2 changes/bug4822 | 13 +++++++++++++ src/common/tortls.c | 37 ++++++++++++++++++++++++++++++++++--- 2 files changed, 47 insertions(+), 3 deletions(-)

1 0

[tor/release-0.2.2] Log at info level when disabling SSLv3
by arma＠torproject.org 05 Jan '12

05 Jan '12

commit 4752b348793f599cbdc93d0503d18def03e45c7a Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Jan 4 20:41:28 2012 -0800 Log at info level when disabling SSLv3 --- src/common/tortls.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index 22b0e31..d88a59b 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -771,6 +771,12 @@ tor_tls_context_new(crypto_pk_env_t *identity, unsigned int key_lifetime, (SSLeay() >= 0x00909000L && SSLeay() < 0x1000006fL)) { /* And not SSL3 if it's subject to CVE-2011-4657. */ + log_info(LD_NET, "Disabling SSLv3 because this OpenSSL version " + "might otherwise be vulnerable to CVE-2011-4657 " + "(compile-time version %08lx (%s); " + "runtime version %08lx (%s))", + OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_TEXT, + SSLeay(), SSLeay_version(SSLEAY_VERSION)); SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv3); }

1 0

[tor/release-0.2.2] Merge branch 'maint-0.2.2' into release-0.2.2
by arma＠torproject.org 05 Jan '12

05 Jan '12

commit 43454a872efbc09d35c7bdaf0aef1bd493b01165 Merge: 98402d0 ccd8289 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Jan 5 18:28:27 2012 -0500 Merge branch 'maint-0.2.2' into release-0.2.2 changes/bug4822 | 13 +++++++++++++ src/common/tortls.c | 37 ++++++++++++++++++++++++++++++++++--- 2 files changed, 47 insertions(+), 3 deletions(-)

1 0

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

05 Jan '12

commit 8ae10c098d1b71a3571ec771cf34723d509cade7 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 5 22:45:14 2012 +0000 Update translations for vidalia --- sk/vidalia_sk.po | 321 ++++++++++++++++++++++++++++-------------------------- 1 files changed, 167 insertions(+), 154 deletions(-) diff --git a/sk/vidalia_sk.po b/sk/vidalia_sk.po index 6e3b1d1..647fc72 100644 --- a/sk/vidalia_sk.po +++ b/sk/vidalia_sk.po @@ -6,8 +6,8 @@ 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: 2011-09-08 00:47+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2012-01-05 22:30+0000\n" +"Last-Translator: brahma <brahma(a)zoznam.sk>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -123,7 +123,7 @@ msgstr "Zvolte cestu pre váš konfiguračný súbor" msgctxt "AdvancedPage" msgid "Browse" -msgstr "Prechádzať" +msgstr "Hľadať" msgctxt "AdvancedPage" msgid "Data Directory" @@ -139,63 +139,67 @@ msgstr "Zvolte zložku používanú pre Tor software" msgctxt "AdvancedPage" msgid "Tor Control" -msgstr "" +msgstr "Nastavenie Tora" msgctxt "AdvancedPage" msgid "Use TCP connection (ControlPort)" -msgstr "" +msgstr "Použit pripojenie TCP (ControlPort)" msgctxt "AdvancedPage" msgid "Path:" -msgstr "" +msgstr "Cesta:" msgctxt "AdvancedPage" msgid "Use Unix domain socket (ControlSocket)" -msgstr "" +msgstr "Použiť soket Unixovej domény (ControlSocket)" msgctxt "AdvancedPage" msgid "Edit current torrc" -msgstr "" +msgstr "Edit. aktuálny torrc" msgctxt "AdvancedPage" msgid "NOTE: this will edit the currently loaded torrc" -msgstr "" +msgstr "Poznámka: Tu sa upravuje aktuálne zavedaný torrc" msgctxt "AdvancedPage" msgid "ControlSocket path doesn't exist." -msgstr "" +msgstr "Cesta pre ControlSocket neexistuje." msgctxt "AdvancedPage" msgid "" "The specified Tor configuration file location contains characters that " "cannot be represented in your system's current 8-bit character encoding." msgstr "" +"Špecifikovaný konfiguračný súbor Tora obsahuje znaky, ktoré sa nedajú " +"vyjadriť v súčastnom systéme 8-bitového kódovania." msgctxt "AdvancedPage" msgid "" "The specified Tor data directory location contains characters that cannot be" " represented in your system's current 8-bit character encoding." msgstr "" +"Špecifikovaný adresára dát Tora obsahuje znaky, ktoré sa nedajú vyjadriť v " +"súčastnom systéme 8-bitového kódovania." msgctxt "AdvancedPage" msgid "Warning" -msgstr "" +msgstr "Pozor" msgctxt "AdvancedPage" msgid "You changed torrc path, would you like to restart Tor?" -msgstr "" +msgstr "Zmenili ste cestu pre torrc, mám reštartovať Tor?" msgctxt "AdvancedPage" msgid "Tor Configuration File (torrc);;All Files (*)" -msgstr "" +msgstr "Konfiguračný súbor (torrc);;Všetky súbory (*)" msgctxt "AdvancedPage" msgid "Select a file to use for Tor socket path" -msgstr "" +msgstr "Vyberte cestu súboru, pre vsunutie Tora" msgctxt "AdvancedPage" msgid "Configure ControlPort automatically" -msgstr "" +msgstr "Nastaviť ControlPort automaticky" msgctxt "AdvancedPage" msgid "" @@ -365,7 +369,7 @@ msgstr "Spojenie" msgctxt "CircuitListWidget" msgid "Status" -msgstr "Status" +msgstr "Stav" msgctxt "CircuitListWidget" msgid "Zoom to Circuit" @@ -409,7 +413,7 @@ msgstr "Pomoc" msgctxt "ConfigDialog" msgid "Error Saving Settings" -msgstr "Chyba pri ukladaní nastavení" +msgstr "Nastala chyba pri ukladaní nastavenia" msgctxt "ConfigDialog" msgid "Vidalia was unable to save your %1 settings." @@ -417,7 +421,7 @@ msgstr "Vidalia nemôže uložiť vaše %1 nastavenia." msgctxt "ConfigDialog" msgid "Error Applying Settings" -msgstr "Chyba pri použití nastavení" +msgstr "Nastala chyba pri použití nastavenia" msgctxt "ConfigDialog" msgid "Vidalia was unable to apply your %1 settings to Tor." @@ -448,22 +452,24 @@ msgid "" "Vidalia has connected to a running Tor process that requires a password. " "Please enter your control password:" msgstr "" +"Vidalia je pripojený k prevádzke Tora, ale proces si vyžaduje heslo. Prosím," +" zadajte svoje heslo:" msgctxt "ControlSocket" msgid "Control socket is not connected." -msgstr "" +msgstr "Riadiaci soket nie je pripojený." msgctxt "ControlSocket" msgid "Error sending control command. [%1]" -msgstr "" +msgstr "Nastala chyba pri odosielaní príkazu. [%1]" msgctxt "ControlSocket" msgid "Socket disconnected while attempting to read a line of data." -msgstr "" +msgstr "Soket bol odpojený pri pokuse o načítanie riadku dát." msgctxt "ControlSocket" msgid "Invalid control reply. [%1]" -msgstr "" +msgstr "Neplatná riadiaca odpoveď. [%1]" msgctxt "CountryInfo" msgid "Afghanistan" @@ -1263,33 +1269,35 @@ msgstr "" msgctxt "CrashReportDialog" msgid "Submit a Crash Report" -msgstr "" +msgstr "Odoslať správu o zlyhaní" msgctxt "CrashReportDialog" msgid "Vidalia encountered an error and needed to close" -msgstr "" +msgstr "Vo Vidalia došlo k chybe a preto sa musí aplikácia zavrieť" msgctxt "CrashReportDialog" msgid "Restart Vidalia" -msgstr "" +msgstr "Reštartovať Vidalia" msgctxt "CrashReportDialog" msgid "Don't Restart" -msgstr "" +msgstr "Nereštartovať" msgctxt "CrashReportDialog" msgid "Unable to restart Vidalia" -msgstr "" +msgstr "Nedá sa reštartovať Vidalia" msgctxt "CrashReportDialog" msgid "" "We were unable to automatically restart Vidalia. Please restart Vidalia " "manually." msgstr "" +"Nevedel som automaticky reštartovať Vidalia. Prosím, reštartujte Vidalia " +"manuálne." msgctxt "CrashReportDialog" msgid "Please fill a ticket in:" -msgstr "" +msgstr "Vyplňte prosím etiketu:" msgctxt "CrashReportDialog" msgid "" @@ -1303,40 +1311,45 @@ msgid "" "to help identify and fix the problem. The submitted report does not contain " "any personally identifying information." msgstr "" +"Hlásenie o zlyhaní bolo vytvorené a môžete ho poslať vývojárom do Vidalia " +"kde zistia a opravia problém. Predložená správa neobsahuje žiadne osobné ani" +" identifikačné informácie." msgctxt "CrashReportDialog" msgid "" "with a description of what you were doing before the application crashed, " "along with the following files corresponding to the crash report:" msgstr "" +"s popisom toho, čo ste robili pred zlyhaním aplikácie, spolu s nasledujúcimi" +" súbormy zodpovedajúcími správe o zlyhaní:" msgctxt "GeneralPage" msgid "Executables (*.exe)" -msgstr "" +msgstr "Spustiteľné súbory (*.exe)" msgctxt "GeneralPage" msgid "Select Path to Tor" -msgstr "" +msgstr "Zvoľte Cesta k Torovi" msgctxt "GeneralPage" msgid "Select Proxy Executable" -msgstr "" +msgstr "Zvolte spustiteľné Proxy" msgctxt "GeneralPage" msgid "You must specify the name of your Tor executable." -msgstr "" +msgstr "Musíte zadať názov spustiteľného Tora." msgctxt "GeneralPage" msgid "Start Vidalia when my system starts" -msgstr "" +msgstr "Spustiť Vidalia zo spustením systému" msgctxt "GeneralPage" msgid "Browse" -msgstr "" +msgstr "Hľadať" msgctxt "GeneralPage" msgid "Start the Tor software when Vidalia starts" -msgstr "" +msgstr "Spustiť program Tora zo spustením Vidalia" msgctxt "GeneralPage" msgid "Tor" @@ -1344,27 +1357,27 @@ msgstr "" msgctxt "GeneralPage" msgid "Proxy Application (optional)" -msgstr "" +msgstr "Aplikácia Proxy (voliteľne)" msgctxt "GeneralPage" msgid "Start a proxy application when Tor starts" -msgstr "" +msgstr "Spustiť aplikáciu proxy zo spustením Tora" msgctxt "GeneralPage" msgid "Proxy Application Arguments:" -msgstr "" +msgstr "Parametre alikácie proxy:" msgctxt "GeneralPage" msgid "Software Updates" -msgstr "" +msgstr "Aktualizácia softvéru" msgctxt "GeneralPage" msgid "Check for new software updates automatically" -msgstr "" +msgstr "Automaticky skontrolovať aktualizáciu softvéru" msgctxt "GeneralPage" msgid "Check Now" -msgstr "" +msgstr "Skontrolovať" msgctxt "GraphFrame" msgid "%1 KB/s" @@ -1384,43 +1397,43 @@ msgstr "" msgctxt "GraphFrame" msgid "Recv:" -msgstr "" +msgstr "Prijal:" msgctxt "GraphFrame" msgid "Sent:" -msgstr "" +msgstr "Odos:" msgctxt "HelpBrowser" msgid "Supplied XML file is not a valid Contents document." -msgstr "" +msgstr "Dodaný XML súbor nemá platný obsah." msgctxt "HelpBrowser" msgid "Search reached end of document" -msgstr "" +msgstr "Hľadať od konca dokumentu" msgctxt "HelpBrowser" msgid "Search reached start of document" -msgstr "" +msgstr "Hľadať od začiatku dokumentu" msgctxt "HelpBrowser" msgid "Text not found in document" -msgstr "" +msgstr "Text v dokumente som nenašiel" msgctxt "HelpBrowser" msgid "Found %1 results" -msgstr "" +msgstr "Najdený výsledok %1" msgctxt "HelpBrowser" msgid "Vidalia Help" -msgstr "" +msgstr "Pomoc Vidalia" msgctxt "HelpBrowser" msgid "Back" -msgstr "" +msgstr "Späť" msgctxt "HelpBrowser" msgid "Move to previous page (Backspace)" -msgstr "" +msgstr "Prejdem na predchádzajúcu stránku (Backspace)" msgctxt "HelpBrowser" msgid "Backspace" @@ -1428,11 +1441,11 @@ msgstr "" msgctxt "HelpBrowser" msgid "Forward" -msgstr "" +msgstr "Ďalej" msgctxt "HelpBrowser" msgid "Move to next page (Shift+Backspace)" -msgstr "" +msgstr "Prejdem na ďalšiu stránku (Shift+Backspace)" msgctxt "HelpBrowser" msgid "Shift+Backspace" @@ -1452,11 +1465,11 @@ msgstr "" msgctxt "HelpBrowser" msgid "Find" -msgstr "" +msgstr "Hľadať" msgctxt "HelpBrowser" msgid "Search for a word or phrase on current page (Ctrl+F)" -msgstr "" +msgstr "Vyhľadám slová alebo frázy na aktuálnej stránke (Ctrl+F)" msgctxt "HelpBrowser" msgid "Ctrl+F" @@ -1464,11 +1477,11 @@ msgstr "" msgctxt "HelpBrowser" msgid "Close" -msgstr "" +msgstr "Zavrieť" msgctxt "HelpBrowser" msgid "Close Vidalia Help" -msgstr "" +msgstr "Zavriem pomoc Vidalia" msgctxt "HelpBrowser" msgid "Esc" @@ -1476,43 +1489,43 @@ msgstr "" msgctxt "HelpBrowser" msgid "Find:" -msgstr "" +msgstr "Hľadaj:" msgctxt "HelpBrowser" msgid "Find Previous" -msgstr "" +msgstr "Hľadaj späť" msgctxt "HelpBrowser" msgid "Find Next" -msgstr "" +msgstr "Hľadaj ďalej" msgctxt "HelpBrowser" msgid "Case sensitive" -msgstr "" +msgstr "Rozlišovať písmená" msgctxt "HelpBrowser" msgid "Whole words only" -msgstr "" +msgstr "Iba celé slová" msgctxt "HelpBrowser" msgid "Help Topics" -msgstr "" +msgstr "Témy Pomocníka" msgctxt "HelpBrowser" msgid "Contents" -msgstr "" +msgstr "Obsah" msgctxt "HelpBrowser" msgid "Search" -msgstr "" +msgstr "Hľadať" msgctxt "HelpBrowser" msgid "Searching for:" -msgstr "" +msgstr "Vyľadať:" msgctxt "HelpBrowser" msgid "Found Documents" -msgstr "" +msgstr "Nájdené v dokumente" msgctxt "HelpBrowser" msgid "Error Loading Help Contents:" @@ -1549,15 +1562,15 @@ msgstr "" msgctxt "LicenseDialog" msgid "License Information" -msgstr "" +msgstr "Informácia o licencii" msgctxt "LicenseDialog" msgid "License" -msgstr "" +msgstr "Licencia" msgctxt "LicenseDialog" msgid "Credits" -msgstr "" +msgstr "Patrí im uznanie" msgctxt "LogEvent" msgid "Debug" @@ -1569,19 +1582,19 @@ msgstr "" msgctxt "LogEvent" msgid "Notice" -msgstr "" +msgstr "Oznam" msgctxt "LogEvent" msgid "Warning" -msgstr "" +msgstr "Pozor" msgctxt "LogEvent" msgid "Error" -msgstr "" +msgstr "Chyba" msgctxt "LogEvent" msgid "Unknown" -msgstr "" +msgstr "Neznámy" msgctxt "LogTreeItem" msgid "Debug" @@ -1593,59 +1606,59 @@ msgstr "" msgctxt "LogTreeItem" msgid "Notice" -msgstr "" +msgstr "Oznam" msgctxt "LogTreeItem" msgid "Warning" -msgstr "" +msgstr "Pozor" msgctxt "LogTreeItem" msgid "Error" -msgstr "" +msgstr "Chyba" msgctxt "LogTreeItem" msgid "Unknown" -msgstr "" +msgstr "Neznámy" msgctxt "MainWindow" msgid "Start Tor" -msgstr "" +msgstr "Spustiť Tor" msgctxt "MainWindow" msgid "Exit" -msgstr "" +msgstr "Skončiť" msgctxt "MainWindow" msgid "Bandwidth Graph" -msgstr "" +msgstr "Graf šírka pásma" msgctxt "MainWindow" msgid "Message Log" -msgstr "" +msgstr "Protokol správ" msgctxt "MainWindow" msgid "Network Map" -msgstr "" +msgstr "Mapa siete" msgctxt "MainWindow" msgid "Control Panel" -msgstr "" +msgstr "Ovládací panel" msgctxt "MainWindow" msgid "Settings" -msgstr "" +msgstr "Nastavenie" msgctxt "MainWindow" msgid "About" -msgstr "" +msgstr "Info o mne" msgctxt "MainWindow" msgid "Help" -msgstr "" +msgstr "Pomoc" msgctxt "MainWindow" msgid "New Identity" -msgstr "" +msgstr "Nová identita" msgctxt "MainWindow" msgid "Ctrl+T" @@ -1685,15 +1698,15 @@ msgstr "" msgctxt "MainWindow" msgid "Vidalia Help" -msgstr "" +msgstr "Pomoc Vidalia" msgctxt "MainWindow" msgid "Error starting web browser" -msgstr "" +msgstr "Nastala chyba pri spúšťaní webového prehliadača" msgctxt "MainWindow" msgid "Vidalia was unable to start the configured web browser" -msgstr "" +msgstr "Vidalia nevie spustiť nastavený webový prehliadač" msgctxt "MainWindow" msgid "Error starting IM client" @@ -1909,41 +1922,41 @@ msgstr "" msgctxt "MainWindow" msgid "Tor website: %1" -msgstr "" +msgstr "Webstránka TORA: %1" msgctxt "MainWindow" msgid "" "All subsequent connections will appear to be different than your old " "connections." -msgstr "" +msgstr "Všetky následné pripojenia sa objavia iné, než staré pripojenie." msgctxt "MainWindow" msgid "Failed to Create New Identity" -msgstr "" +msgstr "Nepodarila sa vytvoriť nová identita" msgctxt "MainWindow" msgid "Port Forwarding Failed" -msgstr "" +msgstr "Odosielací port zlyhal" msgctxt "MainWindow" msgid "Vidalia was unable to configure automatic port forwarding." -msgstr "" +msgstr "Vidalia nebol schopný nastaviť automatické presmerovanie portov." msgctxt "MainWindow" msgid "Vidalia Control Panel" -msgstr "" +msgstr "Ovládací panel Vidalia" msgctxt "MainWindow" msgid "Status" -msgstr "" +msgstr "Stav" msgctxt "MainWindow" msgid "Vidalia Shortcuts" -msgstr "" +msgstr "Skratky Vidalia" msgctxt "MainWindow" msgid "Setup Relaying" -msgstr "" +msgstr "Nastavenie výmeny" msgctxt "MainWindow" msgid "Set up a relay and help the network grow" @@ -1951,55 +1964,55 @@ msgstr "" msgctxt "MainWindow" msgid "View the Network" -msgstr "" +msgstr "Zobrazím sieť" msgctxt "MainWindow" msgid "View a map of the Tor network" -msgstr "" +msgstr "Zobrazím mapu siete Tora" msgctxt "MainWindow" msgid "Use a New Identity" -msgstr "" +msgstr "Použijen novú identitu" msgctxt "MainWindow" msgid "Make subsequent connections appear new" -msgstr "" +msgstr "Hneď ako sa objaví nové pripojenie" msgctxt "MainWindow" msgid "View recent bandwidth usage" -msgstr "" +msgstr "Zobrazím poslednú šírku pásma" msgctxt "MainWindow" msgid "View log message history" -msgstr "" +msgstr "Zobrazím históriu v protokole správ" msgctxt "MainWindow" msgid "View help documentation" -msgstr "" +msgstr "Zobrazím nápovedu" msgctxt "MainWindow" msgid "Configure Vidalia" -msgstr "" +msgstr "Prejdem do nastavenia Vidalia" msgctxt "MainWindow" msgid "View version and license information" -msgstr "" +msgstr "Zobrazím informáciu o verzii a licencii" msgctxt "MainWindow" msgid "Exit Vidalia" -msgstr "" +msgstr "Skoním aplikáciu Vidalia" msgctxt "MainWindow" msgid "Show this window on startup" -msgstr "" +msgstr "Zobrazím toto okno pri spustení" msgctxt "MainWindow" msgid "Hide" -msgstr "" +msgstr "Skryť" msgctxt "MainWindow" msgid "Hide this window" -msgstr "" +msgstr "Skryjem toto okno" msgctxt "MainWindow" msgid "Password Reset Failed" @@ -2134,15 +2147,15 @@ msgstr "" msgctxt "MessageLog" msgid "Select Log File" -msgstr "" +msgstr "Vybrat súbor protokolu" msgctxt "MessageLog" msgid "Save Log Messages" -msgstr "" +msgstr "Uložiť protokol" msgctxt "MessageLog" msgid "Text Files (*.txt)" -msgstr "" +msgstr "Textové súbory (*.txt)" msgctxt "MessageLog" msgid "Vidalia" @@ -2150,47 +2163,47 @@ msgstr "" msgctxt "MessageLog" msgid "Find in Message Log" -msgstr "" +msgstr "Vyhľadať v protokole správ" msgctxt "MessageLog" msgid "Find:" -msgstr "" +msgstr "Hľadať:" msgctxt "MessageLog" msgid "Not Found" -msgstr "" +msgstr "Nič som nenašiel" msgctxt "MessageLog" msgid "Search found 0 matches." -msgstr "" +msgstr "Nič som nenašiel" msgctxt "MessageLog" msgid "Message Log" -msgstr "" +msgstr "Protokol správ" msgctxt "MessageLog" msgid "Message Filters..." -msgstr "" +msgstr "Filter správ.." msgctxt "MessageLog" msgid "Set message filters" -msgstr "" +msgstr "Nastavenie filtra správ" msgctxt "MessageLog" msgid "History Size..." -msgstr "" +msgstr "Veľkosť histórie.." msgctxt "MessageLog" msgid "Set maximum number of messages to display" -msgstr "" +msgstr "Nastavenie maximálneho počtu zobrazených správ" msgctxt "MessageLog" msgid "Clear" -msgstr "" +msgstr "Vymazať" msgctxt "MessageLog" msgid "Clear all messages from the Message Log (Ctrl+E)" -msgstr "" +msgstr "Vymažem všetky správy z protokolu správ (Ctrl+E)" msgctxt "MessageLog" msgid "Ctrl+E" @@ -2198,11 +2211,11 @@ msgstr "" msgctxt "MessageLog" msgid "Copy" -msgstr "" +msgstr "Kopírovať" msgctxt "MessageLog" msgid "Copy the selected messages to the clipboard (Ctrl+C)" -msgstr "" +msgstr "Skopírujem vybrané správy do schránky (Ctrl+C)" msgctxt "MessageLog" msgid "Ctrl+C" @@ -2210,11 +2223,11 @@ msgstr "" msgctxt "MessageLog" msgid "Select All" -msgstr "" +msgstr "Označiť všetko" msgctxt "MessageLog" msgid "Select all messages (Ctrl+A)" -msgstr "" +msgstr "Označím všetky správy (Ctrl+A)" msgctxt "MessageLog" msgid "Ctrl+A" @@ -2222,27 +2235,27 @@ msgstr "" msgctxt "MessageLog" msgid "Save All" -msgstr "" +msgstr "Uložiť všetko" msgctxt "MessageLog" msgid "Save all messages to a file" -msgstr "" +msgstr "Uložím všetky správy do súboru" msgctxt "MessageLog" msgid "Save Selected" -msgstr "" +msgstr "Uložiť označené" msgctxt "MessageLog" msgid "Save selected messages to a file" -msgstr "" +msgstr "Uložím vybrané správy do súboru" msgctxt "MessageLog" msgid "Settings" -msgstr "" +msgstr "Nastavenie" msgctxt "MessageLog" msgid "Adjust Message Log Settings" -msgstr "" +msgstr "Otvorím nastavenia protokolu správ" msgctxt "MessageLog" msgid "Ctrl+T" @@ -2250,11 +2263,11 @@ msgstr "" msgctxt "MessageLog" msgid "Help" -msgstr "" +msgstr "Pomoc" msgctxt "MessageLog" msgid "Show the help browser" -msgstr "" +msgstr "Zobrazím pomoc" msgctxt "MessageLog" msgid "F1" @@ -2262,11 +2275,11 @@ msgstr "" msgctxt "MessageLog" msgid "Close" -msgstr "" +msgstr "Zavrieť" msgctxt "MessageLog" msgid "Close the Message Log" -msgstr "" +msgstr "Zavriem protokol správ" msgctxt "MessageLog" msgid "Esc" @@ -2274,11 +2287,11 @@ msgstr "" msgctxt "MessageLog" msgid "Find" -msgstr "" +msgstr "Hľadať" msgctxt "MessageLog" msgid "Find all messages containing the search text (Ctrl+F)" -msgstr "" +msgstr "Vyhľadám všetky správy obsahujúce hľadaný text (Ctrl+F)" msgctxt "MessageLog" msgid "Ctrl+F" @@ -2286,47 +2299,47 @@ msgstr "" msgctxt "MessageLog" msgid "Time" -msgstr "" +msgstr "Čas" msgctxt "MessageLog" msgid "Type" -msgstr "" +msgstr "Typ" msgctxt "MessageLog" msgid "Message" -msgstr "" +msgstr "Správa" msgctxt "MessageLog" msgid "Saves the current Message Log settings" -msgstr "" +msgstr "Uložím aktuálne nastavenie protokolu správ" msgctxt "MessageLog" msgid "Save Settings" -msgstr "" +msgstr "Uložiť nastavenie" msgctxt "MessageLog" msgid "Cancels changes made to settings" -msgstr "" +msgstr "Zruším zmeny vykonané v nastaveniach" msgctxt "MessageLog" msgid "Cancel" -msgstr "" +msgstr "Zrušiť" msgctxt "MessageLog" msgid "Message Filter" -msgstr "" +msgstr "Filter správ" msgctxt "MessageLog" msgid "Error" -msgstr "" +msgstr "Chyba" msgctxt "MessageLog" msgid "Warning" -msgstr "" +msgstr "Pozor" msgctxt "MessageLog" msgid "Notice" -msgstr "" +msgstr "História protokolu správ" msgctxt "MessageLog" msgid "Info"

1 0

[tor/master] Add a changes file for bug4822
by nickm＠torproject.org 05 Jan '12

05 Jan '12

commit 0a00678e56ec3030b9028a7188f68ab6c10a3fa3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 4 21:17:52 2012 -0500 Add a changes file for bug4822 --- changes/bug4822 | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/changes/bug4822 b/changes/bug4822 new file mode 100644 index 0000000..73f43f0 --- /dev/null +++ b/changes/bug4822 @@ -0,0 +1,13 @@ + o Major security workaround: + - When building or running with any version of OpenSSL earlier + than 0.9.8s or 1.0.0f, disable SSLv3 support. These versions had + a bug (CVE-2011-4576) in which their block cipher padding + included uninitialized data, potentially leaking sensitive + information to any peer with whom they made a SSLv3 + connection. Tor does not use SSL v3 by default, but a hostile + client or server could force an SSLv3 connection in order to + gain information that they shouldn't have been able to get. The + best solution here is to upgrade to OpenSSL 0.9.8s or 1.0.0f (or + later). But when building or running with a non-upgraded + OpenSSL, we should instead make sure that the bug can't happen + by disabling SSLv3 entirely.

1 0

[tor/master] Disable SSLv3 when using a not-up-to-date openssl
by nickm＠torproject.org 05 Jan '12

05 Jan '12

commit db78fe45898a6d03727f8db68642bfebdfc10bf8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 4 17:15:50 2012 -0500 Disable SSLv3 when using a not-up-to-date openssl This is to address bug 4822, and CVE-2011-4576. --- src/common/tortls.c | 31 ++++++++++++++++++++++++++++--- 1 files changed, 28 insertions(+), 3 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index cc805f8..22b0e31 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -64,6 +64,16 @@ #define ADDR(tls) (((tls) && (tls)->address) ? tls->address : "peer") +#if (OPENSSL_VERSION_NUMBER < 0x0090813fL || \ + (OPENSSL_VERSION_NUMBER >= 0x00909000L && \ + OPENSSL_VERSION_NUMBER < 0x1000006fL)) +/* This is a version of OpenSSL before 0.9.8s/1.0.0f. It does not have + * the CVE-2011-4657 fix, and as such it can't use RELEASE_BUFFERS and + * SSL3 safely at the same time. + */ +#define DISABLE_SSL3_HANDSHAKE +#endif + /* We redefine these so that we can run correctly even if the vendor gives us * a version of OpenSSL that does not match its header files. (Apple: I am * looking at you.) @@ -739,16 +749,31 @@ tor_tls_context_new(crypto_pk_env_t *identity, unsigned int key_lifetime, result->key = crypto_pk_dup_key(rsa); } -#ifdef EVERYONE_HAS_AES - /* Tell OpenSSL to only use TLS1 */ +#if 0 + /* Tell OpenSSL to only use TLS1. This would actually break compatibility + * with clients that are configured to use SSLv23_method(), so we should + * probably never use it. + */ if (!(result->ctx = SSL_CTX_new(TLSv1_method()))) goto error; -#else +#endif + /* Tell OpenSSL to use SSL3 or TLS1 but not SSL2. */ if (!(result->ctx = SSL_CTX_new(SSLv23_method()))) goto error; SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv2); + + if ( +#ifdef DISABLE_SSL3_HANDSHAKE + 1 || #endif + SSLeay() < 0x0090813fL || + (SSLeay() >= 0x00909000L && + SSLeay() < 0x1000006fL)) { + /* And not SSL3 if it's subject to CVE-2011-4657. */ + SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv3); + } + SSL_CTX_set_options(result->ctx, SSL_OP_SINGLE_DH_USE); #ifdef SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION

1 0

[tor/master] Log at info level when disabling SSLv3
by nickm＠torproject.org 05 Jan '12

05 Jan '12

commit 4752b348793f599cbdc93d0503d18def03e45c7a Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Jan 4 20:41:28 2012 -0800 Log at info level when disabling SSLv3 --- src/common/tortls.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index 22b0e31..d88a59b 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -771,6 +771,12 @@ tor_tls_context_new(crypto_pk_env_t *identity, unsigned int key_lifetime, (SSLeay() >= 0x00909000L && SSLeay() < 0x1000006fL)) { /* And not SSL3 if it's subject to CVE-2011-4657. */ + log_info(LD_NET, "Disabling SSLv3 because this OpenSSL version " + "might otherwise be vulnerable to CVE-2011-4657 " + "(compile-time version %08lx (%s); " + "runtime version %08lx (%s))", + OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_TEXT, + SSLeay(), SSLeay_version(SSLEAY_VERSION)); SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv3); }

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
by nickm＠torproject.org 05 Jan '12

05 Jan '12

commit ccd8289958b6d81cd5575c15dc6c1218d8ecb2d0 Merge: a1074c7 b839ace Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 5 14:16:30 2012 -0500 Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2 changes/bug4822 | 13 +++++++++++++ src/common/tortls.c | 37 ++++++++++++++++++++++++++++++++++--- 2 files changed, 47 insertions(+), 3 deletions(-)

1 0

[tor/master] Merge branch 'bug4822_021_v2_squashed' into maint-0.2.1
by nickm＠torproject.org 05 Jan '12

05 Jan '12

commit b839ace7d092fe073b66a2d7d329644e82ec843b Merge: df17b62 4752b34 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 5 14:11:42 2012 -0500 Merge branch 'bug4822_021_v2_squashed' into maint-0.2.1 changes/bug4822 | 13 +++++++++++++ src/common/tortls.c | 37 ++++++++++++++++++++++++++++++++++--- 2 files changed, 47 insertions(+), 3 deletions(-)

1 0