December 2019 - tor-commits - lists.torproject.org

[translation/tpo-web_completed] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed
by translation＠torproject.org 06 Dec '19

06 Dec '19

commit 4d0d695217457f574ec46f1df0ecd1fb3f391f7d Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 6 11:23:09 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed --- contents+pt-BR.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index 132b13cd5f..2042065275 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -14,7 +14,7 @@ # m tk, 2019 # Alexei Gonçalves de Oliveira <alexis(a)gessicahellmann.com>, 2019 # Communia <ameaneantie(a)riseup.net>, 2019 -# Chacal E., 2019 +# C. E., 2019 # blueboy, 2019 # Eduardo Addad de Oliveira <eduardoaddad(a)hotmail.com>, 2019 #

1 0

[translation/tbmanual-contentspot_completed] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot_completed
by translation＠torproject.org 06 Dec '19

06 Dec '19

commit 7ed2a843f514a0c5342ec266591d1668707c7746 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 6 11:20:17 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspo… --- contents+pt-BR.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index c26f6fa5bd..1a31b35f8f 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -5,7 +5,7 @@ # erinm, 2019 # blueboy, 2019 # Anderson Santos <anderson.jms94(a)hotmail.com>, 2019 -# Chacal E., 2019 +# C. E., 2019 # Eduardo Addad de Oliveira <eduardoaddad(a)hotmail.com>, 2019 # m tk, 2019 # Caio Volpato <caio.volpato(a)riseup.net>, 2019

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 06 Dec '19

06 Dec '19

commit e1edec5f1af3487289c3d2d60bbffcb3f797863f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 6 11:18:37 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- pt_BR.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt_BR.po b/pt_BR.po index 297da586b6..be02f0ac00 100644 --- a/pt_BR.po +++ b/pt_BR.po @@ -6,8 +6,8 @@ # Alexei Gonçalves de Oliveira <alexis(a)gessicahellmann.com>, 2018 # Communia <ameaneantie(a)riseup.net>, 2013-2018 # carlo giusepe tadei valente sasaki <carlo.gt.valente(a)gmail.com>, 2014 -# Chacal E., 2019 -# Chacal E., 2019 +# C. E., 2019 +# C. E., 2019 # Danton Medrado, 2015 # d fau <diegofauser(a)gmail.com>, 2019 # Eduardo Addad de Oliveira <eduardoaddad(a)hotmail.com>, 2018-2019

1 0

[metrics-web/master] Update news.json to version 356 of doc/MetricsTimeline.
by karsten＠torproject.org 06 Dec '19

06 Dec '19

