October 2020 - tor-commits - lists.torproject.org

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 07 Oct '20

07 Oct '20

commit a18ecf8bb32361cf361a9a16e28090dd8aec29cb Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 7 18:46:44 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- nl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl.po b/nl.po index 7d850d3a6b..c73121c1f4 100644 --- a/nl.po +++ b/nl.po @@ -37,7 +37,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-10-06 07:46+0200\n" -"PO-Revision-Date: 2020-10-07 18:16+0000\n" +"PO-Revision-Date: 2020-10-07 18:29+0000\n" "Last-Translator: Tonnes <tonnes.mb(a)gmail.com>\n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 07 Oct '20

07 Oct '20

commit 7f2ba98a3e7a0fbdc2a6552117d1ed2510e061b5 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 7 18:46:04 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- nl.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nl.po b/nl.po index 2020a7adc4..2509b0bf74 100644 --- a/nl.po +++ b/nl.po @@ -37,7 +37,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-10-06 07:46+0200\n" -"PO-Revision-Date: 2020-10-07 18:15+0000\n" +"PO-Revision-Date: 2020-10-07 18:29+0000\n" "Last-Translator: Tonnes <tonnes.mb(a)gmail.com>\n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n" @@ -599,7 +599,7 @@ msgstr "Bestandssysteem niet ondersteund: %s" #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/creator.py:726 #, python-format msgid "Unknown GLib exception while trying to mount device: %(message)s" -msgstr "Onbekende GLib uitzondering bij het mounten van apparaat: %(message)s" +msgstr "Onbekende GLib-uitzondering tijdens koppelen van apparaat: %(message)s" #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/creator.py:731 #, python-format @@ -608,7 +608,7 @@ msgstr "Kan apparaat niet koppelen: %(message)s" #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/creator.py:736 msgid "No mount points found" -msgstr "Geen aankoppelpunten gevonden" +msgstr "Geen koppelpunten gevonden" #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/creator.py:747 #, python-format @@ -623,7 +623,7 @@ msgstr "Gekoppelde bestandssystemen op '%(device)s' ontkoppelen" #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/creator.py:761 #, python-format msgid "Unmounting '%(udi)s' on '%(device)s'" -msgstr "'%(udi)s' op '%(device)s' afkoppelen" +msgstr "'%(udi)s' op '%(device)s' ontkoppelen" #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/creator.py:772 #, python-format @@ -633,7 +633,7 @@ msgstr "Koppeling %s bestaat na ontkoppeling" #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/creator.py:785 #, python-format msgid "Partitioning device %(device)s" -msgstr "Partitioneren van apparaat %(device)s" +msgstr "Apparaat %(device)s partitioneren" #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/creator.py:914 #, python-format @@ -762,7 +762,7 @@ msgstr "https://tails.boum.org/install/" #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/gui.py:391 #, python-format msgid "%(size)s %(vendor)s %(model)s device (%(device)s)" -msgstr "%(size)s%(vendor)s%(model)s toestel(%(device)s)" +msgstr "%(size)s %(vendor)s %(model)s apparaat (%(device)s)" #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/gui.py:403 msgid "No ISO image selected" @@ -1940,7 +1940,7 @@ msgstr "Uw bericht is verstuurd." #: config/chroot_local-includes/usr/lib/python3/dist-packages/whisperBack/gui.py:233 msgid "An error occured during encryption." -msgstr "Er is een fout opgetreden tijdens het versleutelen" +msgstr "Er is een fout opgetreden tijdens de versleuteling." #: config/chroot_local-includes/usr/lib/python3/dist-packages/whisperBack/gui.py:253 #, python-format @@ -2289,7 +2289,7 @@ msgstr "Doel-USB-stick:" #: ../config/chroot_local-includes/usr/share/tails-installer/tails-installer.ui.in:341 msgid "Reinstall (delete all data)" -msgstr "Herinstalleren (Alle gegevens verwijderen)" +msgstr "Herinstalleren (alle gegevens verwijderen)" #: ../config/chroot_local-includes/usr/share/whisperback/whisperback.ui.in:11 msgid "Copyright © 2009-2018 tails(a)boum.org"

1 0

[translation/mat-gui] https://gitweb.torproject.org/translation.git/commit/?h=mat-gui
by translation＠torproject.org 07 Oct '20

07 Oct '20

