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

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

17 Jan '17

commit b8f65d82b278c6a163f4ad15e09382080ad949f0 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 17 15:15:35 2017 +0000 Update translations for liveusb-creator --- da/da.po | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/da/da.po b/da/da.po index d958885..6cdad54 100644 --- a/da/da.po +++ b/da/da.po @@ -13,14 +13,15 @@ # mort3n <nalholm(a)yahoo.dk>, 2013 # Niels Nielsen Horn <Niels(a)codingpirates.dk>, 2015 # Per Hansen <per(a)kofod-hansen.com>, 2014 +# scootergrisen, 2017 # Tommy Gade, 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-02 21:23+0100\n" -"PO-Revision-Date: 2016-03-21 16:31+0000\n" -"Last-Translator: Tommy Gade\n" +"PO-Revision-Date: 2017-01-17 14:54+0000\n" +"Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -188,11 +189,11 @@ msgstr "Fejl: Kunne ikke sætte etiket eller finde enhedens UUID. Kan ikke fort msgid "" "Error: The SHA1 of your Live CD is invalid. You can run this program with " "the --noverify argument to bypass this verification check." -msgstr "Fejl: SHA1'et på din live-cd er ugyldig. Du kan køre dette program med \"--noverify\"-argumentet for at springe over denne verificeringskontrol." +msgstr "Fejl: SHA1'et på din live-cd er ugyldig. Du kan køre dette program med \"--noverify\"-argumentet for at springe over denne verificeringskontrol." #: ../liveusb/creator.py:155 msgid "Extracting live image to the target device..." -msgstr " Udpakker det direkte foto til den valgte enhed..." +msgstr "Udpakker det direkte foto til den valgte enhed..." #: ../liveusb/creator.py:1140 #, python-format @@ -234,7 +235,7 @@ msgstr "Installation færdig! (%s)" #: ../liveusb/gui.py:646 msgid "Installation was completed. Press OK to close this program." -msgstr "Installation er færdig. Tryk O.k. for at lukke dette program." +msgstr "Installation er færdig. Tryk OK for at lukke dette program." #: ../liveusb/creator.py:990 ../liveusb/creator.py:1313 msgid "Installing bootloader..." @@ -246,7 +247,7 @@ msgid "" "It is impossible to upgrade the device %(pretty_name)s because it was not " "created using Tails Installer. You should instead use %(action)s to upgrade " "Tails on this device." -msgstr "Det er ikke muligt at opdatere enheden %(pretty_name)s fordi den ikke er oprettet med Tails Installer. Anvend istedet %(action)s til at opgradere Tails på denne enhed." +msgstr "Det er ikke muligt at opdatere enheden %(pretty_name)s fordi den ikke er oprettet med Tails Installer. Anvend istedet %(action)s til at opgradere Tails på denne enhed." #: ../liveusb/gui.py:270 msgid "LiveUSB creation failed!" @@ -349,7 +350,7 @@ msgstr "Nogle partitioner på den valgte enhed %(device)s er i brug. De vil alle #: ../liveusb/creator.py:141 msgid "" "Source type does not support verification of ISO MD5 checksum, skipping" -msgstr "Kildetype understøtter ikke verificering af iSO MD5-kontrolsum, udelader" +msgstr "Kildetype understøtter ikke verificering af ISO MD5-kontrolsum, udelader" #: ../liveusb/creator.py:1220 msgid "Synchronizing data on disk..." @@ -377,7 +378,7 @@ msgstr "Den valgte fil er ikke læsbar. Du kan enten ændre filtilladelserne ell msgid "" "There was a problem executing the following command: `%(command)s`.\n" "A more detailed error log has been written to '%(filename)s'." -msgstr "Der opstod et problem under kørsel af følgende kommando: \"%(command)s\"\nEn mere detaljeret fejllog er blevet skrevet til \"%(filename)s\"" +msgstr "Der opstod et problem under kørsel af følgende kommando: \"%(command)s\".\nEn mere detaljeret fejllog er blevet skrevet til \"%(filename)s\"." #: ../liveusb/dialog.py:158 msgid "" @@ -439,7 +440,7 @@ msgstr "Kunne ikke finde et USB-drev" #: ../liveusb/creator.py:1274 msgid "Unable to find any supported device" -msgstr "Kunne ikke finde nogen understøttede enheder." +msgstr "Kunne ikke finde nogen understøttede enheder" #: ../liveusb/creator.py:1117 msgid "Unable to find partition"

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 17 Jan '17

