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

[metrics-lib/release] Parse partial download times from Onionperf files.
by karsten＠torproject.org 16 May '20

16 May '20

commit ba6c63a707ceb7acc6354f541a8efd9366842c53 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu May 14 09:23:12 2020 +0200 Parse partial download times from Onionperf files. Implements #26673. --- CHANGELOG.md | 6 +++- .../org/torproject/descriptor/TorperfResult.java | 9 ++++++ .../descriptor/impl/TorperfResultImpl.java | 34 +++++++++++++++++++++ .../onionperf/OnionPerfAnalysisConverter.java | 9 ++++++ .../onionperf/ParsedOnionPerfAnalysis.java | 5 +++ .../onionperf/OnionPerfAnalysisConverterTest.java | 13 ++++++-- .../resources/onionperf/onionperf.analysis.json.xz | Bin 17376 -> 17420 bytes 7 files changed, 73 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ed2425..ac7ef89 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,8 @@ -# Changes in version 2.??.? - 2020-??-?? +# Changes in version 2.13.0 - 2020-??-?? + + * Medium changes + - Extend Torperf results to provide partial download times for 10, + 20, 50, 100, 200, and 500 KiB as well as 1, 2, and 5 MiB. * Minor changes - Include previously unknown error codes in Torperf results diff --git a/src/main/java/org/torproject/descriptor/TorperfResult.java b/src/main/java/org/torproject/descriptor/TorperfResult.java index 961a206..695be01 100644 --- a/src/main/java/org/torproject/descriptor/TorperfResult.java +++ b/src/main/java/org/torproject/descriptor/TorperfResult.java @@ -136,6 +136,15 @@ public interface TorperfResult extends Descriptor { Boolean didTimeout(); /** + * Return the times in milliseconds since the epoch when the given number of + * bytes were read, or null if the torperf line didn't contain that + * information. + * + * @since 2.13.0 + */ + SortedMap<Integer, Long> getPartials(); + + /** * Return the times in milliseconds since the epoch when {@code x%} of * expected bytes were read for {@code 0 <= x <= 100}, or null if the * torperf line didn't contain that information. diff --git a/src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java b/src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java index f8879d7..b2c58cc 100644 --- a/src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java @@ -185,6 +185,8 @@ public class TorperfResultImpl extends DescriptorImpl default: if (key.startsWith("DATAPERC")) { this.parseDataPercentile(value, keyValue, line); + } else if (key.startsWith("PARTIAL")) { + this.parsePartial(value, keyValue, line); } else { if (this.unrecognizedKeys == null) { this.unrecognizedKeys = new TreeMap<>(); @@ -313,6 +315,31 @@ public class TorperfResultImpl extends DescriptorImpl } } + private void parsePartial(String value, String keyValue, String line) + throws DescriptorParseException { + String key = keyValue.substring(0, keyValue.indexOf("=")); + String bytesString = key.substring("PARTIAL".length()); + int bytes; + try { + bytes = Integer.parseInt(bytesString); + } catch (NumberFormatException e) { + /* Treat key as unrecognized below. */ + bytes = -1; + } + if (bytes < 0) { + if (this.unrecognizedKeys == null) { + this.unrecognizedKeys = new TreeMap<>(); + } + this.unrecognizedKeys.put(key, value); + } else { + long timestamp = this.parseTimestamp(value, keyValue, line); + if (this.partials == null) { + this.partials = new TreeMap<>(); + } + this.partials.put(bytes, timestamp); + } + } + private void parseDataPercentile(String value, String keyValue, String line) throws DescriptorParseException { String key = keyValue.substring(0, keyValue.indexOf("=")); @@ -564,6 +591,13 @@ public class TorperfResultImpl extends DescriptorImpl return this.didTimeout; } + private SortedMap<Integer, Long> partials; + + @Override + public SortedMap<Integer, Long> getPartials() { + return this.partials == null ? null : new TreeMap<>(this.partials); + } + private SortedMap<Integer, Long> dataPercentiles; @Override diff --git a/src/main/java/org/torproject/descriptor/onionperf/OnionPerfAnalysisConverter.java b/src/main/java/org/torproject/descriptor/onionperf/OnionPerfAnalysisConverter.java index 8ca5efd..5e7e683 100644 --- a/src/main/java/org/torproject/descriptor/onionperf/OnionPerfAnalysisConverter.java +++ b/src/main/java/org/torproject/descriptor/onionperf/OnionPerfAnalysisConverter.java @@ -265,6 +265,15 @@ public class OnionPerfAnalysisConverter { transfer.elapsedSeconds.command); torperfResultsBuilder.addTimestamp("DATARESPONSE", transfer.unixTsStart, transfer.elapsedSeconds.response); + if (null != transfer.elapsedSeconds.payloadBytes) { + for (Map.Entry<String, Double> payloadBytesEntry + : transfer.elapsedSeconds.payloadBytes.entrySet()) { + String key = String.format("PARTIAL%s", payloadBytesEntry.getKey()); + Double elapsedSeconds = payloadBytesEntry.getValue(); + torperfResultsBuilder.addTimestamp(key, transfer.unixTsStart, + elapsedSeconds); + } + } if (null != transfer.elapsedSeconds.payloadProgress) { for (Map.Entry<String, Double> payloadProgressEntry : transfer.elapsedSeconds.payloadProgress.entrySet()) { diff --git a/src/main/java/org/torproject/descriptor/onionperf/ParsedOnionPerfAnalysis.java b/src/main/java/org/torproject/descriptor/onionperf/ParsedOnionPerfAnalysis.java index 679879e..4eca0ff 100644 --- a/src/main/java/org/torproject/descriptor/onionperf/ParsedOnionPerfAnalysis.java +++ b/src/main/java/org/torproject/descriptor/onionperf/ParsedOnionPerfAnalysis.java @@ -200,6 +200,11 @@ public class ParsedOnionPerfAnalysis { Double lastByte; /** + * Time until the given number of bytes were read. + */ + Map<String, Double> payloadBytes; + + /** * Time until the given fraction of expected bytes were read. */ Map<String, Double> payloadProgress; diff --git a/src/test/java/org/torproject/descriptor/onionperf/OnionPerfAnalysisConverterTest.java b/src/test/java/org/torproject/descriptor/onionperf/OnionPerfAnalysisConverterTest.java index 7a1a3a0..51e0896 100644 --- a/src/test/java/org/torproject/descriptor/onionperf/OnionPerfAnalysisConverterTest.java +++ b/src/test/java/org/torproject/descriptor/onionperf/OnionPerfAnalysisConverterTest.java @@ -32,7 +32,10 @@ public class OnionPerfAnalysisConverterTest { + "ENDPOINTPROXY=localhost:127.0.0.1:35900 " + "ENDPOINTREMOTE=m3eahz7co6lzi6jn.onion:0.0.0.0:443 FILESIZE=1048576 " + "HOSTNAMELOCAL=op-nl2 HOSTNAMEREMOTE=op-nl2 LAUNCH=1587991281.38 " - + "NEGOTIATE=1587991280.37 " + + "NEGOTIATE=1587991280.37 PARTIAL10240=1587991283.81 " + + "PARTIAL102400=1587991284.15 PARTIAL1048576=1587991286.62 " + + "PARTIAL20480=1587991283.81 PARTIAL204800=1587991284.38 " + + "PARTIAL51200=1587991283.81 PARTIAL512000=1587991285.14 " + "PATH=$970F0966DAA7EBDEE44E3772045527A6854E997B," + "$8101421BEFCCF4C271D5483C5AABCAAD245BBB9D," + "$1A7A2516A961F2838F7F94786A8811BE82F9CFFE READBYTES=1048643 " @@ -54,6 +57,10 @@ public class OnionPerfAnalysisConverterTest { + "ENDPOINTREMOTE=3czoq6qyehjio6lcdo4tb4vk5uv2bm4gfk5iacnawza22do6klsj7wy" + "d.onion:0.0.0.0:443 FILESIZE=1048576 HOSTNAMELOCAL=op-nl2 " + "HOSTNAMEREMOTE=op-nl2 LAUNCH=1587991881.70 NEGOTIATE=1587991880.37 " + + "PARTIAL10240=1587991910.74 PARTIAL102400=1587991913.71 " + + "PARTIAL1048576=1587991927.74 PARTIAL20480=1587991910.74 " + + "PARTIAL204800=1587991916.00 PARTIAL51200=1587991910.74 " + + "PARTIAL512000=1587991921.80 " + "PATH=$D5C6F62A5D1B3C711CA5E6F9D3772A432E96F6C2," + "$94EC34B871936504BE70671B44760BC99242E1F3," + "$E0F638ECCE918B5455CE29D2CD9ECC9DBD8F8B21 READBYTES=1048643 " @@ -96,7 +103,9 @@ public class OnionPerfAnalysisConverterTest { String formattedTorperfResult = new String(descriptor.getRawDescriptorBytes()).trim(); assertNotNull(formattedTorperfResult); - assertTrue(formattedTorperfResult.equals(torperfResultTransfer1m1) + assertTrue(String.format("Unrecognized formatted Torperf result: %s", + formattedTorperfResult), + formattedTorperfResult.equals(torperfResultTransfer1m1) || formattedTorperfResult.equals(torperfResultTransfer1m3) || formattedTorperfResult.equals(torperfResultTransfer50k2)); } diff --git a/src/test/resources/onionperf/onionperf.analysis.json.xz b/src/test/resources/onionperf/onionperf.analysis.json.xz index 41a4fa1..08162a1 100644 Binary files a/src/test/resources/onionperf/onionperf.analysis.json.xz and b/src/test/resources/onionperf/onionperf.analysis.json.xz differ