commit c3ac758e8addfa27c07bc3ce62ccdc118fd2855e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 7 18:45:45 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=mat-gui --- nl.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nl.po b/nl.po index 397c985674..5c801082cd 100644 --- a/nl.po +++ b/nl.po @@ -7,14 +7,14 @@ # Nathan Follens, 2015 # Shondoit Walker <shondoit(a)gmail.com>, 2013 # Sinkmurderer <syncsnap(a)gmail.com>, 2013 -# Tonnes <tonnes.mb(a)gmail.com>, 2019 +# Tonnes <tonnes.mb(a)gmail.com>, 2019-2020 # Volluta <volluta(a)tutanota.com>, 2015-2016 msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2019-10-25 12:22+0000\n" +"PO-Revision-Date: 2020-10-07 18:31+0000\n" "Last-Translator: Tonnes <tonnes.mb(a)gmail.com>\n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n" @@ -95,7 +95,7 @@ msgstr "Niet ondersteund" #: mat-gui:339 msgid "Harmless fileformat" -msgstr "Onschadelijk bestandsformaat" +msgstr "Onschadelijke bestandsindeling" #: mat-gui:341 msgid "Cant read file" @@ -103,7 +103,7 @@ msgstr "Kan bestand niet lezen" #: mat-gui:343 msgid "Fileformat not supported" -msgstr "Bestandsformaat niet ondersteund" +msgstr "Bestandsindeling niet ondersteund" #: mat-gui:346 msgid "These files can not be processed:" @@ -190,4 +190,4 @@ msgstr "Overgebleven" #: data/mat.glade:518 msgid "Fileformat" -msgstr "Bestandsformaat" +msgstr "Bestandsindeling"

1 0

[translation/liveusb-creator] https://gitweb.torproject.org/translation.git/commit/?h=liveusb-creator
by translation＠torproject.org 07 Oct '20

07 Oct '20

commit edf349fc3ac42d3da32c8b2b12bd00c6aa52cd15 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 7 18:45:26 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=liveusb-creator --- nl/nl.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nl/nl.po b/nl/nl.po index 3322eb9620..6dbb39bd9f 100644 --- a/nl/nl.po +++ b/nl/nl.po @@ -27,7 +27,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-09-07 13:54+0200\n" -"PO-Revision-Date: 2020-10-07 18:04+0000\n" +"PO-Revision-Date: 2020-10-07 18:25+0000\n" "Last-Translator: Tonnes <tonnes.mb(a)gmail.com>\n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n" @@ -139,16 +139,16 @@ msgstr "Bestandssysteem niet ondersteund: %s" #: ../tails_installer/creator.py:807 #, python-format msgid "Unknown GLib exception while trying to mount device: %(message)s" -msgstr "Onbekende GLib uitzondering bij het mounten van apparaat: %(message)s" +msgstr "Onbekende GLib-uitzondering tijdens koppelen van apparaat: %(message)s" #: ../tails_installer/creator.py:812 #, python-format msgid "Unable to mount device: %(message)s" -msgstr "Kan apparaat niet aankoppelen: %(message)s" +msgstr "Kan apparaat niet koppelen: %(message)s" #: ../tails_installer/creator.py:817 msgid "No mount points found" -msgstr "Geen aankoppelpunten gevonden" +msgstr "Geen koppelpunten gevonden" #: ../tails_installer/creator.py:828 #, python-format @@ -163,12 +163,12 @@ msgstr "Aangekoppeld bestandssysteem op '%(device)s' afkoppelen" #: ../tails_installer/creator.py:842 #, python-format msgid "Unmounting '%(udi)s' on '%(device)s'" -msgstr "'%(udi)s' op '%(device)s' afkoppelen" +msgstr "'%(udi)s' op '%(device)s' ontkoppelen" #: ../tails_installer/creator.py:853 #, python-format msgid "Mount %s exists after unmounting" -msgstr "Aankoppeling %s bestaat na afkoppeling" +msgstr "Koppeling %s bestaat na ontkoppeling" #: ../tails_installer/creator.py:866 #, python-format

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 07 Oct '20

07 Oct '20

commit 9a57b60eebf4b3f54e129b44c1c9fd4f477fa2d8 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 7 18:16:48 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- nl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl.po b/nl.po index f537cd002b..7d850d3a6b 100644 --- a/nl.po +++ b/nl.po @@ -37,7 +37,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-10-06 07:46+0200\n" -"PO-Revision-Date: 2020-10-07 17:42+0000\n" +"PO-Revision-Date: 2020-10-07 18:16+0000\n" "Last-Translator: Tonnes <tonnes.mb(a)gmail.com>\n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 07 Oct '20