17 Jan '17

commit c2d0d7b246b2b711ab3598b579d18ef5e8e289b0 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 17 15:15:23 2017 +0000 Update translations for whisperback_completed --- da/da.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/da/da.po b/da/da.po index 7923efd..bd52c40 100644 --- a/da/da.po +++ b/da/da.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-12-16 19:54+0100\n" -"PO-Revision-Date: 2017-01-17 14:10+0000\n" +"PO-Revision-Date: 2017-01-17 15:01+0000\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" @@ -24,7 +24,7 @@ msgstr "" #: ../whisperBack/whisperback.py:56 #, python-format msgid "Invalid contact email: %s" -msgstr "Ugyldig kontakt email: %s" +msgstr "Ugyldig kontakt e-mail: %s" #: ../whisperBack/whisperback.py:73 #, python-format @@ -61,7 +61,7 @@ msgstr "Dette kommer muligvis til at tage et stykke tid..." #: ../whisperBack/gui.py:232 msgid "The contact email adress doesn't seem valid." -msgstr "Deres email adresse er ikke valid." +msgstr "Deres e-mail adresse er ikke valid." #: ../whisperBack/gui.py:249 msgid "Unable to send the mail: SMTP error." @@ -105,7 +105,7 @@ msgid "" "As a work-around you can save the bug report as a file on a USB drive and try to send it to us at %s from your email account using another system. Note that your bug report will not be anonymous when doing so unless you take further steps yourself (e.g. using Tor with a throw-away email account).\n" "\n" "Do you want to save the bug report to a file?" -msgstr "Fejl rapporten kunne ikke sendes, sandsynligvis på grund af netværks problemer.\n\nSom en løsning kan De gemme fejl rapporten på en USB nøgle og forsøge at sende den til os på %s fra Deres email konto via et andet system. Noter venligst at Deres fejl rapport ikke længere er anonym på denne måde, med mindre de selv tager andre metoder i brug (f.eks. bruger Tor med en \"throw-away\" email konto).\n\nVil De gemme fejl rapporten til en fil?" +msgstr "Fejl rapporten kunne ikke sendes, sandsynligvis på grund af netværks problemer.\n\nSom en løsning kan De gemme fejl rapporten på en USB nøgle og forsøge at sende den til os på %s fra Deres e-mail konto via et andet system. Noter venligst at Deres fejl rapport ikke længere er anonym på denne måde, med mindre de selv tager andre metoder i brug (f.eks. bruger Tor med en \"throw-away\" email konto).\n\nVil De gemme fejl rapporten til en fil?" #: ../whisperBack/gui.py:379 ../data/whisperback.ui.h:21 msgid "WhisperBack" @@ -174,7 +174,7 @@ msgstr "Fejl beskrivelse" #: ../data/whisperback.ui.h:24 msgid "Optional email address to contact you" -msgstr "Valgfri email adresse til at kontakte Dem" +msgstr "Valgfri e-mail adresse til at kontakte Dem" #: ../data/whisperback.ui.h:25 msgid "optional PGP key" @@ -186,11 +186,11 @@ msgstr "Tekniske detaljer til at inkludere" #: ../data/whisperback.ui.h:27 msgid "headers" -msgstr "headers" +msgstr "headere" #: ../data/whisperback.ui.h:28 msgid "debugging info" -msgstr "Fejlretnings info" +msgstr "fejlretningsinfo" #: ../data/whisperback.ui.h:29 msgid "Help"