commit 36db10088331b7522e76f51e5e16793a5af32706 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Dec 6 11:56:21 2019 +0100 Update news.json to version 356 of doc/MetricsTimeline. --- src/main/resources/web/json/news.json | 49 +++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/src/main/resources/web/json/news.json b/src/main/resources/web/json/news.json index 1c07ca4..8f0a4ae 100644 --- a/src/main/resources/web/json/news.json +++ b/src/main/resources/web/json/news.json @@ -3959,6 +3959,55 @@ "target" : "https://bugs.torproject.org/32129#comment:5" } ] }, { + "start" : "2019-11-13", + "protocols" : [ "snowflake" ], + "short_description" : "Restarted the broker with a new proxy–broker protocol.", + "description" : "Restarted the broker with a new proxy–broker protocol.", + "links" : [ { + "label" : "comment", + "target" : "https://bugs.torproject.org/29207#comment:31" + } ] +}, { + "start" : "2019-11-13", + "protocols" : [ "snowflake" ], + "short_description" : "Released version 0.1.0 of the Snowflake extension for Firefox and Chrome, using a new proxy–broker protocol.", + "description" : "Released version 0.1.0 of the Snowflake extension for Firefox and Chrome, using a new proxy–broker protocol.", + "links" : [ { + "label" : "comment", + "target" : "https://bugs.torproject.org/29207#comment:32" + } ] +}, { + "start" : "2019-11-14", + "protocols" : [ "snowflake" ], + "short_description" : "Deployed webext-0.1.0 of the Snowflake proxy", + "description" : "Deployed webext-0.1.0 of the Snowflake proxy (which uses a new proxy–broker protocol) to snowflake.torproject.org.", + "links" : [ { + "label" : "comment", + "target" : "https://bugs.torproject.org/29207#comment:34" + } ] +}, { + "start" : "2019-11-14", + "protocols" : [ "snowflake", "ipv6" ], + "short_description" : "Changed DNS to point to the IPv6-enabled Snowflake broker.", + "description" : "Changed DNS to point to the IPv6-enabled Snowflake broker.", + "links" : [ { + "label" : "comment", + "target" : "https://bugs.torproject.org/29258#comment:16" + } ] +}, { + "start" : "2019-11-16", + "end" : "2019-11-23", + "places" : [ "ir" ], + "short_description" : "Internet blackout in Iran.", + "description" : "Internet blackout in Iran.", + "links" : [ { + "label" : "report", + "target" : "https://ooni.org/post/2019-iran-internet-blackout/" + }, { + "label" : "NTC thread", + "target" : "https://ntc.party/t/a-new-kind-of-censoship-in-iran/237" + } ] +}, { "start" : "2014-06-01", "end" : "2014-06-19", "places" : [ "ru" ],

1 0

[onionoo/master] Bump version to 7.0-1.23.0-dev.
by karsten＠torproject.org 06 Dec '19

06 Dec '19

commit a1ee6e9cffafb30f43bf0e615ea316e4a8affc02 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Dec 6 11:39:49 2019 +0100 Bump version to 7.0-1.23.0-dev. --- CHANGELOG.md | 3 +++ build.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a635f4..d34453a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# Changes in version 7.0-1.2?.? - 20??-??-?? + + # Changes in version 7.0-1.23.0 - 2019-12-06 * Medium changes diff --git a/build.xml b/build.xml index 85212e5..c8e336a 100644 --- a/build.xml +++ b/build.xml @@ -11,7 +11,7 @@ <property name="implementation-title" value="Onionoo" /> <property name="onionoo.protocol.version" value="7.0"/> <property name="release.version" - value="${onionoo.protocol.version}-1.23.0"/> + value="${onionoo.protocol.version}-1.23.0-dev"/> <property name="metricslibversion" value="2.9.1"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile"

1 0

[onionoo/release] Bump version to 7.0-1.22.0-dev.
by karsten＠torproject.org 06 Dec '19

06 Dec '19

commit d541382053582f32758c9773659aac468a574cbc Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Nov 28 10:19:43 2019 +0100 Bump version to 7.0-1.22.0-dev. --- CHANGELOG.md | 3 +++ build.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e5683ca..6060551 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# Changes in version 7.0-1.2?.? - 2019-1?-?? + + # Changes in version 7.0-1.22.0 - 2019-11-28 * Medium changes diff --git a/build.xml b/build.xml index a0c856d..c3c8838 100644 --- a/build.xml +++ b/build.xml @@ -11,7 +11,7 @@ <property name="implementation-title" value="Onionoo" /> <property name="onionoo.protocol.version" value="7.0"/> <property name="release.version" - value="${onionoo.protocol.version}-1.22.0"/> + value="${onionoo.protocol.version}-1.22.0-dev"/> <property name="metricslibversion" value="2.9.1"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile"

1 0

[onionoo/release] Only write changed status and document files.
by karsten＠torproject.org 06 Dec '19

06 Dec '19

commit 4b7b13d37d2423f9b1dee865e203a524b8df488b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Dec 5 17:03:02 2019 +0100 Only write changed status and document files. Fixes #32660. --- CHANGELOG.md | 4 ++++ .../metrics/onionoo/docs/DocumentStore.java | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6060551..cd27f30 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changes in version 7.0-1.2?.? - 2019-1?-?? + * Medium changes + - Only write status files and document files if their content has + changed. + # Changes in version 7.0-1.22.0 - 2019-11-28 diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java b/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java index 81b428a..ea7786e 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java @@ -8,6 +8,7 @@ import org.torproject.metrics.onionoo.util.FormattingUtils; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.commons.codec.digest.DigestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -20,7 +21,9 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.FileReader; import java.io.IOException; +import java.io.InputStream; import java.nio.charset.StandardCharsets; +import java.nio.file.Files; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -59,6 +62,10 @@ public class DocumentStore { private long storedBytes = 0L; + private long unchangedFiles = 0L; + + private long unchangedBytes = 0L; + private long retrievedFiles = 0L; private long retrievedBytes = 0L; @@ -351,6 +358,17 @@ public class DocumentStore { documentString.length()); } documentFile.getParentFile().mkdirs(); + if (documentFile.exists()) { + try (InputStream stream = Files.newInputStream(documentFile.toPath())) { + String existingFileDigest = DigestUtils.sha256Hex(stream); + String newFileDigest = DigestUtils.sha256Hex(documentString); + if (existingFileDigest.equals(newFileDigest)) { + this.unchangedFiles++; + this.unchangedBytes += documentString.length(); + return true; + } + } + } File documentTempFile = new File( documentFile.getAbsolutePath() + ".tmp"); writeToFile(documentTempFile, documentString); @@ -820,6 +838,8 @@ public class DocumentStore { + " %s files listed\n" + " %s files stored\n" + " %s stored\n" + + " %s files not rewritten\n" + + " %s not rewritten\n" + " %s files retrieved\n" + " %s retrieved\n" + " %s files removed\n", @@ -827,6 +847,8 @@ public class DocumentStore { FormattingUtils.formatDecimalNumber(listedFiles), FormattingUtils.formatDecimalNumber(storedFiles), FormattingUtils.formatBytes(storedBytes), + FormattingUtils.formatDecimalNumber(unchangedFiles), + FormattingUtils.formatBytes(unchangedBytes), FormattingUtils.formatDecimalNumber(retrievedFiles), FormattingUtils.formatBytes(retrievedBytes), FormattingUtils.formatDecimalNumber(removedFiles));

1 0

[onionoo/release] Prepare for 7.0-1.23.0 release.
by karsten＠torproject.org 06 Dec '19

06 Dec '19

commit 596f2cbf732d6b0cbcda22e26809c3038137d1cd Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Dec 6 08:48:51 2019 +0100 Prepare for 7.0-1.23.0 release. --- CHANGELOG.md | 2 +- build.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd27f30..0a635f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 7.0-1.2?.? - 2019-1?-?? +# Changes in version 7.0-1.23.0 - 2019-12-06 * Medium changes - Only write status files and document files if their content has diff --git a/build.xml b/build.xml index c3c8838..85212e5 100644 --- a/build.xml +++ b/build.xml @@ -11,7 +11,7 @@ <property name="implementation-title" value="Onionoo" /> <property name="onionoo.protocol.version" value="7.0"/> <property name="release.version" - value="${onionoo.protocol.version}-1.22.0-dev"/> + value="${onionoo.protocol.version}-1.23.0"/> <property name="metricslibversion" value="2.9.1"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile"

1 0

[onionoo/master] Prepare for 7.0-1.23.0 release.
by karsten＠torproject.org 06 Dec '19

06 Dec '19

commit 596f2cbf732d6b0cbcda22e26809c3038137d1cd Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Dec 6 08:48:51 2019 +0100 Prepare for 7.0-1.23.0 release. --- CHANGELOG.md | 2 +- build.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd27f30..0a635f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 7.0-1.2?.? - 2019-1?-?? +# Changes in version 7.0-1.23.0 - 2019-12-06 * Medium changes - Only write status files and document files if their content has diff --git a/build.xml b/build.xml index c3c8838..85212e5 100644 --- a/build.xml +++ b/build.xml @@ -11,7 +11,7 @@ <property name="implementation-title" value="Onionoo" /> <property name="onionoo.protocol.version" value="7.0"/> <property name="release.version" - value="${onionoo.protocol.version}-1.22.0-dev"/> + value="${onionoo.protocol.version}-1.23.0"/> <property name="metricslibversion" value="2.9.1"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile"

1 0

[onionoo/master] Only write changed status and document files.
by karsten＠torproject.org 06 Dec '19

06 Dec '19

commit 4b7b13d37d2423f9b1dee865e203a524b8df488b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Dec 5 17:03:02 2019 +0100 Only write changed status and document files. Fixes #32660. --- CHANGELOG.md | 4 ++++ .../metrics/onionoo/docs/DocumentStore.java | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6060551..cd27f30 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changes in version 7.0-1.2?.? - 2019-1?-?? + * Medium changes + - Only write status files and document files if their content has + changed. + # Changes in version 7.0-1.22.0 - 2019-11-28 diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java b/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java index 81b428a..ea7786e 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java @@ -8,6 +8,7 @@ import org.torproject.metrics.onionoo.util.FormattingUtils; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.commons.codec.digest.DigestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -20,7 +21,9 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.FileReader; import java.io.IOException; +import java.io.InputStream; import java.nio.charset.StandardCharsets; +import java.nio.file.Files; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -59,6 +62,10 @@ public class DocumentStore { private long storedBytes = 0L; + private long unchangedFiles = 0L; + + private long unchangedBytes = 0L; + private long retrievedFiles = 0L; private long retrievedBytes = 0L; @@ -351,6 +358,17 @@ public class DocumentStore { documentString.length()); } documentFile.getParentFile().mkdirs(); + if (documentFile.exists()) { + try (InputStream stream = Files.newInputStream(documentFile.toPath())) { + String existingFileDigest = DigestUtils.sha256Hex(stream); + String newFileDigest = DigestUtils.sha256Hex(documentString); + if (existingFileDigest.equals(newFileDigest)) { + this.unchangedFiles++; + this.unchangedBytes += documentString.length(); + return true; + } + } + } File documentTempFile = new File( documentFile.getAbsolutePath() + ".tmp"); writeToFile(documentTempFile, documentString); @@ -820,6 +838,8 @@ public class DocumentStore { + " %s files listed\n" + " %s files stored\n" + " %s stored\n" + + " %s files not rewritten\n" + + " %s not rewritten\n" + " %s files retrieved\n" + " %s retrieved\n" + " %s files removed\n", @@ -827,6 +847,8 @@ public class DocumentStore { FormattingUtils.formatDecimalNumber(listedFiles), FormattingUtils.formatDecimalNumber(storedFiles), FormattingUtils.formatBytes(storedBytes), + FormattingUtils.formatDecimalNumber(unchangedFiles), + FormattingUtils.formatBytes(unchangedBytes), FormattingUtils.formatDecimalNumber(retrievedFiles), FormattingUtils.formatBytes(retrievedBytes), FormattingUtils.formatDecimalNumber(removedFiles));

1 0