07 Oct '20

commit 3c6d4c139f95d247cb4079c2ced2a20b54cc3ab0 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 7 18:16:08 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- nl.po | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/nl.po b/nl.po index bf80ad78f6..2020a7adc4 100644 --- a/nl.po +++ b/nl.po @@ -37,7 +37,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-10-06 07:46+0200\n" -"PO-Revision-Date: 2020-10-07 17:42+0000\n" +"PO-Revision-Date: 2020-10-07 18:15+0000\n" "Last-Translator: Tonnes <tonnes.mb(a)gmail.com>\n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n" @@ -583,7 +583,7 @@ msgstr "Kan niet schrijven naar %(device)s; wordt overgeslagen." msgid "" "Some partitions of the target device %(device)s are mounted. They will be " "unmounted before starting the installation process." -msgstr "Sommige partities van het doelapparaat %(device)s zijn gekoppeld. Ze zullen ontkoppeld worden voordat het installatieproces wordt gestart." +msgstr "Sommige partities van het doelapparaat %(device)s zijn gekoppeld. Deze worden ontkoppeld voordat het installatieproces wordt gestart." #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/creator.py:705 #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/creator.py:929 @@ -604,7 +604,7 @@ msgstr "Onbekende GLib uitzondering bij het mounten van apparaat: %(message)s" #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/creator.py:731 #, python-format msgid "Unable to mount device: %(message)s" -msgstr "Kan apparaat niet aankoppelen: %(message)s" +msgstr "Kan apparaat niet koppelen: %(message)s" #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/creator.py:736 msgid "No mount points found" @@ -618,7 +618,7 @@ msgstr "Unmount_device voor '%(device)s' binnengaan" #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/creator.py:757 #, python-format msgid "Unmounting mounted filesystems on '%(device)s'" -msgstr "Aangekoppeld bestandssysteem op '%(device)s' afkoppelen" +msgstr "Gekoppelde bestandssystemen op '%(device)s' ontkoppelen" #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/creator.py:761 #, python-format @@ -628,7 +628,7 @@ msgstr "'%(udi)s' op '%(device)s' afkoppelen" #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/creator.py:772 #, python-format msgid "Mount %s exists after unmounting" -msgstr "Aankoppeling %s bestaat na afkoppeling" +msgstr "Koppeling %s bestaat na ontkoppeling" #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/creator.py:785 #, python-format @@ -638,7 +638,7 @@ msgstr "Partitioneren van apparaat %(device)s" #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/creator.py:914 #, python-format msgid "Unsupported device '%(device)s', please report a bug." -msgstr "Niet-ondersteund apparaat '%(device)s', rapporteer alstublieft een bug." +msgstr "Niet-ondersteund apparaat '%(device)s', meld een bug." #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/creator.py:917 msgid "Trying to continue anyway." @@ -694,7 +694,7 @@ msgstr "Master Boot Record van %s opnieuw instellen" #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/creator.py:1170 msgid "Drive is a loopback, skipping MBR reset" -msgstr "Station is een loopback, MBR-reset wordt overgeslagen" +msgstr "Station is een loopback, MBR-herinitialisatie wordt overgeslagen" #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/creator.py:1174 msgid "Synchronizing data on disk..." @@ -877,7 +877,7 @@ msgid "" "There was a problem executing `%s`.\n" "%s\n" "%s" -msgstr "Er was een probleem bij het uitvoeren van ` %s`.\n%s\n%s" +msgstr "Er was een probleem bij het uitvoeren van '%s'.\n%s\n%s" #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/source.py:57 #, python-format @@ -887,7 +887,7 @@ msgstr "'%s' bestaat niet" #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/source.py:59 #, python-format msgid "'%s' is not a directory" -msgstr "%s is geen directory" +msgstr "'%s' is geen map" #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/source.py:69 #, python-format @@ -899,7 +899,7 @@ msgstr "'%(filename)s' wordt overgeslagen" msgid "" "There was a problem executing `%s`.%s\n" "%s" -msgstr "Er was een probleem bij het uitvoeren van ` %s`.%s\n%s" +msgstr "Er was een probleem bij het uitvoeren van '%s'.%s\n%s" #: config/chroot_local-includes/usr/lib/python2.7/dist-packages/tails_installer/utils.py:130 msgid "Could not open device for writing." @@ -1965,7 +1965,7 @@ msgstr "WhisperBack" #: config/chroot_local-includes/usr/lib/python3/dist-packages/whisperBack/gui.py:339 #: ../config/chroot_local-includes/usr/share/whisperback/whisperback.ui.in:12 msgid "Send feedback in an encrypted mail." -msgstr "Stuur terugkoppeling in een versleutelde mail." +msgstr "Feedback versturen via versleutelde e-mail." #: config/chroot_local-includes/usr/lib/python3/dist-packages/whisperBack/gui.py:342 msgid "Copyright © 2009-2018 Tails developers (tails(a)boum.org)"