1 0

[metrics-lib/release] Support OnionPerf results files up to version 2.x.
by karsten＠torproject.org 16 May '20

16 May '20

commit 1e9fa02107a5442ffc5c9c4f6d85023b669adfed Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri May 15 12:26:28 2020 +0200 Support OnionPerf results files up to version 2.x. --- .../onionperf/OnionPerfAnalysisConverter.java | 4 ++-- .../resources/onionperf/onionperf.analysis.json.xz | Bin 17420 -> 17420 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/torproject/descriptor/onionperf/OnionPerfAnalysisConverter.java b/src/main/java/org/torproject/descriptor/onionperf/OnionPerfAnalysisConverter.java index 5e7e683..61fd173 100644 --- a/src/main/java/org/torproject/descriptor/onionperf/OnionPerfAnalysisConverter.java +++ b/src/main/java/org/torproject/descriptor/onionperf/OnionPerfAnalysisConverter.java @@ -109,9 +109,9 @@ public class OnionPerfAnalysisConverter { throw new DescriptorParseException("Parsed OnionPerf analysis file does " + "not contain version information."); } else if ((parsedOnionPerfAnalysis.version instanceof Double - && (double) parsedOnionPerfAnalysis.version > 1.999) + && (double) parsedOnionPerfAnalysis.version > 2.999) || (parsedOnionPerfAnalysis.version instanceof String - && !((String) parsedOnionPerfAnalysis.version).startsWith("1."))) { + && ((String) parsedOnionPerfAnalysis.version).compareTo("3.") >= 0)) { throw new DescriptorParseException("Parsed OnionPerf analysis file " + "contains unsupported version " + parsedOnionPerfAnalysis.version + "."); diff --git a/src/test/resources/onionperf/onionperf.analysis.json.xz b/src/test/resources/onionperf/onionperf.analysis.json.xz index 08162a1..2852c2c 100644 Binary files a/src/test/resources/onionperf/onionperf.analysis.json.xz and b/src/test/resources/onionperf/onionperf.analysis.json.xz differ

1 0

[metrics-lib/release] Prepare for 2.13.0 release.
by karsten＠torproject.org 16 May '20

16 May '20

commit 75fea1a658a5583503c0f0ffeb1aa51792de4807 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat May 16 17:31:59 2020 +0200 Prepare for 2.13.0 release. --- CHANGELOG.md | 3 ++- build.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ac7ef89..bddabeb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ -# Changes in version 2.13.0 - 2020-??-?? +# Changes in version 2.13.0 - 2020-05-16 * Medium changes + - Parse OnionPerf analysis results format version 2.0. - Extend Torperf results to provide partial download times for 10, 20, 50, 100, 200, and 500 KiB as well as 1, 2, and 5 MiB. diff --git a/build.xml b/build.xml index 978ed37..126be8e 100644 --- a/build.xml +++ b/build.xml @@ -7,7 +7,7 @@ <project default="usage" name="metrics-lib" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant"> - <property name="release.version" value="2.12.2-dev" /> + <property name="release.version" value="2.13.0" /> <property name="javadoc-title" value="Tor Metrics Library API Documentation"/> <property name="javadoc-excludes" value="**/impl/** **/index/** **/internal/** **/log/**" /> <property name="implementation-title" value="Tor Metrics Library" />

1 0

[metrics-lib/master] Prepare for 2.13.0 release.
by karsten＠torproject.org 16 May '20

16 May '20

commit 75fea1a658a5583503c0f0ffeb1aa51792de4807 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat May 16 17:31:59 2020 +0200 Prepare for 2.13.0 release. --- CHANGELOG.md | 3 ++- build.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ac7ef89..bddabeb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ -# Changes in version 2.13.0 - 2020-??-?? +# Changes in version 2.13.0 - 2020-05-16 * Medium changes + - Parse OnionPerf analysis results format version 2.0. - Extend Torperf results to provide partial download times for 10, 20, 50, 100, 200, and 500 KiB as well as 1, 2, and 5 MiB. diff --git a/build.xml b/build.xml index 978ed37..126be8e 100644 --- a/build.xml +++ b/build.xml @@ -7,7 +7,7 @@ <project default="usage" name="metrics-lib" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant"> - <property name="release.version" value="2.12.2-dev" /> + <property name="release.version" value="2.13.0" /> <property name="javadoc-title" value="Tor Metrics Library API Documentation"/> <property name="javadoc-excludes" value="**/impl/** **/index/** **/internal/** **/log/**" /> <property name="implementation-title" value="Tor Metrics Library" />

1 0

[metrics-lib/master] Support OnionPerf results files up to version 2.x.
by karsten＠torproject.org 16 May '20

16 May '20

commit 1e9fa02107a5442ffc5c9c4f6d85023b669adfed Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri May 15 12:26:28 2020 +0200 Support OnionPerf results files up to version 2.x. --- .../onionperf/OnionPerfAnalysisConverter.java | 4 ++-- .../resources/onionperf/onionperf.analysis.json.xz | Bin 17420 -> 17420 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/torproject/descriptor/onionperf/OnionPerfAnalysisConverter.java b/src/main/java/org/torproject/descriptor/onionperf/OnionPerfAnalysisConverter.java index 5e7e683..61fd173 100644 --- a/src/main/java/org/torproject/descriptor/onionperf/OnionPerfAnalysisConverter.java +++ b/src/main/java/org/torproject/descriptor/onionperf/OnionPerfAnalysisConverter.java @@ -109,9 +109,9 @@ public class OnionPerfAnalysisConverter { throw new DescriptorParseException("Parsed OnionPerf analysis file does " + "not contain version information."); } else if ((parsedOnionPerfAnalysis.version instanceof Double - && (double) parsedOnionPerfAnalysis.version > 1.999) + && (double) parsedOnionPerfAnalysis.version > 2.999) || (parsedOnionPerfAnalysis.version instanceof String - && !((String) parsedOnionPerfAnalysis.version).startsWith("1."))) { + && ((String) parsedOnionPerfAnalysis.version).compareTo("3.") >= 0)) { throw new DescriptorParseException("Parsed OnionPerf analysis file " + "contains unsupported version " + parsedOnionPerfAnalysis.version + "."); diff --git a/src/test/resources/onionperf/onionperf.analysis.json.xz b/src/test/resources/onionperf/onionperf.analysis.json.xz index 08162a1..2852c2c 100644 Binary files a/src/test/resources/onionperf/onionperf.analysis.json.xz and b/src/test/resources/onionperf/onionperf.analysis.json.xz differ

1 0

[translation/bridgedb_completed] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed
by translation＠torproject.org 16 May '20

16 May '20

commit 29fced0a1be0aaba72562a04e3b2a7d6fa512776 Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 16 14:45:21 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed --- pt_BR/LC_MESSAGES/bridgedb.po | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/pt_BR/LC_MESSAGES/bridgedb.po b/pt_BR/LC_MESSAGES/bridgedb.po index 160de254e2..ae767d92cb 100644 --- a/pt_BR/LC_MESSAGES/bridgedb.po +++ b/pt_BR/LC_MESSAGES/bridgedb.po @@ -28,14 +28,14 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" -"POT-Creation-Date: 2020-04-09 14:45-0700\n" -"PO-Revision-Date: 2020-04-29 13:39+0000\n" -"Last-Translator: drebs <drebs(a)riseup.net>\n" +"POT-Creation-Date: 2020-05-14 14:21-0700\n" +"PO-Revision-Date: 2020-05-16 14:42+0000\n" +"Last-Translator: Igor Bk 13 <igorgcoleto(a)gmail.com>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.7.0\n" +"Generated-By: Babel 2.8.0\n" "Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" @@ -99,31 +99,26 @@ msgstr "Mostrar Código QR" msgid "QRCode for your bridge lines" msgstr "Código QR para as suas pontes de conexão" -#. TRANSLATORS: Please translate this into some silly way to say -#. "There was a problem!" in your language. For example, -#. for Italian, you might translate this into "Mama mia!", -#. or for French: "Sacrebleu!". :) -#: bridgedb/distributors/https/templates/bridges.html:67 -#: bridgedb/distributors/https/templates/bridges.html:119 -msgid "Uh oh, spaghettios!" -msgstr "Ai, caramba!" - -#: bridgedb/distributors/https/templates/bridges.html:68 +#: bridgedb/distributors/https/templates/bridges.html:63 msgid "It seems there was an error getting your QRCode." msgstr "Parece que houve um erro ao obter o seu Código QR." -#: bridgedb/distributors/https/templates/bridges.html:73 +#: bridgedb/distributors/https/templates/bridges.html:68 msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." msgstr "Este Código QR contém as suas pontes de conexão. Escaneie com um leitor de Código QR para copiar as pontes de conexão para dispositivos móveis e outros aparelhos." -#: bridgedb/distributors/https/templates/bridges.html:125 +#: bridgedb/distributors/https/templates/bridges.html:110 +msgid "BridgeDB encountered an error." +msgstr "" + +#: bridgedb/distributors/https/templates/bridges.html:116 msgid "There currently aren't any bridges available..." msgstr "Atualmente não há nenhuma ponte disponível..." -#: bridgedb/distributors/https/templates/bridges.html:127 -#: bridgedb/distributors/https/templates/bridges.html:131 +#: bridgedb/distributors/https/templates/bridges.html:118 +#: bridgedb/distributors/https/templates/bridges.html:122 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge "

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 16 May '20

16 May '20

commit 5b67afb4f0f033ec1210988c4fa71598fc6b360f Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 16 14:45:14 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- pt_BR/LC_MESSAGES/bridgedb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt_BR/LC_MESSAGES/bridgedb.po b/pt_BR/LC_MESSAGES/bridgedb.po index 163127822f..b4ac03c5b4 100644 --- a/pt_BR/LC_MESSAGES/bridgedb.po +++ b/pt_BR/LC_MESSAGES/bridgedb.po @@ -29,8 +29,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-05-14 14:21-0700\n" -"PO-Revision-Date: 2020-05-15 08:24+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2020-05-16 14:42+0000\n" +"Last-Translator: Igor Bk 13 <igorgcoleto(a)gmail.com>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -111,7 +111,7 @@ msgstr "Este Código QR contém as suas pontes de conexão. Escaneie com um leit #: bridgedb/distributors/https/templates/bridges.html:110 msgid "BridgeDB encountered an error." -msgstr "" +msgstr "BridgeDB encontrou um erro." #: bridgedb/distributors/https/templates/bridges.html:116 msgid "There currently aren't any bridges available..."

1 0

[onionperf/master] Update analysis results file version to 2.0.
by karsten＠torproject.org 16 May '20

16 May '20

commit d3dfb5b2deccb4ff057f89a5c209050e2c69c1dc Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu May 14 21:40:20 2020 +0200 Update analysis results file version to 2.0. Implements #34224. --- README_JSON.md | 4 +++- onionperf/analysis.py | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/README_JSON.md b/README_JSON.md index d057bb1..f0ad281 100644 --- a/README_JSON.md +++ b/README_JSON.md @@ -207,5 +207,7 @@ The structure is given here with variable keys marked as such. } } } - } + }, + "type": "onionperf", # document type + "version": "2.0" # document version } diff --git a/onionperf/analysis.py b/onionperf/analysis.py index 83f993d..a380027 100644 --- a/onionperf/analysis.py +++ b/onionperf/analysis.py @@ -37,7 +37,7 @@ class Analysis(object): self.nickname = nickname self.measurement_ip = ip_address self.hostname = gethostname().split('.')[0] - self.json_db = {'type':'onionperf', 'version':1.0, 'data':{}} + self.json_db = {'type':'onionperf', 'version':'2.0', 'data':{}} self.tgen_filepaths = [] self.torctl_filepaths = [] self.date_filter = None @@ -102,7 +102,7 @@ class Analysis(object): else: self.json_db['data'][nickname] = analysis.json_db['data'][nickname] - def save(self, filename=None, output_prefix=os.getcwd(), do_compress=True, version=1.0): + def save(self, filename=None, output_prefix=os.getcwd(), do_compress=True): if filename is None: if self.date_filter is None: filename = "onionperf.analysis.json.xz" @@ -122,7 +122,7 @@ class Analysis(object): logging.info("done!") @classmethod - def load(cls, filename="onionperf.analysis.json.xz", input_prefix=os.getcwd(), version=1.0): + def load(cls, filename="onionperf.analysis.json.xz", input_prefix=os.getcwd()): filepath = os.path.abspath(os.path.expanduser("{0}".format(filename))) if not os.path.exists(filepath): filepath = os.path.abspath(os.path.expanduser("{0}/{1}".format(input_prefix, filename))) @@ -142,7 +142,7 @@ class Analysis(object): if 'type' not in db or 'version' not in db: logging.warning("'type' or 'version' not present in database") return None - elif db['type'] != 'onionperf' or db['version'] != 1.0: + elif db['type'] != 'onionperf' or str(db['version']) >= '3.': logging.warning("type or version not supported (type={0}, version={1})".format(db['type'], db['version'])) return None else:

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 16 May '20

16 May '20

commit c8f5abe75e978515135cf86ad14efbe1253dee1f Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 16 09:15:13 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- hu/LC_MESSAGES/bridgedb.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hu/LC_MESSAGES/bridgedb.po b/hu/LC_MESSAGES/bridgedb.po index a5adef4496..ab45e2c952 100644 --- a/hu/LC_MESSAGES/bridgedb.po +++ b/hu/LC_MESSAGES/bridgedb.po @@ -15,8 +15,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-05-14 14:21-0700\n" -"PO-Revision-Date: 2020-05-15 08:24+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2020-05-16 09:14+0000\n" +"Last-Translator: vargaviktor <viktor.varga(a)gmail.com>\n" "Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -119,7 +119,7 @@ msgstr "Lépés %s1%s" #: bridgedb/distributors/https/templates/index.html:13 #, python-format msgid "Download %s Tor Browser %s" -msgstr "Letöltés %s Tor Browser %s" +msgstr "Letöltés %s Tor Böngésző %s" #: bridgedb/distributors/https/templates/index.html:25 #, python-format @@ -141,7 +141,7 @@ msgstr "Lépés %s3%s" #: bridgedb/distributors/https/templates/index.html:47 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "Most %s a hidak hozzáadása a Tor Browser-hez %s" +msgstr "Most %s a hidak hozzáadása a Tor Böngészőhöz %s" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks!

1 0

[translation/bridgedb_completed] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed
by translation＠torproject.org 16 May '20

16 May '20

commit 526db132a1a699f4352d9d5eaaa0040df10e5dee Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 16 00:15:18 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed --- tr/LC_MESSAGES/bridgedb.po | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/tr/LC_MESSAGES/bridgedb.po b/tr/LC_MESSAGES/bridgedb.po index 51b8c70d06..7303776225 100644 --- a/tr/LC_MESSAGES/bridgedb.po +++ b/tr/LC_MESSAGES/bridgedb.po @@ -27,14 +27,14 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" -"POT-Creation-Date: 2020-04-09 14:45-0700\n" -"PO-Revision-Date: 2020-04-29 07:24+0000\n" +"POT-Creation-Date: 2020-05-14 14:21-0700\n" +"PO-Revision-Date: 2020-05-16 00:11+0000\n" "Last-Translator: Kaya Zeren <kayazeren(a)gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.7.0\n" +"Generated-By: Babel 2.8.0\n" "Language: tr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" @@ -98,31 +98,26 @@ msgstr "QR Kodunu Görüntüle" msgid "QRCode for your bridge lines" msgstr "Köprü satırlarınızın QR Kodu" -#. TRANSLATORS: Please translate this into some silly way to say -#. "There was a problem!" in your language. For example, -#. for Italian, you might translate this into "Mama mia!", -#. or for French: "Sacrebleu!". :) -#: bridgedb/distributors/https/templates/bridges.html:67 -#: bridgedb/distributors/https/templates/bridges.html:119 -msgid "Uh oh, spaghettios!" -msgstr "Haydi hayırlısı!" - -#: bridgedb/distributors/https/templates/bridges.html:68 +#: bridgedb/distributors/https/templates/bridges.html:63 msgid "It seems there was an error getting your QRCode." msgstr "QR Kodunuzun alınmasında bir sorun çıkmış gibi görünüyor." -#: bridgedb/distributors/https/templates/bridges.html:73 +#: bridgedb/distributors/https/templates/bridges.html:68 msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." msgstr "Bu QR Kodunda köprü satırlarınız bulunuyor. Köprü satırlarınızı bir mobil aygıta ya da başka aygıtlara kopyalamak için bu kodu bir QR Kodu tarayıcısına okutun." -#: bridgedb/distributors/https/templates/bridges.html:125 +#: bridgedb/distributors/https/templates/bridges.html:110 +msgid "BridgeDB encountered an error." +msgstr "BridgeDB ile ilgili bir sorun çıktı." + +#: bridgedb/distributors/https/templates/bridges.html:116 msgid "There currently aren't any bridges available..." msgstr "Şu anda kullanılabilecek bir köprü yok..." -#: bridgedb/distributors/https/templates/bridges.html:127 -#: bridgedb/distributors/https/templates/bridges.html:131 +#: bridgedb/distributors/https/templates/bridges.html:118 +#: bridgedb/distributors/https/templates/bridges.html:122 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge "

1 0