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

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 26 Sep '18

26 Sep '18

commit c59c735b8883dcc6a90d5b8444f2fd31fcb5d59b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 26 15:17:17 2018 +0000 Update translations for torbirdy --- el/torbirdy.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/el/torbirdy.properties b/el/torbirdy.properties index b620032b0..78dd2a3bf 100644 --- a/el/torbirdy.properties +++ b/el/torbirdy.properties @@ -2,13 +2,13 @@ torbirdy.name=TorBirdy torbirdy.enabled.tor=Το… [View More]

1 0

[translation/tor-and-https_completed] Update translations for tor-and-https_completed
by translation＠torproject.org 26 Sep '18

26 Sep '18

commit ab95adeb8e7140f229e7291d647dfb2adb422a4e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 26 15:17:03 2018 +0000 Update translations for tor-and-https_completed --- el.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/el.po b/el.po index 7957b8e56..c75870aae 100644 --- a/el.po +++ b/el.po @@ -1,13 +1,14 @@ # # Translators: # andromeas <andromeas(a)hotmail.com>, 2014 +# A Papac <ap909219(a)protonmail.com>,… [View More]

1 0

[translation/tor-and-https] Update translations for tor-and-https
by translation＠torproject.org 26 Sep '18

26 Sep '18

commit 4d3234fdab54131b56743ad98ba8ffb206e4bfc1 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 26 15:16:58 2018 +0000 Update translations for tor-and-https --- el.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/el.po b/el.po index 7957b8e56..c75870aae 100644 --- a/el.po +++ b/el.po @@ -1,13 +1,14 @@ # # Translators: # andromeas <andromeas(a)hotmail.com>, 2014 +# A Papac <ap909219(a)protonmail.com>, 2018 # … [View More]

1 0

[translation/tails-onioncircuits_completed] Update translations for tails-onioncircuits_completed
by translation＠torproject.org 26 Sep '18

26 Sep '18

commit 031fab39958e26e88b3eb80eccab012b4022aa73 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 26 15:16:38 2018 +0000 Update translations for tails-onioncircuits_completed --- el/onioncircuits.pot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/el/onioncircuits.pot b/el/onioncircuits.pot index 649f0451b..b40c14df3 100644 --- a/el/onioncircuits.pot +++ b/el/onioncircuits.pot @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: The … [View More]

1 0

[translation/tails-onioncircuits] Update translations for tails-onioncircuits
by translation＠torproject.org 26 Sep '18

26 Sep '18

commit ac9d434125e53af9540b0c95508b7197f672a485 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 26 15:16:33 2018 +0000 Update translations for tails-onioncircuits --- el/onioncircuits.pot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/el/onioncircuits.pot b/el/onioncircuits.pot index 649f0451b..b40c14df3 100644 --- a/el/onioncircuits.pot +++ b/el/onioncircuits.pot @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: The Tor Project\… [View More]

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 26 Sep '18

26 Sep '18