1 0

[translation/liveusb-creator] https://gitweb.torproject.org/translation.git/commit/?h=liveusb-creator
by translation＠torproject.org 07 Oct '20

07 Oct '20

commit e0c9bd3e20856910e7ce0ce850e431da169b6e59 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 7 18:15:27 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=liveusb-creator --- nl/nl.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nl/nl.po b/nl/nl.po index a3dcda72cb..3322eb9620 100644 --- a/nl/nl.po +++ b/nl/nl.po @@ -10,24 +10,24 @@ # Geert Warrink <geert.warrink(a)onsnet.nu>, 2009-2010 # Cleveridge <erwin.de.laat(a)cleveridge.org>, 2014 # Joren Vandeweyer <jorenvandeweyer(a)gmail.com>, 2017 -# Meteor 0id, 2019 -# Meteor 0id, 2019 +# Meteor0id, 2019 +# Meteor0id, 2019 # Richard E. van der Luit <nippur(a)fedoraproject.org>, 2012 # Shondoit Walker <shondoit(a)gmail.com>, 2013 # Thinkwell, 2018 # Thomas van Voorst <thomasv.voorst(a)hotmail.com>, 2017 # Tjeerd <transifex(a)syrion.net>, 2013 # Tonko Mulder <tonko(a)tonkomulder.nl>, 2015 -# Tonnes <tonnes.mb(a)gmail.com>, 2019 -# Lazlo, 2013 +# Tonnes <tonnes.mb(a)gmail.com>, 2019-2020 +# ac050dc9bb51e8e38039c78a71610a08_9804937, 2013 # Volluta <volluta(a)tutanota.com>, 2015 # BBLN <webmaster(a)bbln.nl>, 2014 msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-21 09:03+0200\n" -"PO-Revision-Date: 2019-11-29 08:48+0000\n" +"POT-Creation-Date: 2020-09-07 13:54+0200\n" +"PO-Revision-Date: 2020-10-07 18:04+0000\n" "Last-Translator: Tonnes <tonnes.mb(a)gmail.com>\n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n" @@ -125,7 +125,7 @@ msgstr "Kan niet schrijven naar %(device)s; wordt overgeslagen." msgid "" "Some partitions of the target device %(device)s are mounted. They will be " "unmounted before starting the installation process." -msgstr "Sommige partities van het doelapparaat %(device)s zijn gekoppeld. Ze zullen ontkoppeld worden voordat het installatieproces wordt gestart." +msgstr "Sommige partities van het doelapparaat %(device)s zijn gekoppeld. Deze worden ontkoppeld voordat het installatieproces wordt gestart." #: ../tails_installer/creator.py:786 ../tails_installer/creator.py:1010 msgid "Unknown filesystem. Your device may need to be reformatted." @@ -242,7 +242,7 @@ msgstr "Master Boot Record van %s opnieuw instellen" #: ../tails_installer/creator.py:1325 msgid "Drive is a loopback, skipping MBR reset" -msgstr "Station is een loopback, MBR-reset wordt overgeslagen" +msgstr "Station is een loopback, MBR-herinitialisatie wordt overgeslagen" #: ../tails_installer/creator.py:1329 ../tails_installer/creator.py:1589 #, python-format

1 0