1 0

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

17 Jan '17

commit a6c402a405d4a5e38c0d83017e60af964a7e5875 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 17 15:15:17 2017 +0000 Update translations for whisperback --- da/da.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/da/da.po b/da/da.po index 7923efd..bd52c40 100644 --- a/da/da.po +++ b/da/da.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-12-16 19:54+0100\n" -"PO-Revision-Date: 2017-01-17 14:10+0000\n" +"PO-Revision-Date: 2017-01-17 15:01+0000\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" @@ -24,7 +24,7 @@ msgstr "" #: ../whisperBack/whisperback.py:56 #, python-format msgid "Invalid contact email: %s" -msgstr "Ugyldig kontakt email: %s" +msgstr "Ugyldig kontakt e-mail: %s" #: ../whisperBack/whisperback.py:73 #, python-format @@ -61,7 +61,7 @@ msgstr "Dette kommer muligvis til at tage et stykke tid..." #: ../whisperBack/gui.py:232 msgid "The contact email adress doesn't seem valid." -msgstr "Deres email adresse er ikke valid." +msgstr "Deres e-mail adresse er ikke valid." #: ../whisperBack/gui.py:249 msgid "Unable to send the mail: SMTP error." @@ -105,7 +105,7 @@ msgid "" "As a work-around you can save the bug report as a file on a USB drive and try to send it to us at %s from your email account using another system. Note that your bug report will not be anonymous when doing so unless you take further steps yourself (e.g. using Tor with a throw-away email account).\n" "\n" "Do you want to save the bug report to a file?" -msgstr "Fejl rapporten kunne ikke sendes, sandsynligvis på grund af netværks problemer.\n\nSom en løsning kan De gemme fejl rapporten på en USB nøgle og forsøge at sende den til os på %s fra Deres email konto via et andet system. Noter venligst at Deres fejl rapport ikke længere er anonym på denne måde, med mindre de selv tager andre metoder i brug (f.eks. bruger Tor med en \"throw-away\" email konto).\n\nVil De gemme fejl rapporten til en fil?" +msgstr "Fejl rapporten kunne ikke sendes, sandsynligvis på grund af netværks problemer.\n\nSom en løsning kan De gemme fejl rapporten på en USB nøgle og forsøge at sende den til os på %s fra Deres e-mail konto via et andet system. Noter venligst at Deres fejl rapport ikke længere er anonym på denne måde, med mindre de selv tager andre metoder i brug (f.eks. bruger Tor med en \"throw-away\" email konto).\n\nVil De gemme fejl rapporten til en fil?" #: ../whisperBack/gui.py:379 ../data/whisperback.ui.h:21 msgid "WhisperBack" @@ -174,7 +174,7 @@ msgstr "Fejl beskrivelse" #: ../data/whisperback.ui.h:24 msgid "Optional email address to contact you" -msgstr "Valgfri email adresse til at kontakte Dem" +msgstr "Valgfri e-mail adresse til at kontakte Dem" #: ../data/whisperback.ui.h:25 msgid "optional PGP key" @@ -186,11 +186,11 @@ msgstr "Tekniske detaljer til at inkludere" #: ../data/whisperback.ui.h:27 msgid "headers" -msgstr "headers" +msgstr "headere" #: ../data/whisperback.ui.h:28 msgid "debugging info" -msgstr "Fejlretnings info" +msgstr "fejlretningsinfo" #: ../data/whisperback.ui.h:29 msgid "Help"

1 0

[collector/master] Prepare for 1.1.2 release.
by karsten＠torproject.org 17 Jan '17

17 Jan '17