commit a731283ae40bd15afe4e6c3ad7b4491ca19b7d86 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 26 15:15:15 2018 +0000 Update translations for bridgedb_completed --- el/LC_MESSAGES/bridgedb.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/el/LC_MESSAGES/bridgedb.po b/el/LC_MESSAGES/bridgedb.po index 4194a3d50..26881ed32 100644 --- a/el/LC_MESSAGES/bridgedb.po +++ b/el/LC_MESSAGES/bridgedb.po @@ -22,7 +22,7 @@ msgstr "" "… [View More]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: 2018-09-26 14:36+0000\n" +"PO-Revision-Date: 2018-09-26 14:58+0000\n" "Last-Translator: A Papac <ap909219(a)protonmail.com>\n" "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n" "MIME-Version: 1.0\n" @@ -304,7 +304,7 @@ msgstr "Παρακαλώ δώστε μας όσο το δυνατόν περισ #: bridgedb/strings.py:128 msgid "Here are your bridge lines:" -msgstr "Ιδού οι γραμμές για τις γέφυρές σας:" +msgstr "Ορίστε, οι γραμμές για τις γέφυρές σας:" #: bridgedb/strings.py:129 msgid "Get Bridges!" @@ -316,7 +316,7 @@ msgstr "Παρακαλώ επιλέξτε τις επιλογές για τον #: bridgedb/strings.py:134 msgid "Do you need IPv6 addresses?" -msgstr "Χρειάζεσαι μια διεύθυνση IPv6;" +msgstr "Χρειάζεστε μια διεύθυνση IPv6;" #: bridgedb/strings.py:135 #, python-format @@ -325,7 +325,7 @@ msgstr "Μήπως χρειάζεστε ένα %s;" #: bridgedb/strings.py:139 msgid "Your browser is not displaying images properly." -msgstr "Ο φυλλομετρητής σας δεν εμφανίζει τις εικόνες σωστά." +msgstr "Ο browser σας δεν εμφανίζει τις εικόνες σωστά." #: bridgedb/strings.py:140 msgid "Enter the characters from the image above..." @@ -342,7 +342,7 @@ msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" "page %s and then follow the instructions there for downloading and starting\n" "Tor Browser." -msgstr "Για να χρησιμοποιήσετε γέφυρες στο Tor Browser, αρχικά επιλέξτε %s Tor Browser κατέβασμα\npage %s έπειτα ακολουθήστε τις οδηγίες για κατέβασμα και εκκίνηση του \nTor Browser." +msgstr "Για να χρησιμοποιήσετε γέφυρες στο Tor Browser, αρχικά επιλέξτε %s Tor Browser σελίδα\nκατεβάσματος%s έπειτα ακολουθήστε τις οδηγίες για κατέβασμα και εκκίνηση του \nTor Browser." #. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:151 [View Less]

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 26 Sep '18

26 Sep '18

commit 36e1f9365834add85c4f3086f989e2dea3ef6dc1 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 26 15:15:10 2018 +0000 Update translations for bridgedb --- el/LC_MESSAGES/bridgedb.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/el/LC_MESSAGES/bridgedb.po b/el/LC_MESSAGES/bridgedb.po index 4194a3d50..26881ed32 100644 --- a/el/LC_MESSAGES/bridgedb.po +++ b/el/LC_MESSAGES/bridgedb.po @@ -22,7 +22,7 @@ msgstr "" "Project-… [View More]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: 2018-09-26 14:36+0000\n" +"PO-Revision-Date: 2018-09-26 14:58+0000\n" "Last-Translator: A Papac <ap909219(a)protonmail.com>\n" "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n" "MIME-Version: 1.0\n" @@ -304,7 +304,7 @@ msgstr "Παρακαλώ δώστε μας όσο το δυνατόν περισ #: bridgedb/strings.py:128 msgid "Here are your bridge lines:" -msgstr "Ιδού οι γραμμές για τις γέφυρές σας:" +msgstr "Ορίστε, οι γραμμές για τις γέφυρές σας:" #: bridgedb/strings.py:129 msgid "Get Bridges!" @@ -316,7 +316,7 @@ msgstr "Παρακαλώ επιλέξτε τις επιλογές για τον #: bridgedb/strings.py:134 msgid "Do you need IPv6 addresses?" -msgstr "Χρειάζεσαι μια διεύθυνση IPv6;" +msgstr "Χρειάζεστε μια διεύθυνση IPv6;" #: bridgedb/strings.py:135 #, python-format @@ -325,7 +325,7 @@ msgstr "Μήπως χρειάζεστε ένα %s;" #: bridgedb/strings.py:139 msgid "Your browser is not displaying images properly." -msgstr "Ο φυλλομετρητής σας δεν εμφανίζει τις εικόνες σωστά." +msgstr "Ο browser σας δεν εμφανίζει τις εικόνες σωστά." #: bridgedb/strings.py:140 msgid "Enter the characters from the image above..." @@ -342,7 +342,7 @@ msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" "page %s and then follow the instructions there for downloading and starting\n" "Tor Browser." -msgstr "Για να χρησιμοποιήσετε γέφυρες στο Tor Browser, αρχικά επιλέξτε %s Tor Browser κατέβασμα\npage %s έπειτα ακολουθήστε τις οδηγίες για κατέβασμα και εκκίνηση του \nTor Browser." +msgstr "Για να χρησιμοποιήσετε γέφυρες στο Tor Browser, αρχικά επιλέξτε %s Tor Browser σελίδα\nκατεβάσματος%s έπειτα ακολουθήστε τις οδηγίες για κατέβασμα και εκκίνηση του \nTor Browser." #. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:151 [View Less]