[translation/torbutton-torbuttonproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties
by translation＠torproject.org 07 Oct '20

07 Oct '20

commit 48ad46a9f7ff86cd5971ab39e0ecdba19b83b79e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 7 17:47:23 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- nl/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl/torbutton.properties b/nl/torbutton.properties index a037f2d0c5..289200be9e 100644 --- a/nl/torbutton.properties +++ b/nl/torbutton.properties @@ -49,7 +49,7 @@ canvas.neverAccessKey=o profileProblemTitle=%S-profielprobleem profileReadOnly=U kunt %S niet vanaf een alleen-lezen-bestandssysteem uitvoeren. Kopieer %S naar een andere locatie voordat u het probeert te gebruiken. profileReadOnlyMac=U kunt %S niet vanaf een alleen-lezen-bestandssysteem uitvoeren. Kopieer %S naar uw map Bureaublad of Programma’s voordat u het probeert te gebruiken. -profileAccessDenied=%S heeft geen rechten voor toegang tot het profiel. Pas de bestandssysteemmachtigingen aan en probeer het opnieuw. +profileAccessDenied=%S heeft geen rechten voor toegang tot het profiel. Pas uw rechten van het bestandssysteem aan en probeer het opnieuw. profileMigrationFailed=Migratie van uw bestaande %S-profiel is mislukt.\nEr worden nieuwe instellingen gebruikt. # "Downloading update" string for the hamburger menu (see #28885).

1 0

[tor/master] Remove long-obsolete members from the state file.
by asn＠torproject.org 07 Oct '20

07 Oct '20

commit c4812698c3df0bd8aa51c615b0274bbb53b9eb6c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 23 14:08:24 2020 -0400 Remove long-obsolete members from the state file. Tor has a feature to preserve unrecognized state file entries in order to maintain forward compatibility. But this feature, along with some unused code that we never actually removed, led to us keeping items that were of no use to the user, other than at worst to preserve ancient information about them. This commit adds a feature to remove obsolete entries when we load the file. Closes ticket 40137. --- changes/ticket40137 | 6 ++++ src/app/config/or_state_st.h | 8 +---- src/app/config/statefile.c | 77 ++++++++++++++++++++++++++++++++++---------- src/app/config/statefile.h | 1 + src/test/include.am | 1 + src/test/test.c | 1 + src/test/test.h | 1 + src/test/test_statefile.c | 56 ++++++++++++++++++++++++++++++++ 8 files changed, 127 insertions(+), 24 deletions(-) diff --git a/changes/ticket40137 b/changes/ticket40137 new file mode 100644 index 0000000000..056f1bc4a5 --- /dev/null +++ b/changes/ticket40137 @@ -0,0 +1,6 @@ + o Minor features (state): + - When loading the state file, remove entries from the statefile that + have been obsolete for a long time. Ordinarily Tor preserves + unrecognized entries in order to keep forward-compatibility, but + these statefile entries have not actually been used in any release + since before the 0.3.5.x. Closes ticket 40137. diff --git a/src/app/config/or_state_st.h b/src/app/config/or_state_st.h index 31b7f8a983..6769ef7b87 100644 --- a/src/app/config/or_state_st.h +++ b/src/app/config/or_state_st.h @@ -38,17 +38,11 @@ struct or_state_t { uint64_t AccountingBytesAtSoftLimit; uint64_t AccountingExpectedUsage; - /** A list of Entry Guard-related configuration lines. (pre-prop271) */ - struct config_line_t *EntryGuards; - - /** A list of guard-related configuration lines. (post-prop271) */ + /** A list of guard-related configuration lines. */ struct config_line_t *Guard; struct config_line_t *TransportProxies; - /** Cached revision counters for active hidden services on this host */ - struct config_line_t *HidServRevCounter; - /** These fields hold information on the history of bandwidth usage for * servers. The "Ends" fields hold the time when we last updated the * bandwidth usage. The "Interval" fields hold the granularity, in seconds, diff --git a/src/app/config/statefile.c b/src/app/config/statefile.c index b25167d2ec..22b15fcf24 100644 --- a/src/app/config/statefile.c +++ b/src/app/config/statefile.c @@ -58,16 +58,38 @@ /** A list of state-file "abbreviations," for compatibility. */ static config_abbrev_t state_abbrevs_[] = { - { "AccountingBytesReadInterval", "AccountingBytesReadInInterval", 0, 0 }, - { "HelperNode", "EntryGuard", 0, 0 }, - { "HelperNodeDownSince", "EntryGuardDownSince", 0, 0 }, - { "HelperNodeUnlistedSince", "EntryGuardUnlistedSince", 0, 0 }, - { "EntryNode", "EntryGuard", 0, 0 }, - { "EntryNodeDownSince", "EntryGuardDownSince", 0, 0 }, - { "EntryNodeUnlistedSince", "EntryGuardUnlistedSince", 0, 0 }, { NULL, NULL, 0, 0}, }; +/** A list of obsolete keys that we do not and should not preserve. + * + * We could just let these live in ExtraLines indefinitely, but they're + * never going to be used again, and every version that used them + * has been obsolete for a long time. + * */ +static const char *obsolete_state_keys[] = { + /* These were renamed in 0.1.1.11-alpha */ + "AccountingBytesReadInterval", + "HelperNode", + "HelperNodeDownSince", + "HelperNodeUnlistedSince", + "EntryNode", + "HelperNodeDownSince", + "EntryNodeUnlistedSince", + /* These were replaced by "Guard" in 0.3.0.1-alpha. */ + "EntryGuard", + "EntryGuardDownSince", + "EntryGuardUnlistedSince", + "EntryGuardAddedBy", + "EntryGuardPathBias", + "EntryGuardPathUseBias", + /* This was replaced by OPE-based revision numbers in 0.3.5.1-alpha, + * and was never actually used in a released version. */ + "HidServRevCounter", + + NULL, +}; + /** dummy instance of or_state_t, used for type-checking its * members with CONF_CHECK_VAR_TYPE. */ DUMMY_TYPECHECK_INSTANCE(or_state_t); @@ -91,19 +113,9 @@ static const config_var_t state_vars_[] = { V(AccountingSoftLimitHitAt, ISOTIME, NULL), V(AccountingBytesAtSoftLimit, MEMUNIT, NULL), - VAR("EntryGuard", LINELIST_S, EntryGuards, NULL), - VAR("EntryGuardDownSince", LINELIST_S, EntryGuards, NULL), - VAR("EntryGuardUnlistedSince", LINELIST_S, EntryGuards, NULL), - VAR("EntryGuardAddedBy", LINELIST_S, EntryGuards, NULL), - VAR("EntryGuardPathBias", LINELIST_S, EntryGuards, NULL), - VAR("EntryGuardPathUseBias", LINELIST_S, EntryGuards, NULL), - V(EntryGuards, LINELIST_V, NULL), - VAR("TransportProxy", LINELIST_S, TransportProxies, NULL), V(TransportProxies, LINELIST_V, NULL), - V(HidServRevCounter, LINELIST, NULL), - V(BWHistoryReadEnds, ISOTIME, NULL), V(BWHistoryReadInterval, POSINT, "900"), V(BWHistoryReadValues, CSV, ""), @@ -475,6 +487,7 @@ or_state_load(void) } else { log_info(LD_GENERAL, "Initialized state"); } + or_state_remove_obsolete_lines(&new_state->ExtraLines); if (or_state_set(new_state) == -1) { or_state_save_broken(fname); } @@ -494,6 +507,36 @@ or_state_load(void) return r; } +/** Remove from `extra_lines` every element whose key appears in + * `obsolete_state_keys`. */ +STATIC void +or_state_remove_obsolete_lines(config_line_t **extra_lines) +{ + /* make a strmap for the obsolete state names, so we can have O(1) + lookup. */ + strmap_t *bad_keys = strmap_new(); + for (unsigned i = 0; obsolete_state_keys[i] != NULL; ++i) { + strmap_set_lc(bad_keys, obsolete_state_keys[i], (void*)"rmv"); + } + + config_line_t **line = extra_lines; + while (*line) { + if (strmap_get_lc(bad_keys, (*line)->key) != NULL) { + /* This key is obsolete; remove it. */ + config_line_t *victim = *line; + *line = (*line)->next; + + victim->next = NULL; // prevent double-free. + config_free_lines(victim); + } else { + /* This is just an unrecognized key; keep it. */ + line = &(*line)->next; + } + } + + strmap_free(bad_keys, NULL); +} + /** Did the last time we tried to write the state file fail? If so, we * should consider disabling such features as preemptive circuit generation * to compute circuit-build-time. */ diff --git a/src/app/config/statefile.h b/src/app/config/statefile.h index 98d9d2dda1..89b10560f3 100644 --- a/src/app/config/statefile.h +++ b/src/app/config/statefile.h @@ -33,6 +33,7 @@ STATIC void or_state_free_(or_state_t *state); STATIC or_state_t *or_state_new(void); struct config_mgr_t; STATIC const struct config_mgr_t *get_state_mgr(void); +STATIC void or_state_remove_obsolete_lines(struct config_line_t **extra_lines); #endif /* defined(STATEFILE_PRIVATE) */ #endif /* !defined(TOR_STATEFILE_H) */ diff --git a/src/test/include.am b/src/test/include.am index 215e423834..173f007fbf 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -235,6 +235,7 @@ src_test_test_SOURCES += \ src/test/test_sendme.c \ src/test/test_shared_random.c \ src/test/test_socks.c \ + src/test/test_statefile.c \ src/test/test_stats.c \ src/test/test_status.c \ src/test/test_storagedir.c \ diff --git a/src/test/test.c b/src/test/test.c index 38c8206eea..77aa6db975 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -770,6 +770,7 @@ struct testgroup_t testgroups[] = { { "sendme/", sendme_tests }, { "shared-random/", sr_tests }, { "socks/", socks_tests }, + { "statefile/", statefile_tests }, { "stats/", stats_tests }, { "status/" , status_tests }, { "storagedir/", storagedir_tests }, diff --git a/src/test/test.h b/src/test/test.h index 71066db48e..bd3a4102f5 100644 --- a/src/test/test.h +++ b/src/test/test.h @@ -187,6 +187,7 @@ extern struct testcase_t scheduler_tests[]; extern struct testcase_t sendme_tests[]; extern struct testcase_t socks_tests[]; extern struct testcase_t sr_tests[]; +extern struct testcase_t statefile_tests[]; extern struct testcase_t stats_tests[]; extern struct testcase_t status_tests[]; extern struct testcase_t storagedir_tests[]; diff --git a/src/test/test_statefile.c b/src/test/test_statefile.c new file mode 100644 index 0000000000..dc9ecfee3e --- /dev/null +++ b/src/test/test_statefile.c @@ -0,0 +1,56 @@ +/* Copyright (c) 2001-2004, Roger Dingledine. + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2020, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#include "orconfig.h" + +#define STATEFILE_PRIVATE + +#include "core/or/or.h" +#include "lib/encoding/confline.h" +#include "app/config/statefile.h" + +#include "test/test.h" + +static void +test_statefile_remove_obsolete(void *arg) +{ + (void)arg; + config_line_t *inp = NULL; + /* try empty config */ + or_state_remove_obsolete_lines(&inp); + tt_assert(!inp); + + /* try removing every line */ + config_line_append(&inp, "EntryGuard", "doesn't matter"); + config_line_append(&inp, "HidServRevCounter", "ignore"); + config_line_append(&inp, "hidservrevcounter", "foobar"); // note case + or_state_remove_obsolete_lines(&inp); + tt_assert(!inp); + + /* Now try removing a subset of lines. */ + config_line_append(&inp, "EntryGuard", "doesn't matter"); + config_line_append(&inp, "Guard", "in use"); + config_line_append(&inp, "HidServRevCounter", "ignore"); + config_line_append(&inp, "TorVersion", "this test doesn't care"); + or_state_remove_obsolete_lines(&inp); + tt_assert(inp); + tt_str_op(inp->key, OP_EQ, "Guard"); + tt_str_op(inp->value, OP_EQ, "in use"); + tt_assert(inp->next); + tt_str_op(inp->next->key, OP_EQ, "TorVersion"); + tt_str_op(inp->next->value, OP_EQ, "this test doesn't care"); + tt_assert(! inp->next->next); + + done: + config_free_lines(inp); +} + +#define T(name) \ + { #name, test_statefile_##name, 0, NULL, NULL } + +struct testcase_t statefile_tests[] = { + T(remove_obsolete), + END_OF_TESTCASES +};

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 07 Oct '20

07 Oct '20

commit c428977c097060008d9f3c237c69f71863894d31 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 7 17:46:37 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- nl.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nl.po b/nl.po index 4eb17bde88..f537cd002b 100644 --- a/nl.po +++ b/nl.po @@ -37,8 +37,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-10-06 07:46+0200\n" -"PO-Revision-Date: 2020-10-06 12:13+0000\n" -"Last-Translator: bacovane <bart-ts(a)tushmail.com>\n" +"PO-Revision-Date: 2020-10-07 17:42+0000\n" +"Last-Translator: Tonnes <tonnes.mb(a)gmail.com>\n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0