commit ef96cf827c704e4859687667ce9fced34e269d90 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jan 17 11:09:19 2017 +0100 Prepare for 1.1.2 release. --- CERT | 35 +++++++++++++++++++---------------- CHANGELOG.md | 4 +++- build.xml | 2 +- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/CERT b/CERT index eaeef50..6cc5a93 100644 --- a/CERT +++ b/CERT @@ -1,18 +1,21 @@ -----BEGIN CERTIFICATE----- -MIIDbTCCAlWgAwIBAgIEca8MxDANBgkqhkiG9w0BAQsFADBnMQswCQYDVQQGEwJVUzELMAkGA1UE -CBMCTUExEjAQBgNVBAcTCUNhbWJyaWRnZTEdMBsGA1UEChMUVGhlIFRvciBQcm9qZWN0LCBJbmMx -GDAWBgNVBAMTD0thcnN0ZW4gTG9lc2luZzAeFw0xNjA1MzExODIwMjlaFw0xNjA4MjkxODIwMjla -MGcxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJNQTESMBAGA1UEBxMJQ2FtYnJpZGdlMR0wGwYDVQQK -ExRUaGUgVG9yIFByb2plY3QsIEluYzEYMBYGA1UEAxMPS2Fyc3RlbiBMb2VzaW5nMIIBIjANBgkq -hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgJCqHFgEhyj8AI4w93YcyZEkKwn2Jw5t7bYcaLieP0wa -Ai2xrRFROo0eofjIllPlYTFtj9jLAZf+MQ1/Sdv7SLdlpasBCS0deTGlxuMzyMP9ztkkkAeibc+F -IXYPJArwGJiycnd+obW8b8KNrJQsnb0Se5Fdgo/PSu1rqMh/Mylv9vLqUzB4hbN4bg5+7THlTAOK -egYyR0NEPDzi327MAvzzle27kXV9yOCQr01zXW9NeWYed6JMXCZwaMN6nTVEFiwTfAyATfPncarf -gZ1kyAkQ6/Sw2bGMv8jHqB63Ka0/6GXHRbFgCeWU+c/1sfEMBD3ZurEjwSjWGl73E4GBswIDAQAB -oyEwHzAdBgNVHQ4EFgQUJbu6UT97IU4utjyc4zYUrLIgzvQwDQYJKoZIhvcNAQELBQADggEBAHOF -jMP0rNa+cKy8beEpU0VRZ1RNLb70BoFjXZvzgv92MGnojg509fYO3PgzXUZv5v50VenexZjeZ9to -iiqw5zDelg1maVSZwKrQVgFIwXnP4+okIcPMtFjSNiF9VyhRd8OE3U/kpIBdecMVIEhCIKOaF/nq -uBwilXAK7VwYN7hQgKbIODoX9Y3dr9QDvrILkFDEmOudmDRo+RePAKJum+/E0RuUYjOeXpFmzXOf -5LJ/Y4hMKuLfuxoWasHOV0IRx///CNgF1L287TCyjrYUbEjWwMtFQc0NRjedhcWUzwXLpbk2unxM -j6ElkADaczDG20ZGSgrFfU4MYb1RFeQu6yk= +MIIDaTCCAlGgAwIBAgIEYQnM/zANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV +UzELMAkGA1UECBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxHTAbBgNVBAoTFFRoZSBU +b3IgUHJvamVjdCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwHhcNMTcw +MTAyMTYzNTQ2WhcNMTcwNDAyMTYzNTQ2WjBlMQswCQYDVQQGEwJVUzELMAkGA1UE +CBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxHTAbBgNVBAoTFFRoZSBUb3IgUHJvamVj +dCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwggEiMA0GCSqGSIb3DQEB +AQUAA4IBDwAwggEKAoIBAQChXn+IUp+o6G+k4ffxk3TkxZb3iXfiG7byNsG63olU +6aTpAjDMeaT4ctUwxH4+56Sbcf/wB0vEFBbX8MyRd1eY02PKwMVJ6VBhjOQcIlrd +Qw+VAhKTcEIv4yiR0BWapQyR07pgmKirYVjN6s6ef8NJzUptpxLlaYJ3ZfQfc4aE +MXzScgaccwDFIWQ661lzLGCfeSxxa3Xy4wWsGwzNzLITYrrABcbg7yogLo2btNvD +oEwGL3/baQdhl0dra6biVCZr9ydn3Hg57S55pUU0rBY25id78zUO8xrfNHw54wwX +lOblGt75OOkahP/ZZSBxxoiknJ6y5VQV8y+noA4vigXFAgMBAAGjITAfMB0GA1Ud +DgQWBBSeh60M+/wMYyYhlxtuff2Hk9n7bzANBgkqhkiG9w0BAQsFAAOCAQEAi2K5 +o3UnRBLdk9zkBEDbqPWxq8eiiIacbSoorspVlv4vqNO2UsTLc2sA4zZpY1L7Mkc6 +y7pcd1jFc6e9Wzt0agoIU9i3pyqkUx11ktE8a8CiVjDOns05GHe1DsLYcSLG8aJR +2pNEFjZEndHTXGRKwxtTmHimsIIWiy8tYFkC7SkBQj+BnXBqzCbJPhRDpMdhyJmQ +CLUhTTgU30G32x3vOhddWHAH8UDsXNlBASQOFs+A/1Mx5DI5AXLtwjp/rweTWoBk +11SfkVS/mfMZNRGOA9DEfoRYHPT0Rn4URAQrBr73CKQaVVYyeuDOoEs69KRH2JSO +IRcgAfpjtg8cry/eiw== -----END CERTIFICATE----- diff --git a/CHANGELOG.md b/CHANGELOG.md index dd3a004..107423c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,11 @@ -# Changes in version x.x.x - 2017-xx-xx +# Changes in version 1.1.2 - 2017-01-17 * Medium changes - Unify the build process by adding git-submodule metrics-base in src/build and removing all centralized parts of the build process. + - Use the correct type annotation "@type tordnsel 1.0" for exit + lists, rather than "@type torperf 1.0". # Changes in version 1.1.1 - 2016-11-24 diff --git a/build.xml b/build.xml index 49b747d..6fc7c8c 100644 --- a/build.xml +++ b/build.xml @@ -8,7 +8,7 @@ <property name="javadoc-title" value="CollecTor API Documentation"/> <property name="implementation-title" value="CollecTor" /> - <property name="release.version" value="1.1.1-dev" /> + <property name="release.version" value="1.1.2" /> <property name="project-main-class" value="org.torproject.collector.Main" /> <property name="name" value="collector"/> <property name="descriptorversion" value="1.5.0" />