1 0

[metrics-lib/master] Bump version to 2.5.0-dev.
by karsten＠torproject.org 26 Sep '18

26 Sep '18

commit 603a439f802c6d4a8b29367ce13b345ae8cf02bc Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Sep 26 17:14:16 2018 +0200 Bump version to 2.5.0-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index a522d37..b4f87ca 100644 --- a/build.xml +++ b/build.xml @@ -6,7 +6,7 @@ <project default="usage" name="metrics-lib" basedir="."> - <property name="release.version" value="2.5.0" /> + <… [View More]

1 0

[metrics-lib/release] Replace JAXB with Apache Commons Codec dependency.
by karsten＠torproject.org 26 Sep '18

26 Sep '18

commit d1f9a329a2e03662691b96d58dd209e145fe4835 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jul 4 17:29:19 2018 +0200 Replace JAXB with Apache Commons Codec dependency. The reason is that JAXB won't be part of standard Java 9 anymore, and the only reason why we used it was to get rid of Apache Commons Codec as dependency, three years ago. Now it makes sense to just go back to Apache Commons Codec in preparation of upgrading to Java 9. … [View More]Partially reverts 1734d16. Fixes #25444. --- CHANGELOG.md | 9 +++++++++ build.xml | 1 + .../org/torproject/descriptor/impl/DescriptorImpl.java | 9 +++++---- .../org/torproject/descriptor/impl/ParseHelper.java | 18 ++++++++---------- 4 files changed, 23 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 39257fe..0e9ad5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# Changes in version 2.5.0 - 2018-??-?? + + * Medium changes + - Go back to using Apache Commons Codec as base64 and hexadecimal + codec rather than using JAXB which won't be available anymore + after upgrading from Java 8 to 9. Applications must provide + Apache Commons Codec 1.10 as dependency. + + # Changes in version 2.4.0 - 2018-05-23 * Medium changes diff --git a/build.xml b/build.xml index 3c4bf28..f84c507 100644 --- a/build.xml +++ b/build.xml @@ -14,6 +14,7 @@ <property name="jarpatternprop" value="empty" /> <patternset id="runtime" > + <include name="commons-codec-1.10.jar"/> <include name="commons-compress-1.13.jar"/> <include name="jackson-annotations-2.8.6.jar"/> <include name="jackson-core-2.8.6.jar"/> diff --git a/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java index 918fef8..a6acee7 100644 --- a/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java @@ -6,6 +6,9 @@ package org.torproject.descriptor.impl; import org.torproject.descriptor.Descriptor; import org.torproject.descriptor.DescriptorParseException; +import org.apache.commons.codec.binary.Base64; +import org.apache.commons.codec.binary.Hex; + import java.io.ByteArrayInputStream; import java.io.File; import java.io.InputStreamReader; @@ -19,8 +22,6 @@ import java.util.Map; import java.util.Scanner; import java.util.Set; -import javax.xml.bind.DatatypeConverter; - public abstract class DescriptorImpl implements Descriptor { public static final String NL = "\n"; @@ -383,7 +384,7 @@ public abstract class DescriptorImpl implements Descriptor { end = ascii.indexOf(endToken) + endToken.length(); } if (start >= 0 && end >= 0 && end > start) { - this.digestSha1Hex = DatatypeConverter.printHexBinary( + this.digestSha1Hex = Hex.encodeHexString( messageDigest("SHA-1", start, end)).toLowerCase(); } } @@ -426,7 +427,7 @@ public abstract class DescriptorImpl implements Descriptor { end = ascii.indexOf(endToken) + endToken.length(); } if (start >= 0 && end >= 0 && end > start) { - this.digestSha256Base64 = DatatypeConverter.printBase64Binary( + this.digestSha256Base64 = Base64.encodeBase64String( messageDigest("SHA-256", start, end)).replaceAll("=", ""); } } diff --git a/src/main/java/org/torproject/descriptor/impl/ParseHelper.java b/src/main/java/org/torproject/descriptor/impl/ParseHelper.java index d0c83f0..49a3430 100644 --- a/src/main/java/org/torproject/descriptor/impl/ParseHelper.java +++ b/src/main/java/org/torproject/descriptor/impl/ParseHelper.java @@ -5,6 +5,9 @@ package org.torproject.descriptor.impl; import org.torproject.descriptor.DescriptorParseException; +import org.apache.commons.codec.binary.Base64; +import org.apache.commons.codec.binary.Hex; + import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -19,8 +22,6 @@ import java.util.TreeMap; import java.util.TreeSet; import java.util.regex.Pattern; -import javax.xml.bind.DatatypeConverter; - /** * Parse helper for descriptor contents. * @@ -302,8 +303,7 @@ public class ParseHelper { + "' in line '" + line + "' is not a valid base64-encoded " + "20-byte value."); } - return DatatypeConverter.printHexBinary( - DatatypeConverter.parseBase64Binary(base64String + "=")) + return Hex.encodeHexString(Base64.decodeBase64(base64String + "=")) .toUpperCase(); } @@ -322,8 +322,7 @@ public class ParseHelper { + "' in line '" + line + "' is not a valid base64-encoded " + "32-byte value."); } - return DatatypeConverter.printHexBinary( - DatatypeConverter.parseBase64Binary(base64String + "=")) + return Hex.encodeHexString(Base64.decodeBase64(base64String + "=")) .toUpperCase(); } @@ -457,8 +456,7 @@ public class ParseHelper { .substring(beginEd25519CertLine.length(), identityEd25519CryptoBlock.length() - endEd25519CertLine.length()).replaceAll("=", ""); - byte[] identityEd25519 = DatatypeConverter.parseBase64Binary( - identityEd25519Base64); + byte[] identityEd25519 = Base64.decodeBase64(identityEd25519Base64); if (identityEd25519.length < 40) { throw new DescriptorParseException("Invalid length of " + "identity-ed25519 (in bytes): " + identityEd25519.length); @@ -494,8 +492,8 @@ public class ParseHelper { byte[] masterKeyEd25519 = new byte[32]; System.arraycopy(identityEd25519, extensionStart + 4, masterKeyEd25519, 0, masterKeyEd25519.length); - String masterKeyEd25519Base64 = DatatypeConverter - .printBase64Binary(masterKeyEd25519).replaceAll("=", ""); + String masterKeyEd25519Base64 + = Base64.encodeBase64String(masterKeyEd25519).replaceAll("=", ""); String masterKeyEd25519Base64NoTrailingEqualSigns = masterKeyEd25519Base64.replaceAll("=", ""); return masterKeyEd25519Base64NoTrailingEqualSigns; [View Less]

1 0

[metrics-lib/release] Bump version to 2.4.0-dev.
by karsten＠torproject.org 26 Sep '18

26 Sep '18

commit feabf88fff34465134da9ea61592f7f9c30415b7 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri May 25 14:46:09 2018 +0200 Bump version to 2.4.0-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index c69da65..3c4bf28 100644 --- a/build.xml +++ b/build.xml @@ -6,7 +6,7 @@ <project default="usage" name="metrics-lib" basedir="."> - <property name="release.version" value="2.4.0" /> + <… [View More]

1 0