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

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 21 Sep '17

21 Sep '17

commit c3af72c53d1d400503015623c2186c2177777fe9 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 21 18:15:11 2017 +0000 Update translations for bridgedb_completed --- vi/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vi/LC_MESSAGES/bridgedb.po b/vi/LC_MESSAGES/bridgedb.po index 95b8179e7..7b623c4ef 100644 --- a/vi/LC_MESSAGES/bridgedb.po +++ b/vi/LC_MESSAGES/bridgedb.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2017-09-19 17:03+0000\n" +"PO-Revision-Date: 2017-09-21 18:01+0000\n" "Last-Translator: Khanh Nguyen <nguyenduykhanh85(a)gmail.com>\n" "Language-Team: Vietnamese (http://www.transifex.com/otf/torproject/language/vi/)\n" "MIME-Version: 1.0\n"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 21 Sep '17

21 Sep '17

commit a83609566baf7ee5a17eb5b53accb5a0f4d460da Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 21 18:15:04 2017 +0000 Update translations for bridgedb --- vi/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vi/LC_MESSAGES/bridgedb.po b/vi/LC_MESSAGES/bridgedb.po index 95b8179e7..7b623c4ef 100644 --- a/vi/LC_MESSAGES/bridgedb.po +++ b/vi/LC_MESSAGES/bridgedb.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2017-09-19 17:03+0000\n" +"PO-Revision-Date: 2017-09-21 18:01+0000\n" "Last-Translator: Khanh Nguyen <nguyenduykhanh85(a)gmail.com>\n" "Language-Team: Vietnamese (http://www.transifex.com/otf/torproject/language/vi/)\n" "MIME-Version: 1.0\n"

1 0

[tor/master] hs: Avoid possible double circuit close on error
by nickm＠torproject.org 21 Sep '17

21 Sep '17

commit 6045bdd4a0542ef11dc46d98495686172015a961 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Sep 21 13:13:44 2017 -0400 hs: Avoid possible double circuit close on error Fixes #23610 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug23610 | 4 ++++ src/or/hs_intropoint.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/bug23610 b/changes/bug23610 new file mode 100644 index 000000000..3d868524e --- /dev/null +++ b/changes/bug23610 @@ -0,0 +1,4 @@ + o Minor bugfixes (hidden service, relay): + - Avoid a possible double close of a circuit by the intro point on error + of sending the INTRO_ESTABLISHED cell. Fixes ticket 23610.; bugfix on + 0.3.2.1-alpha. diff --git a/src/or/hs_intropoint.c b/src/or/hs_intropoint.c index cb4d6c02e..4a5202f61 100644 --- a/src/or/hs_intropoint.c +++ b/src/or/hs_intropoint.c @@ -255,7 +255,11 @@ handle_establish_intro(or_circuit_t *circ, const uint8_t *request, goto done; err: - circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_TORPROTOCOL); + /* When sending the intro establish ack, on error the circuit can be marked + * as closed so avoid a double close. */ + if (!TO_CIRCUIT(circ)->marked_for_close) { + circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_TORPROTOCOL); + } done: trn_cell_establish_intro_free(parsed_cell);

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 21 Sep '17

21 Sep '17

commit 5b3ecf0adadd94f148b6936f1280b7decfe0f5bf Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 21 17:45:49 2017 +0000 Update translations for liveusb-creator_completed --- de/de.po | 232 +++++++++++++++++++++++---------------------------------------- 1 file changed, 83 insertions(+), 149 deletions(-) diff --git a/de/de.po b/de/de.po index 6da05d8c9..9ce9bffb2 100644 --- a/de/de.po +++ b/de/de.po @@ -43,8 +43,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-14 14:52+0200\n" -"PO-Revision-Date: 2017-09-14 18:40+0000\n" +"POT-Creation-Date: 2017-09-20 18:02+0200\n" +"PO-Revision-Date: 2017-09-21 17:31+0000\n" "Last-Translator: Ettore Atalan <atalanttore(a)googlemail.com>\n" "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n" "MIME-Version: 1.0\n" @@ -136,179 +136,179 @@ msgstr "Ordner einer älteren Live-System-Version konnte nicht entfernt werden: msgid "Cannot find device %s" msgstr "Kann Gerät %s nicht finden" -#: ../tails_installer/creator.py:699 +#: ../tails_installer/creator.py:701 #, python-format msgid "Unable to write on %(device)s, skipping." msgstr "Auf %(device)s kann nicht geschrieben werden. Überspringe." -#: ../tails_installer/creator.py:719 +#: ../tails_installer/creator.py:725 #, python-format msgid "" "Some partitions of the target device %(device)s are mounted. They will be " "unmounted before starting the installation process." msgstr "Einige Partitionen des Ziellaufwerks %(device)s sind eingehängt. Sie werden ausgehängt, bevor die Installation beginnt." -#: ../tails_installer/creator.py:762 ../tails_installer/creator.py:986 +#: ../tails_installer/creator.py:768 ../tails_installer/creator.py:991 msgid "Unknown filesystem. Your device may need to be reformatted." msgstr "Unbekanntes Dateisystem. Eventuell muss das Speichermedium neu formatiert werden." -#: ../tails_installer/creator.py:765 ../tails_installer/creator.py:989 +#: ../tails_installer/creator.py:771 ../tails_installer/creator.py:994 #, python-format msgid "Unsupported filesystem: %s" msgstr "Nicht unterstütztes Dateisystem: %s" -#: ../tails_installer/creator.py:782 +#: ../tails_installer/creator.py:788 #, python-format msgid "Unknown GLib exception while trying to mount device: %(message)s" msgstr "Unbekannte GLib-Ausnahme beim Versuch das Gerät einzuhängen: %(message)s" -#: ../tails_installer/creator.py:786 +#: ../tails_installer/creator.py:792 #, python-format msgid "Unable to mount device: %(message)s" msgstr "Speichermedium konnte nicht eingehängt werden: %(message)s" -#: ../tails_installer/creator.py:791 +#: ../tails_installer/creator.py:797 msgid "No mount points found" msgstr "Keine Einhängepunkte gefunden" -#: ../tails_installer/creator.py:802 +#: ../tails_installer/creator.py:808 #, python-format msgid "Entering unmount_device for '%(device)s'" msgstr "unmount_device für »%(device)s«" -#: ../tails_installer/creator.py:812 +#: ../tails_installer/creator.py:818 #, python-format msgid "Unmounting mounted filesystems on '%(device)s'" msgstr "Eingehängtes Dateisystem auf %(device)s wird ausgehängt" -#: ../tails_installer/creator.py:816 +#: ../tails_installer/creator.py:822 #, python-format msgid "Unmounting '%(udi)s' on '%(device)s'" msgstr "'%(udi)s' auf '%(device)s' wird ausgehängt" -#: ../tails_installer/creator.py:826 +#: ../tails_installer/creator.py:832 #, python-format msgid "Mount %s exists after unmounting" msgstr "Mount %s existiert noch nach dem Aushängen" -#: ../tails_installer/creator.py:839 +#: ../tails_installer/creator.py:845 #, python-format msgid "Partitioning device %(device)s" msgstr "Speichermedium %(device)s wird partitioniert" -#: ../tails_installer/creator.py:917 +#: ../tails_installer/creator.py:920 #, python-format msgid "Updating properties of system partition %(system_partition)s" msgstr "Die Eigenschaften der Systempartition %(system_partition)s werden aktualisiert" -#: ../tails_installer/creator.py:971 +#: ../tails_installer/creator.py:976 #, python-format msgid "Unsupported device '%(device)s', please report a bug." msgstr "Nicht unterstütztes Medium »%(device)s«, bitte melden Sie einen Fehler." -#: ../tails_installer/creator.py:974 +#: ../tails_installer/creator.py:979 msgid "Trying to continue anyway." msgstr "Es wird trotzdem versucht, fortzufahren." -#: ../tails_installer/creator.py:983 ../tails_installer/creator.py:1376 +#: ../tails_installer/creator.py:988 ../tails_installer/creator.py:1381 msgid "Verifying filesystem..." msgstr "Dateisystem wird überprüft …" -#: ../tails_installer/creator.py:1007 +#: ../tails_installer/creator.py:1012 #, python-format msgid "Unable to change volume label: %(message)s" msgstr "Datenträgerbeschreibung konnte nicht geändert werden: %(message)s" -#: ../tails_installer/creator.py:1012 ../tails_installer/creator.py:1409 +#: ../tails_installer/creator.py:1017 ../tails_installer/creator.py:1414 msgid "Installing bootloader..." msgstr "Bootloader wird installiert …" -#: ../tails_installer/creator.py:1038 +#: ../tails_installer/creator.py:1043 #, python-format msgid "Could not find the '%s' COM32 module" msgstr "COM32-Modul '%s' konnte nicht gefunden werden" -#: ../tails_installer/creator.py:1046 ../tails_installer/creator.py:1427 +#: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432 #, python-format msgid "Removing %(file)s" msgstr "Entferne %(file)s" -#: ../tails_installer/creator.py:1158 +#: ../tails_installer/creator.py:1163 #, python-format msgid "%s already bootable" msgstr "%s bereits bootfähig" -#: ../tails_installer/creator.py:1178 +#: ../tails_installer/creator.py:1183 msgid "Unable to find partition" msgstr "Partition konnte nicht gefunden werden" -#: ../tails_installer/creator.py:1201 +#: ../tails_installer/creator.py:1206 #, python-format msgid "Formatting %(device)s as FAT32" msgstr "%(device)s wird als FAT32 formatiert" -#: ../tails_installer/creator.py:1261 +#: ../tails_installer/creator.py:1266 msgid "Could not find syslinux' gptmbr.bin" msgstr "gptmbr.bin von syslinux konne nicht gefunden werden" -#: ../tails_installer/creator.py:1274 +#: ../tails_installer/creator.py:1279 #, python-format msgid "Reading extracted MBR from %s" msgstr "Extrahierter MBR von %s wird gelesen" -#: ../tails_installer/creator.py:1278 +#: ../tails_installer/creator.py:1283 #, python-format msgid "Could not read the extracted MBR from %(path)s" msgstr "Extrahierter MBR aus %(path)s konnte nicht gelesen werden" -#: ../tails_installer/creator.py:1291 ../tails_installer/creator.py:1292 +#: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297 #, python-format msgid "Resetting Master Boot Record of %s" msgstr "Master-Boot-Record von %s wird zurückgesetzt" -#: ../tails_installer/creator.py:1297 +#: ../tails_installer/creator.py:1302 msgid "Drive is a loopback, skipping MBR reset" msgstr "Das Laufwerk ist ein Loopback, MBR zurücksetzen wird übersprungen" -#: ../tails_installer/creator.py:1301 ../tails_installer/creator.py:1555 +#: ../tails_installer/creator.py:1306 ../tails_installer/creator.py:1560 #, python-format msgid "Calculating the SHA1 of %s" msgstr "SHA-1-Summe von %s wird errechnet" -#: ../tails_installer/creator.py:1326 +#: ../tails_installer/creator.py:1331 msgid "Synchronizing data on disk..." msgstr "Daten auf dem Datenträger werden synchronisiert…" -#: ../tails_installer/creator.py:1368 +#: ../tails_installer/creator.py:1373 msgid "Error probing device" msgstr "Fehler beim Prüfen des Speichermediums" -#: ../tails_installer/creator.py:1370 +#: ../tails_installer/creator.py:1375 msgid "Unable to find any supported device" msgstr "Es wurde kein unterstütztes Speichermedium gefunden" -#: ../tails_installer/creator.py:1380 +#: ../tails_installer/creator.py:1385 msgid "" "Make sure your USB key is plugged in and formatted with the FAT filesystem" msgstr "Stellen Sie sicher, dass Ihr USB-Medium eingesteckt und mit einem FAT-Dateisystem formatiert ist" -#: ../tails_installer/creator.py:1383 +#: ../tails_installer/creator.py:1388 #, python-format msgid "" "Unsupported filesystem: %s\n" "Please backup and format your USB key with the FAT filesystem." msgstr "Nicht unterstütztes Dateisystem: %s\nBitte erstellen Sie eine Datensicherung und formatieren Sie Ihren USB-Stick mit einem FAT-Dateisystem." -#: ../tails_installer/creator.py:1450 +#: ../tails_installer/creator.py:1455 msgid "" "Unable to get Win32_LogicalDisk; win32com query did not return any results" msgstr "Win32_LogicalDisk konnte nicht ermittelt werden; der win32com-Aufruf lieferte keinerlei Resultate" -#: ../tails_installer/creator.py:1503 +#: ../tails_installer/creator.py:1508 msgid "Cannot find" msgstr "Kann nicht gefunden werden" -#: ../tails_installer/creator.py:1504 +#: ../tails_installer/creator.py:1509 msgid "" "Make sure to extract the entire tails-installer zip file before running this" " program." @@ -339,40 +339,48 @@ msgstr "Installation abgeschlossen! (%s) " msgid "Tails installation failed!" msgstr "Tails-Installation fehlgeschlagen!" -#: ../tails_installer/gui.py:364 +#: ../tails_installer/gui.py:363 msgid "" "Warning: This tool needs to be run as an Administrator. To do this, right " "click on the icon and open the Properties. Under the Compatibility tab, " "check the \"Run this program as an administrator\" box." msgstr "Warnung: Dieses Werkzeug muss mit Administrationsrechten ausgeführt werden. Um dies zu tun, klicken Sie mit der rechten Maustaste auf das Programmsymbol und öffnen Sie dort die Eigenschaften. Setzen Sie nun einen Haken bei »Programm als Administrator ausführen« im Reiter »Kompatibilität«." -#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31 +#: ../tails_installer/gui.py:375 msgid "Tails Installer" msgstr "Tails-Installationsprogramm" -#: ../tails_installer/gui.py:473 +#: ../tails_installer/gui.py:454 +msgid "Upgrade" +msgstr "Aktualisieren" + +#: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7 +msgid "Install" +msgstr "Installieren" + +#: ../tails_installer/gui.py:465 #, python-format msgid "%(size)s %(vendor)s %(model)s device (%(device)s)" msgstr "%(size)s %(vendor)s %(model)s Gerät (%(device)s)" -#: ../tails_installer/gui.py:484 +#: ../tails_installer/gui.py:476 msgid "No ISO image selected" msgstr "Kein ISO-Abbild ausgewählt" -#: ../tails_installer/gui.py:485 +#: ../tails_installer/gui.py:477 msgid "Please select a Tails ISO image." msgstr "Bitte wählen Sie ein Tails-ISO-Abbild aus." -#: ../tails_installer/gui.py:524 +#: ../tails_installer/gui.py:516 msgid "No device suitable to install Tails could be found" msgstr "Es konnte kein passendes Gerät zur Installation von Tails gefunden werden" -#: ../tails_installer/gui.py:526 +#: ../tails_installer/gui.py:518 #, python-format msgid "Please plug a USB flash drive or SD card of at least %0.1f GB." msgstr "Bitte stecken Sie ein USB-Flash-Laufwerk oder eine SD-Karte mit mindestens %0.1f GB ein." -#: ../tails_installer/gui.py:560 +#: ../tails_installer/gui.py:552 #, python-format msgid "" "The USB stick \"%(pretty_name)s\" is configured as non-removable by its " @@ -380,42 +388,42 @@ msgid "" "different model." msgstr "Der USB-Stick \"%(pretty_name)s\" wurde vom Herrsteller als nicht entfernbar konfiguriert und somit würde Tails davon nicht starten. Bitte versuch es auf einem anderen Moddel zu installiern." -#: ../tails_installer/gui.py:570 +#: ../tails_installer/gui.py:562 #, python-format msgid "" "The device \"%(pretty_name)s\" is too small to install Tails (at least " "%(size)s GB is required)." msgstr "Der Datenträger \"%(pretty_name)s\" ist zu klein, um Tails darauf zu installieren (mindestens %(size)s GB werden benötigt)." -#: ../tails_installer/gui.py:592 +#: ../tails_installer/gui.py:584 msgid "An error happened while installing Tails" msgstr "Bei der Installation von Tails ist ein Fehler aufgetreten" -#: ../tails_installer/gui.py:604 +#: ../tails_installer/gui.py:596 msgid "Refreshing releases..." msgstr "Veröffentlichungen werden aktualisiert …" -#: ../tails_installer/gui.py:609 +#: ../tails_installer/gui.py:601 msgid "Releases updated!" msgstr "Veröffentlichungen wurden aktualisiert!" -#: ../tails_installer/gui.py:651 +#: ../tails_installer/gui.py:643 msgid "Installation complete!" msgstr "Installation abgeschlossen!" -#: ../tails_installer/gui.py:652 +#: ../tails_installer/gui.py:644 msgid "Installation was completed." msgstr "Installation wurde abgeschlossen." -#: ../tails_installer/gui.py:701 +#: ../tails_installer/gui.py:693 msgid "Unable to mount device" msgstr "Speichermedium kann nicht einhängt werden" -#: ../tails_installer/gui.py:708 ../tails_installer/gui.py:736 +#: ../tails_installer/gui.py:700 ../tails_installer/gui.py:730 msgid "Confirm the target USB stick" msgstr "Bestätigen Sie den Ziel-USB-Stick" -#: ../tails_installer/gui.py:709 +#: ../tails_installer/gui.py:701 #, python-format msgid "" "%(size)s %(vendor)s %(model)s device (%(device)s)\n" @@ -423,39 +431,48 @@ msgid "" "All data on this USB stick will be lost." msgstr "%(size)s %(vendor)s %(model)s Gerät (%(device)s)\n\nAlle Daten auf diesem USB-Stick gehen verloren." -#: ../tails_installer/gui.py:728 +#: ../tails_installer/gui.py:717 #, python-format +msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)" +msgstr "%(parent_size)s %(vendor)s %(model)s Gerät (%(device)s)" + +#: ../tails_installer/gui.py:725 msgid "" -"%(vendor)s %(model)s device (%(device)s)\n" "\n" -"%(persistence_message)s" -msgstr "%(vendor)s %(model)s Gerät (%(device)s)\n\n%(persistence_message)s" +"\n" +"The persistent storage on this USB stick will be preserved." +msgstr "\n\nDer dauerhafte Speicher auf diesem USB-Stick bleibt erhalten." + +#: ../tails_installer/gui.py:726 +#, python-format +msgid "%(description)s%(persistence_message)s" +msgstr "%(description)s%(persistence_message)s" -#: ../tails_installer/gui.py:782 +#: ../tails_installer/gui.py:776 msgid "Download complete!" msgstr "Herunterladen abgeschlossen!" -#: ../tails_installer/gui.py:786 +#: ../tails_installer/gui.py:780 msgid "Download failed: " msgstr "Herunterladen fehlgeschlagen:" -#: ../tails_installer/gui.py:787 +#: ../tails_installer/gui.py:781 msgid "You can try again to resume your download" msgstr "Sie können versuchen, das Herunterladen fortzusetzen" -#: ../tails_installer/gui.py:795 +#: ../tails_installer/gui.py:789 msgid "" "The selected file is unreadable. Please fix its permissions or select " "another file." msgstr "Die ausgewählte Datei konnte nicht gelesen werden. Bitte korrigieren Sie die Berechtigungen oder wählen Sie eine andere Datei aus." -#: ../tails_installer/gui.py:801 +#: ../tails_installer/gui.py:795 msgid "" "Unable to use the selected file. You may have better luck if you move your " "ISO to the root of your drive (ie: C:\\)" msgstr "Die ausgewählte Datei kann nicht verwendet werden. Vielleicht haben Sie mehr Glück, wenn Sie das ISO-Abbild in das Wurzelverzeichnis Ihres Laufwerkes verschieben." -#: ../tails_installer/gui.py:807 +#: ../tails_installer/gui.py:801 #, python-format msgid "%(filename)s selected" msgstr "%(filename)s ausgewählt" @@ -526,86 +543,3 @@ msgstr "Ziel-USB-Stick:" #: ../data/tails-installer.ui.h:6 msgid "Reinstall (delete all data)" msgstr "Neu installieren (alle Daten löschen)" - -#: ../data/tails-installer.ui.h:7 -msgid "Install Tails" -msgstr "Tails installieren" - -#: ../data/tails-installer-launcher.ui.h:1 -msgid "" -"To run Tails Installer you need an ISO image which can be downloaded from " -"the Tails website: <a " -"href=\"https://tails.boum.org/download/\">https://tails.boum.org/download/</a>" -msgstr "Um das Tails Installationsprogramm zu starten benötigst du ein ISO Abbild welches du von der Tails Internetseite laden kannst: <a href=\"https://tails.boum.org/download/\">https://tails.boum.org/download</a>" - -#: ../data/tails-installer-launcher.ui.h:2 -msgid "Install" -msgstr "Installieren" - -#: ../data/tails-installer-launcher.ui.h:3 -msgid "• Install Tails on a new USB stick." -msgstr "• Installieren Sie Tails auf einem neuen USB-Stick." - -#: ../data/tails-installer-launcher.ui.h:4 -msgid "• The USB stick that you install on is formatted and all data is lost." -msgstr "• Der USB Stick auf den du installieren willst wird formatiert und alle Daten werden verloren gehen." - -#: ../data/tails-installer-launcher.ui.h:5 -msgid "Upgrade" -msgstr "Aktualisieren" - -#: ../data/tails-installer-launcher.ui.h:6 -msgid "• Upgrade a Tails USB stick to the version of an ISO image." -msgstr "• Einen Tails USB Stick auf die Version eines ISO Abbildes aktualisieren." - -#: ../data/tails-installer-launcher.ui.h:7 -msgid "" -"• The encrypted persistent storage of the Tails USB stick that you upgrade " -"is preserved." -msgstr "Der verschlüsselte dauerhafte Speicher des Tails USB-Sticks, den du upgradest, ist in Benutzung." - -#: ../data/tails-installer-launcher.ui.h:8 -msgid "" -"Need help? Read the <a " -"href=\"https://tails.boum.org/doc/first_steps/installation/\">documentation</a>" -msgstr "Brauchen Sie Hilfe? Lesen Sie die <a href=\"https://tails.boum.org/doc/first_steps/installation/\">Dokumentation</a>" - -#: ../data/tails-installer-launcher.ui.h:9 -msgid "Install by cloning" -msgstr "Durch Klonen installieren" - -#: ../data/tails-installer-launcher.ui.h:10 -msgid "" -"• Install Tails on another USB stick by copying the Tails system that you " -"are currently using." -msgstr "Installiere Tails auf einem anderen USB-Stick indem du das aktuell genutzte Tails System kopierst." - -#: ../data/tails-installer-launcher.ui.h:11 -msgid "" -"• The encrypted persistent storage of the Tails USB stick that you are " -"currently using is not copied." -msgstr "Der verschlüsselte, dauerhafte Speicher des Tails USB-Sticks, den du gerade nutzt, wurde nicht kopiert." - -#: ../data/tails-installer-launcher.ui.h:12 -msgid "Upgrade by cloning" -msgstr "Durch Klonen aktualisieren" - -#: ../data/tails-installer-launcher.ui.h:13 -msgid "" -"• Upgrade another Tails USB stick to the same version of Tails that you are " -"currently using." -msgstr "Upgrade einen weiteren Tails USB-Stick auf dieselbe Version von Tails die du gerade nutzt." - -#: ../data/tails-installer-launcher.ui.h:14 -msgid "Upgrade from ISO" -msgstr "Von ISO aktualisieren" - -#: ../data/tails-installer-launcher.ui.h:15 -msgid "• Upgrade another Tails USB stick to the version of an ISO image." -msgstr "Upgrade einen weiteren Tails USB-Stick auf die Version eines ISO-Images." - -#: ../data/tails-installer-launcher.ui.h:16 -msgid "" -"Need help? Read the <a " -"href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\">documentation</a>" -msgstr "Brauchen Sie Hilfe? Lesen Sie die <a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\">Dokumentation</a>"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 21 Sep '17

21 Sep '17

commit d3e00ccf921268d34348839d81f487c6758f8c2d Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 21 17:45:45 2017 +0000 Update translations for liveusb-creator --- de/de.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/de/de.po b/de/de.po index 4283e70d8..9ce9bffb2 100644 --- a/de/de.po +++ b/de/de.po @@ -44,8 +44,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-20 18:02+0200\n" -"PO-Revision-Date: 2017-09-21 01:33+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2017-09-21 17:31+0000\n" +"Last-Translator: Ettore Atalan <atalanttore(a)googlemail.com>\n" "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -434,19 +434,19 @@ msgstr "%(size)s %(vendor)s %(model)s Gerät (%(device)s)\n\nAlle Daten auf dies #: ../tails_installer/gui.py:717 #, python-format msgid "%(parent_size)s %(vendor)s %(model)s device (%(device)s)" -msgstr "" +msgstr "%(parent_size)s %(vendor)s %(model)s Gerät (%(device)s)" #: ../tails_installer/gui.py:725 msgid "" "\n" "\n" "The persistent storage on this USB stick will be preserved." -msgstr "" +msgstr "\n\nDer dauerhafte Speicher auf diesem USB-Stick bleibt erhalten." #: ../tails_installer/gui.py:726 #, python-format msgid "%(description)s%(persistence_message)s" -msgstr "" +msgstr "%(description)s%(persistence_message)s" #: ../tails_installer/gui.py:776 msgid "Download complete!"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 21 Sep '17

21 Sep '17

commit 473c9f9c34c0258081ee4a48817ddcefb6bd1e93 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 21 17:45:22 2017 +0000 Update translations for whisperback --- uk/uk.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uk/uk.po b/uk/uk.po index 026215fdf..aa4ae6214 100644 --- a/uk/uk.po +++ b/uk/uk.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 12:09+0000\n" -"PO-Revision-Date: 2017-09-21 12:31+0000\n" +"PO-Revision-Date: 2017-09-21 17:15+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Ukrainian (http://www.transifex.com/otf/torproject/language/uk/)\n" "MIME-Version: 1.0\n"

1 0

[stem/master] Drop size check from parsed messages
by atagar＠torproject.org 21 Sep '17

21 Sep '17

commit 8be35daeab115e59b8f8a137728d29310658101d Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Sep 20 19:00:12 2017 -0700 Drop size check from parsed messages The following regex check asserts that messages have the expected prefix. As such we already know the message is this large. --- stem/socket.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/stem/socket.py b/stem/socket.py index 96e448bc..6dd1cb2c 100644 --- a/stem/socket.py +++ b/stem/socket.py @@ -560,9 +560,6 @@ def recv_message(control_file): log.info(ERROR_MSG % ('SocketClosed', 'empty socket content')) raise stem.SocketClosed('Received empty socket content.') - elif len(line) < 4: - log.info(ERROR_MSG % ('ProtocolError', 'line too short, "%s"' % log.escape(line))) - raise stem.ProtocolError('Badly formatted reply line: too short') elif not MESSAGE_PREFIX.match(line): log.info(ERROR_MSG % ('ProtocolError', 'malformed status code/divider, "%s"' % log.escape(line))) raise stem.ProtocolError('Badly formatted reply line: beginning is malformed') @@ -570,8 +567,7 @@ def recv_message(control_file): log.info(ERROR_MSG % ('ProtocolError', 'no CRLF linebreak, "%s"' % log.escape(line))) raise stem.ProtocolError('All lines should end with CRLF') - line = line[:-2] # strips off the CRLF - status_code, divider, content = line[:3], line[3:4], line[4:] + status_code, divider, content = line[:3], line[3:4], line[4:-2] # strip CRLF off content if stem.prereq.is_python_3(): status_code = stem.util.str_tools._to_unicode(status_code)

1 0

[stem/master] Use BytesIO to collect socket content
by atagar＠torproject.org 21 Sep '17

21 Sep '17

commit 2bbe4cd42c09de406335fca6abc96bcbde87fc05 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Sep 19 19:08:59 2017 -0700 Use BytesIO to collect socket content Making an array out of the lines is unnecessary. BytesIO is specifically designed for this and more efficient. --- stem/socket.py | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/stem/socket.py b/stem/socket.py index 9817c129..96e448bc 100644 --- a/stem/socket.py +++ b/stem/socket.py @@ -69,6 +69,7 @@ Tor... from __future__ import absolute_import +import io import re import socket import threading @@ -526,11 +527,12 @@ def recv_message(control_file): a complete message """ - parsed_content, raw_content = [], [] + parsed_content, raw_content = [], io.BytesIO() while True: try: line = control_file.readline() + raw_content.write(line) except AttributeError: # if the control_file has been closed then we will receive: # AttributeError: 'NoneType' object has no attribute 'recv' @@ -549,8 +551,6 @@ def recv_message(control_file): log.info(ERROR_MSG % ('SocketClosed', 'received exception "%s"' % exc)) raise stem.SocketClosed(exc) - raw_content.append(line) - # Parses the tor control lines. These are of the form... # <status code><divider><content>\r\n @@ -572,7 +572,6 @@ def recv_message(control_file): line = line[:-2] # strips off the CRLF status_code, divider, content = line[:3], line[3:4], line[4:] - content_lines = [content] if stem.prereq.is_python_3(): status_code = stem.util.str_tools._to_unicode(status_code) @@ -585,10 +584,8 @@ def recv_message(control_file): # end of the message, return the message parsed_content.append((status_code, divider, content)) - raw_content_str = b''.join(raw_content) - if log.is_tracing(): - log_message = stem.util.str_tools._to_unicode(raw_content_str.replace(b'\r\n', b'\n').rstrip()) + log_message = stem.util.str_tools._to_unicode(raw_content.getvalue().replace(b'\r\n', b'\n').rstrip()) log_message_lines = log_message.split('\n') if TRUNCATE_LOGS and len(log_message_lines) > TRUNCATE_LOGS: @@ -599,22 +596,24 @@ def recv_message(control_file): else: log.trace('Received from tor: %s' % log_message.replace('\n', '\\n')) - return stem.response.ControlMessage(parsed_content, raw_content_str) + return stem.response.ControlMessage(parsed_content, raw_content.getvalue()) elif divider == '+': # data entry, all of the following lines belong to the content until we # get a line with just a period + content_block = io.BytesIO() + content_block.write(content) + while True: try: - line = stem.util.str_tools._to_bytes(control_file.readline()) + line = control_file.readline() + raw_content.write(line) except socket.error as exc: - log.info(ERROR_MSG % ('SocketClosed', 'received an exception while mid-way through a data reply (exception: "%s", read content: "%s")' % (exc, log.escape(b''.join(raw_content))))) + log.info(ERROR_MSG % ('SocketClosed', 'received an exception while mid-way through a data reply (exception: "%s", read content: "%s")' % (exc, log.escape(raw_content.getvalue())))) raise stem.SocketClosed(exc) - raw_content.append(line) - if not line.endswith(b'\r\n'): - log.info(ERROR_MSG % ('ProtocolError', 'CRLF linebreaks missing from a data reply, "%s"' % log.escape(b''.join(raw_content)))) + log.info(ERROR_MSG % ('ProtocolError', 'CRLF linebreaks missing from a data reply, "%s"' % log.escape(raw_content.getvalue()))) raise stem.ProtocolError('All lines should end with CRLF') elif line == b'.\r\n': break # data block termination @@ -627,12 +626,12 @@ def recv_message(control_file): if line.startswith(b'..'): line = line[1:] - content_lines.append(line) + content_block.write(b'\n' + line) # joins the content using a newline rather than CRLF separator (more # conventional for multi-line string content outside the windows world) - parsed_content.append((status_code, divider, b'\n'.join(content_lines))) + parsed_content.append((status_code, divider, content_block.getvalue())) else: # this should never be reached due to the prefix regex, but might as well # be safe...

1 0

[stem/master] Close control socket faster when under load
by atagar＠torproject.org 21 Sep '17

21 Sep '17

commit 7d639f217671fcbe44945f07c5e81b250adea625 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Sep 21 10:11:42 2017 -0700 Close control socket faster when under load When receiving a high volume of traffic (such as DEBUG events on a busy relay) our controller can take seconds or even minutes to close. This is because we send a QUIT signal, then wait for the response which is stuck behind potentially thousands of events. From what I can tell there's little point in issuing a QUIT so dropping that, and setting a time limit for processing backlogged events. --- docs/change_log.rst | 1 + stem/control.py | 25 ++++++++++++++++--------- stem/socket.py | 2 +- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 8d9c10aa..2e421c4f 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -62,6 +62,7 @@ The following are only available within Stem's `git repository * Added :func:`~stem.manual.database` to get a cursor for the manual cache * Failed to parse torrcs without a port on ipv6 exit policy entries * Resilient to 'Tor' prefix in 'GETINFO version' result (:spec:`c5ff1b1`) + * Closing controller connection faster when under heavy event load * More succinct trace level logging * **Descriptors** diff --git a/stem/control.py b/stem/control.py index fd5f9f87..ef9919be 100644 --- a/stem/control.py +++ b/stem/control.py @@ -281,6 +281,11 @@ import stem.version from stem import UNDEFINED, CircStatus, Signal from stem.util import str_type, log +# When closing the controller we attempt to finish processing enqueued events, +# but if it takes longer than this we terminate. + +EVENTS_LISTENING_TIMEOUT = 0.1 + # state changes a control socket can have State = stem.util.enum.Enum('INIT', 'RESET', 'CLOSED') @@ -957,10 +962,20 @@ class BaseController(object): socket. """ + socket_closed_at = None + while True: try: event_message = self._event_queue.get_nowait() self._handle_event(event_message) + + # Attempt to finish processing enqueued events when our controller closes + + if not self.is_alive(): + if not socket_closed_at: + socket_closed_at = time.time() + elif time.time() - socket_closed_at > EVENTS_LISTENING_TIMEOUT: + break except queue.Empty: if not self.is_alive(): break @@ -1057,15 +1072,7 @@ class Controller(BaseController): self.add_event_listener(_confchanged_listener, EventType.CONF_CHANGED) def close(self): - # making a best-effort attempt to quit before detaching the socket - if self.is_authenticated(): - try: - self.msg('QUIT') - except: - pass - - self.clear_cache() - + self.clear_cache() super(Controller, self).close() def authenticate(self, *args, **kwargs): diff --git a/stem/socket.py b/stem/socket.py index eddbfe58..ef2d77c7 100644 --- a/stem/socket.py +++ b/stem/socket.py @@ -573,7 +573,7 @@ def recv_message(control_file): divider = stem.util.str_tools._to_unicode(divider) # Most controller responses are single lines, in which case we don't need - # some overhead. + # so much overhead. if first_line: if divider == ' ':

1 0

[stem/master] Lighter handling for single line controller messages
by atagar＠torproject.org 21 Sep '17

21 Sep '17

commit e54958ac90b3fa7479dc7e728e65a48b89758cd5 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Sep 21 00:37:47 2017 -0700 Lighter handling for single line controller messages Most controller messages are just a single line. No reason to take on the collections overhead. --- stem/socket.py | 45 ++++++++++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/stem/socket.py b/stem/socket.py index 6dd1cb2c..eddbfe58 100644 --- a/stem/socket.py +++ b/stem/socket.py @@ -527,12 +527,11 @@ def recv_message(control_file): a complete message """ - parsed_content, raw_content = [], io.BytesIO() + parsed_content, raw_content, first_line = None, None, True while True: try: line = control_file.readline() - raw_content.write(line) except AttributeError: # if the control_file has been closed then we will receive: # AttributeError: 'NoneType' object has no attribute 'recv' @@ -573,25 +572,25 @@ def recv_message(control_file): status_code = stem.util.str_tools._to_unicode(status_code) divider = stem.util.str_tools._to_unicode(divider) + # Most controller responses are single lines, in which case we don't need + # some overhead. + + if first_line: + if divider == ' ': + _log_trace(line) + return stem.response.ControlMessage([(status_code, divider, content)], line) + else: + parsed_content, raw_content, first_line = [], io.BytesIO(), False + + raw_content.write(line) + if divider == '-': # mid-reply line, keep pulling for more content parsed_content.append((status_code, divider, content)) elif divider == ' ': # end of the message, return the message parsed_content.append((status_code, divider, content)) - - if log.is_tracing(): - log_message = stem.util.str_tools._to_unicode(raw_content.getvalue().replace(b'\r\n', b'\n').rstrip()) - log_message_lines = log_message.split('\n') - - if TRUNCATE_LOGS and len(log_message_lines) > TRUNCATE_LOGS: - log_message = '\n'.join(log_message_lines[:TRUNCATE_LOGS] + ['... %i more lines...' % (len(log_message_lines) - TRUNCATE_LOGS)]) - - if len(log_message_lines) > 2: - log.trace('Received from tor:\n%s' % log_message) - else: - log.trace('Received from tor: %s' % log_message.replace('\n', '\\n')) - + _log_trace(raw_content.getvalue()) return stem.response.ControlMessage(parsed_content, raw_content.getvalue()) elif divider == '+': # data entry, all of the following lines belong to the content until we @@ -663,3 +662,19 @@ def send_formatting(message): return '+%s\r\n.\r\n' % message.replace('\n', '\r\n') else: return message + '\r\n' + + +def _log_trace(response): + if not log.is_tracing(): + return + + log_message = stem.util.str_tools._to_unicode(response.replace(b'\r\n', b'\n').rstrip()) + log_message_lines = log_message.split('\n') + + if TRUNCATE_LOGS and len(log_message_lines) > TRUNCATE_LOGS: + log_message = '\n'.join(log_message_lines[:TRUNCATE_LOGS] + ['... %i more lines...' % (len(log_message_lines) - TRUNCATE_LOGS)]) + + if len(log_message_lines) > 2: + log.trace('Received from tor:\n%s' % log_message) + else: + log.trace('Received from tor: %s' % log_message.replace('\n', '\\n'))

1 0