1 0

[collector/master] Corrected exit-list annotation. Suggested by Wojtek Porczyk.
by karsten＠torproject.org 17 Jan '17

17 Jan '17

commit dcccaaabb2798cb927242a357883dcfc8e95b68e Author: iwakeh <iwakeh(a)torproject.org> Date: Mon Jan 16 17:29:31 2017 +0100 Corrected exit-list annotation. Suggested by Wojtek Porczyk. Implements task-21195. --- .../java/org/torproject/collector/exitlists/ExitListDownloader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/collector/exitlists/ExitListDownloader.java b/src/main/java/org/torproject/collector/exitlists/ExitListDownloader.java index 27afad6..877057e 100644 --- a/src/main/java/org/torproject/collector/exitlists/ExitListDownloader.java +++ b/src/main/java/org/torproject/collector/exitlists/ExitListDownloader.java @@ -76,7 +76,7 @@ public class ExitListDownloader extends CollecTorMain { try { logger.debug("Downloading exit list..."); StringBuilder sb = new StringBuilder(); - sb.append(Annotation.Torperf.toString()); + sb.append(Annotation.ExitList.toString()); sb.append("Downloaded " + dateTimeFormat.format(downloadedDate) + "\n"); URL url = config.getUrl(Key.ExitlistUrl);

1 0

[collector/master] Added shell-script for correcting exit-list annotations.
by karsten＠torproject.org 17 Jan '17

17 Jan '17

commit feff68f76790f06d146257f490f5235f7bbd97d9 Author: iwakeh <iwakeh(a)torproject.org> Date: Mon Jan 16 20:26:07 2017 +0100 Added shell-script for correcting exit-list annotations. --- src/main/resources/fix-exitlists-annotation.sh | 45 ++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/src/main/resources/fix-exitlists-annotation.sh b/src/main/resources/fix-exitlists-annotation.sh new file mode 100755 index 0000000..e77d806 --- /dev/null +++ b/src/main/resources/fix-exitlists-annotation.sh @@ -0,0 +1,45 @@ +#!/bin/bash +# +# Only for upgrading from 1.1.0 or 1.1.1!!! +# +# Script for correcting exit-list annotations. +# See task-21195 for details. +# Replaces 'torperf' with 'tordnsel' in files +# and archives. +# +##### +# +# Please enter absolute paths below. +# +# As in collector.properties +RECENT= +OUT= +ARCHIVE= +# +# temporary path to use +TEMP= + +function fix() { + echo "----> Operating on $1 ..." + find $1/$2/ -type f -exec sed -i s/torperf/tordnsel/ {} \; + echo "----> $1 done." +} + +echo "-> Starting to fix exit-lists ..." +fix $OUT "exit-lists" +fix $RECENT "exit-lists" + +for ym in 2016-10 2016-11 2016-12 2017-01 ; do + cd $TEMP; + ARC="$ARCHIVE/exit-lists/exit-list-$ym.tar.xz" + echo "--> Operating on $ARC ..." + tar xf $ARC; + fix $TEMP exit-list-$ym + mv $ARC $ARC-old; + tar --remove-files -cf exit-list-$ym.tar exit-list-$ym + xz -9e exit-list-$ym.tar + mv $TEMP/exit-list-$ym.tar.xz $ARC + echo "--> $ARC is done." +done; +echo "-> Done. Please verify the results and remove $ARCHIVE/*.tar.xz-old files." +exit 0;

1 0

[collector/master] BufferedReader wouldn't be closed in case of an Exception.
by karsten＠torproject.org 17 Jan '17

17 Jan '17

commit 7752b6d73538140cd34daf2267cc470dcc30b155 Author: iwakeh <iwakeh(a)torproject.org> Date: Mon Jan 16 17:34:35 2017 +0100 BufferedReader wouldn't be closed in case of an Exception. Use try-with-resources to prevent this. --- .../torproject/collector/bridgedescs/SanitizedBridgesWriter.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java b/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java index 0898670..45a7565 100644 --- a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java +++ b/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java @@ -156,9 +156,8 @@ public class SanitizedBridgesWriter extends CollecTorMain { this.bridgeIpSecretsFile = new File(statsDirectory, "bridge-ip-secrets"); if (this.bridgeIpSecretsFile.exists()) { - try { - BufferedReader br = new BufferedReader(new FileReader( - this.bridgeIpSecretsFile)); + try (BufferedReader br = new BufferedReader(new FileReader( + this.bridgeIpSecretsFile))) { String line; while ((line = br.readLine()) != null) { String[] parts = line.split(","); @@ -177,7 +176,6 @@ public class SanitizedBridgesWriter extends CollecTorMain { byte[] secret = Hex.decodeHex(parts[1].toCharArray()); this.secretsForHashingIpAddresses.put(month, secret); } - br.close(); if (!this.persistenceProblemWithSecrets) { logger.debug("Read " + this.secretsForHashingIpAddresses.size() + " secrets for "

1 0

[collector/master] Bump version to 1.1.2-dev.
by karsten＠torproject.org 17 Jan '17

17 Jan '17

commit 18fddbe34022bc0070eec37a6c9eaaf00c66fc91 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jan 17 16:08:17 2017 +0100 Bump version to 1.1.2-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 6fc7c8c..2dc6c03 100644 --- a/build.xml +++ b/build.xml @@ -8,7 +8,7 @@ <property name="javadoc-title" value="CollecTor API Documentation"/> <property name="implementation-title" value="CollecTor" /> - <property name="release.version" value="1.1.2" /> + <property name="release.version" value="1.1.2-dev" /> <property name="project-main-class" value="org.torproject.collector.Main" /> <property name="name" value="collector"/> <property name="descriptorversion" value="1.5.0" />

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 17 Jan '17

17 Jan '17

commit a9018353456cf0e401c06f8fb97385271e1ab920 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 17 14:48:23 2017 +0000 Update translations for tor-browser-manual --- ru/ru.po | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/ru/ru.po b/ru/ru.po index bfa07f1..c874dd6 100644 --- a/ru/ru.po +++ b/ru/ru.po @@ -1037,7 +1037,7 @@ msgstr "" #: secure-connections.page:8 msgid "Learn how to protect your data using Tor Browser and HTTPS" -msgstr "" +msgstr "Узнай как защитить свои данные с помощью Тор браузера и HTTPS" #: secure-connections.page:12 msgid "Secure Connections" @@ -1102,15 +1102,15 @@ msgstr "" #: secure-connections.page:70 msgid "The site being visited." -msgstr "" +msgstr "Сайт посещают." #: secure-connections.page:81 msgid "Username and password used for authentication." -msgstr "" +msgstr "Логин и пароль использованы для аутентификация" #: secure-connections.page:92 msgid "Data being transmitted." -msgstr "" +msgstr "Данные передаются." #: secure-connections.page:103 msgid "" @@ -1141,7 +1141,7 @@ msgstr "" #: security-slider.page:21 msgid "Accessing the Security Slider" -msgstr "" +msgstr "Доступ к Slider безопасности" #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -1338,6 +1338,8 @@ msgid "" "Make sure another Tor Browser is not already running. If you’re not sure if " "Tor Browser is running, restart your computer." msgstr "" +"Убедитесь, что другой Tor Browser не запущен. Если вы не уверены, что Tor " +"Browser работает, перезагрузите компьютер." #: troubleshooting.page:41 msgid ""

1 0

[translation/tails-openpgp-applet_completed] Update translations for tails-openpgp-applet_completed
by translation＠torproject.org 17 Jan '17

17 Jan '17

commit f7a9888fabf1a63bd2bb3cd6293e44ba9079923a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 17 14:47:16 2017 +0000 Update translations for tails-openpgp-applet_completed --- da/openpgp-applet.pot | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/da/openpgp-applet.pot b/da/openpgp-applet.pot index 5ab20cd..eed4714 100644 --- a/da/openpgp-applet.pot +++ b/da/openpgp-applet.pot @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# scootergrisen, 2017 # Tommy Gade, 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2015-08-10 15:55+0200\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" -"Last-Translator: Tommy Gade\n" +"PO-Revision-Date: 2017-01-17 14:25+0000\n" +"Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -40,11 +41,11 @@ msgstr "Krypter udklipsholderen med _Adgangskode" #: bin/openpgp-applet:238 msgid "Sign/Encrypt Clipboard with Public _Keys" -msgstr "Signer/Krypter udklipsholderen med offentlig nøgle" +msgstr "Signer/Krypter udklipsholderen med offentlig _nøgle" #: bin/openpgp-applet:243 msgid "_Decrypt/Verify Clipboard" -msgstr "Dekrypter/Godkend udklipsholder" +msgstr "_Dekrypter/Godkend udklipsholder" #: bin/openpgp-applet:247 msgid "_Manage Keys"

1 0