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

[tor-messenger-build/master] Update changelog for 2e659c6
by arlo＠torproject.org 10 Oct '17

10 Oct '17

commit a7a08dd0a3b84e7576632b5182543c7718ff47a5 Author: Arlo Breault <arlolra(a)gmail.com> Date: Tue Oct 10 11:38:42 2017 -0400 Update changelog for 2e659c6 --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index dff691d..a0da311 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ Tor Messenger 0.5.0b2 -- * All Platforms + * Linux + * Trac 23806: libotr.so and libgcrypt.so are using RPATH Tor Messenger 0.5.0b1 -- September 28, 2017 * All Platforms

1 0

[tor-messenger-build/master] Bug 23806: link statically libgcrypt and libgpg-error on Linux
by arlo＠torproject.org 10 Oct '17

10 Oct '17

commit 2e659c634527a8cd970eba670b4079d0fd91d345 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Oct 10 01:37:51 2017 +0200 Bug 23806: link statically libgcrypt and libgpg-error on Linux Link statically libgcrypt and libgpg-error in libotr to avoid RPATH issue. --- projects/ctypes-otr/build | 5 ----- projects/ctypes-otr/config | 4 ---- projects/libgcrypt/build | 2 +- projects/libgpg-error/build | 2 +- 4 files changed, 2 insertions(+), 11 deletions(-) diff --git a/projects/ctypes-otr/build b/projects/ctypes-otr/build index fa60e7f..9ccb0c4 100644 --- a/projects/ctypes-otr/build +++ b/projects/ctypes-otr/build @@ -7,11 +7,6 @@ mv libotr/[% c('var/lib_glob') %] [% project %]-[% c('version') %]/chrome/conten [% IF c('var/windows') -%] mv -f [% project %]-[% c('version') %]/chrome/content/libotr-*.dll \ [% project %]-[% c('version') %]/chrome/content/otr.dll -[% ELSIF c('var/linux') -%] -tar xf [% c('input_files_by_name/libgcrypt') %] -mv libgcrypt/[% c('var/lib_glob') %] [% project %]-[% c('version') %]/chrome/content/ -tar xf [% c('input_files_by_name/libgpg-error') %] -mv libgpg-error/[% c('var/lib_glob') %] [% project %]-[% c('version') %]/chrome/content/ [% END -%] [% SET src_dir=project _ '-' _ c('version'); c('tar', { diff --git a/projects/ctypes-otr/config b/projects/ctypes-otr/config index 9c4482d..a3feb2a 100644 --- a/projects/ctypes-otr/config +++ b/projects/ctypes-otr/config @@ -19,7 +19,3 @@ targets: input_files: - name: libotr project: libotr - - name: libgcrypt - project: libgcrypt - - name: libgpg-error - project: libgpg-error diff --git a/projects/libgcrypt/build b/projects/libgcrypt/build index d5e1848..2dacc26 100644 --- a/projects/libgcrypt/build +++ b/projects/libgcrypt/build @@ -13,7 +13,7 @@ tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.bz2 cd /var/tmp/build/[% project %]-[% c('version') %] sed -i 's/^BUILD_TIMESTAMP=.*/BUILD_TIMESTAMP=2000-01-01T00:00+0000/' configure export SOURCE_DATE_EPOCH=$(stat -c %Y ChangeLog) -./configure --prefix=$distdir [% c("var/configure_opt") %][% IF c('var/windows') or c('var/osx') %] --enable-static --disable-shared[% END %] +./configure --prefix=$distdir [% c("var/configure_opt") %] --enable-static --disable-shared [% IF c("var/osx") -%] export LD_PRELOAD=[% c("var/faketime_path") %] export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" diff --git a/projects/libgpg-error/build b/projects/libgpg-error/build index e2680eb..ca07a05 100644 --- a/projects/libgpg-error/build +++ b/projects/libgpg-error/build @@ -12,7 +12,7 @@ cp $rootdir/lock-obj-pub.x86_64-apple-darwin14.0.0.h src/syscfg/lock-obj-pub.dar echo 'int main() {}' > src/gen-posix-lock-obj.c [% END -%] export SOURCE_DATE_EPOCH=$(stat -c %Y ChangeLog) -./configure --prefix="$distdir" [% c("var/configure_opt") %][% IF c('var/windows') or c('var/osx') %] --enable-static --disable-shared[% END %] +./configure --prefix="$distdir" [% c("var/configure_opt") %] --enable-static --disable-shared [% IF c("var/osx") -%] export LD_PRELOAD=[% c("var/faketime_path") %] export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]"

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 10 Oct '17

10 Oct '17

commit 3a1af3c4133af24a8e34e02ffb2466df8f539951 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 10 15:16:21 2017 +0000 Update translations for torbirdy --- ta/torbirdy.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ta/torbirdy.properties b/ta/torbirdy.properties index d8f371ae4..208cacc3a 100644 --- a/ta/torbirdy.properties +++ b/ta/torbirdy.properties @@ -8,7 +8,7 @@ torbirdy.enabled.whonix=TorBirdy Enabled: Whonix torbirdy.disabled=TorBirdy: செயல்நீக்கப்பட்டது! torbirdy.enabled=TorBirdy: Enabled -torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually. +torbirdy.email.prompt=உங்களுடைய அடையாளமறியாதன்மையை பாதுகாக்க Thunderbird-நினுடைய தானியங்கி-கட்டமைப்பு வழிகாட்டியை TorBirdy செயல்நீக்கிவிட்டது.\n\n%S -க்கான பரிந்துரைக்கப்பட்ட பாதுகாப்பு அமைப்புகள் அமைக்கப்பட்டது.\n\nநீங்கள் தற்போது மற்ற கணக்கு அமைப்புகளை தாங்களாகவே கட்டமைக்கலாம். torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing. torbirdy.email.advanced.nextwarning=Show this warning next time

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 10 Oct '17

10 Oct '17

commit 2c9d4e6fb11b0071471faf92d58b78f7a5b76e90 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 10 14:46:19 2017 +0000 Update translations for torbirdy --- ta/torbirdy.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ta/torbirdy.properties b/ta/torbirdy.properties index 4f645eba2..d8f371ae4 100644 --- a/ta/torbirdy.properties +++ b/ta/torbirdy.properties @@ -1,11 +1,11 @@ torbirdy.name=TorBirdy -torbirdy.enabled.tor=TorBirdy Enabled: Tor -torbirdy.enabled.jondo=TorBirdy Enabled: JonDo -torbirdy.enabled.custom=TorBirdy Enabled: Custom Proxy -torbirdy.enabled.torification=TorBirdy Enabled: Transparent Torification +torbirdy.enabled.tor=TorBirdy செயலாக்கப்பட்டது: Tor +torbirdy.enabled.jondo=TorBirdy செயலாக்கப்பட்டது: JonDo +torbirdy.enabled.custom=TorBirdy செயலாக்கப்பட்டது: வழக்கமாக்கப்பட்ட Proxy +torbirdy.enabled.torification=TorBirdy செயலாக்கப்பட்டது: கண்கூடான Tor-ஆக்கம் torbirdy.enabled.whonix=TorBirdy Enabled: Whonix -torbirdy.disabled=TorBirdy: Disabled! +torbirdy.disabled=TorBirdy: செயல்நீக்கப்பட்டது! torbirdy.enabled=TorBirdy: Enabled torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually.

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 10 Oct '17

10 Oct '17

commit 8f23edc80f18341680dd1754b8bc1081194b11ea Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 10 13:45:55 2017 +0000 Update translations for https_everywhere_completed --- fr_CA/https-everywhere.dtd | 1 + 1 file changed, 1 insertion(+) diff --git a/fr_CA/https-everywhere.dtd b/fr_CA/https-everywhere.dtd index 394cd6ad9..9d7918bca 100644 --- a/fr_CA/https-everywhere.dtd +++ b/fr_CA/https-everywhere.dtd @@ -11,6 +11,7 @@ <!ENTITY https-everywhere.menu.showCounter "Afficher le compteur"> <!ENTITY https-everywhere.menu.viewAllRules "Visualiser toutes les règles"> +<!ENTITY https-everywhere.options.generalSettings "Paramètres généraux"> <!ENTITY https-everywhere.options.importSettings "Importer les paramètres"> <!ENTITY https-everywhere.options.import "Importer"> <!ENTITY https-everywhere.options.imported "Vos paramètres ont été importés.">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 10 Oct '17

10 Oct '17

commit 41eeadb4a7b8e447568b221c2928df05df07090d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 10 13:45:42 2017 +0000 Update translations for https_everywhere --- fr_CA/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr_CA/https-everywhere.dtd b/fr_CA/https-everywhere.dtd index bbd2b1756..9d7918bca 100644 --- a/fr_CA/https-everywhere.dtd +++ b/fr_CA/https-everywhere.dtd @@ -11,7 +11,7 @@ <!ENTITY https-everywhere.menu.showCounter "Afficher le compteur"> <!ENTITY https-everywhere.menu.viewAllRules "Visualiser toutes les règles"> -<!ENTITY https-everywhere.options.generalSettings "General Settings"> +<!ENTITY https-everywhere.options.generalSettings "Paramètres généraux"> <!ENTITY https-everywhere.options.importSettings "Importer les paramètres"> <!ENTITY https-everywhere.options.import "Importer"> <!ENTITY https-everywhere.options.imported "Vos paramètres ont été importés.">

1 0

[metrics-web/master] Update news.json to version 151 of doc/MetricsTimeline.
by karsten＠torproject.org 10 Oct '17

10 Oct '17

commit 84ec8aecfe67f61761bd6870fae537a42f54ad02 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Oct 10 14:27:55 2017 +0200 Update news.json to version 151 of doc/MetricsTimeline. --- website/src/main/resources/etc/news.json | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/website/src/main/resources/etc/news.json b/website/src/main/resources/etc/news.json index a711924..91738ae 100644 --- a/website/src/main/resources/etc/news.json +++ b/website/src/main/resources/etc/news.json @@ -1232,6 +1232,16 @@ ] }, { + "start": "2017-08-10", + "end": "2017-08-11", + "description": "Outage of the op-hk OnionPerf instance. Reported timeouts on the tor network increased, download speed improved.", + "links": [ + "<a href=\"https://metrics.torproject.org/torperf.html?start=2017-07-01&end=2017-10-09…">torperf graph</a>", + "<a href=\"https://metrics.torproject.org/torperf-failures.html?start=2017-07-11&end=2…">torperf-failures graph</a>", + "<a href=\"https://metrics.torproject.org/torperf.html?start=2017-07-01&end=2017-10-09…">op-hk graph</a>" + ] + }, + { "start": "2017-08-14", "end": "2017-08-15", "protocols": [ @@ -1280,6 +1290,16 @@ ] }, { + "start": "2017-09-15", + "description": "Outage of the op-hk OnionPerf instance. Reported timeouts on the tor network increased, download speed improved.", + "links": [ + "<a href=\"https://lists.torproject.org/pipermail/metrics-team/2017-October/000476.htm…">mailing list post</a>", + "<a href=\"https://metrics.torproject.org/torperf.html?start=2017-07-01&end=2017-10-09…">torperf graph</a>", + "<a href=\"https://metrics.torproject.org/torperf-failures.html?start=2017-07-11&end=2…">torperf-failures graph</a>", + "<a href=\"https://metrics.torproject.org/torperf.html?start=2017-07-01&end=2017-10-09…">op-hk graph</a>" + ] + }, + { "start": "2016-02-24", "places": [ "tm" @@ -1732,13 +1752,5 @@ "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-07-0…">tr graph</a>" ], "unknown": true - }, - { - "start": "2017-09-15", - "description": "timeouts on the tor network increased, download speed improved", - "links": [ - "<a href=\"https://twitter.com/nusenu_/status/916453594517434368\">tweet</a>" - ], - "unknown": true } ]

1 0

[metrics-web/master] Document build_revision fields in CollecTor/Onionoo.
by karsten＠torproject.org 10 Oct '17

10 Oct '17

commit c1c2f3baebba2054d29b0e59301f3233928602a3 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Oct 9 17:28:49 2017 +0200 Document build_revision fields in CollecTor/Onionoo. --- website/src/main/resources/web/WEB-INF/collector.jsp | 1 + website/src/main/resources/web/WEB-INF/onionoo.jsp | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/website/src/main/resources/web/WEB-INF/collector.jsp b/website/src/main/resources/web/WEB-INF/collector.jsp index 871415c..92f6c7c 100644 --- a/website/src/main/resources/web/WEB-INF/collector.jsp +++ b/website/src/main/resources/web/WEB-INF/collector.jsp @@ -734,6 +734,7 @@ Index files use the following custom JSON data format that might still be extend <li>Index object: At the document root there is always an index object with the following fields: <ul> <li><code>"index_created"</code>: Timestamp when this index was created using pattern <code>"YYYY-MM-DD HH:MM"</code> in the UTC timezone.</li> +<li><code>"build_revision"</code>: Git revision of the CollecTor instance's software used to create this file, which will be omitted if unknown.</li> <li><code>"path"</code>: Base URL of this index file and all included resources.</li> <li><code>"files"</code>: List of file objects of files available from the document root, which will be omitted if empty. <li><code>"directories"</code>: List of directory objects of directories available from the document root, which will be omitted if empty.</li> diff --git a/website/src/main/resources/web/WEB-INF/onionoo.jsp b/website/src/main/resources/web/WEB-INF/onionoo.jsp index 4f4c68f..71f8336 100644 --- a/website/src/main/resources/web/WEB-INF/onionoo.jsp +++ b/website/src/main/resources/web/WEB-INF/onionoo.jsp @@ -230,6 +230,8 @@ February 28, 2017.</li> <li>4.1: Added "version" parameter and removed bridge clients objects' beta fields "countries", "transports", and "versions" on August 30, 2017.</li> +<li>4.2: Added "build_revision" field to response header +on October 10, 2017.</li> </ul> @@ -604,6 +606,17 @@ Omitted if no major protocol changes are planned. </li> <li> +build_revision new +<code class="typeof">string</code> +optional + +Git revision of the Onionoo instance's software used to write this +response, which will be omitted if unknown. +Added on October 10, 2017. + +</li> + +<li> relays_published <code class="typeof">string</code> required

1 0

[collector/release] Use metrics-lib's JSON handling classes.
by karsten＠torproject.org 10 Oct '17

10 Oct '17

commit d2677cba06aaa94f67a6645a1da20d96502e34ba Author: iwakeh <iwakeh(a)torproject.org> Date: Fri Aug 18 13:03:04 2017 +0000 Use metrics-lib's JSON handling classes. Implements task-23286 using metrics-lib-2.0.0 --- .../collector/index/CreateIndexJson.java | 86 ++++------------------ 1 file changed, 15 insertions(+), 71 deletions(-) diff --git a/src/main/java/org/torproject/collector/index/CreateIndexJson.java b/src/main/java/org/torproject/collector/index/CreateIndexJson.java index 4b1b8f0..4b55d51 100644 --- a/src/main/java/org/torproject/collector/index/CreateIndexJson.java +++ b/src/main/java/org/torproject/collector/index/CreateIndexJson.java @@ -7,29 +7,27 @@ import org.torproject.collector.conf.Configuration; import org.torproject.collector.conf.ConfigurationException; import org.torproject.collector.conf.Key; import org.torproject.collector.cron.CollecTorMain; +import org.torproject.descriptor.index.DirectoryNode; +import org.torproject.descriptor.index.FileNode; +import org.torproject.descriptor.index.FileType; +import org.torproject.descriptor.index.IndexNode; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream; -import org.apache.commons.compress.compressors.xz.XZCompressorOutputStream; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.BufferedWriter; import java.io.File; import java.io.FileOutputStream; -import java.io.FileWriter; -import java.io.IOException; import java.io.OutputStreamWriter; -import java.io.Writer; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Locale; import java.util.SortedSet; import java.util.TimeZone; import java.util.TreeSet; -import java.util.zip.GZIPOutputStream; /* Create a fresh index.json containing all directories and files in the * archive/ and recent/ directories. @@ -87,57 +85,6 @@ public class CreateIndexJson extends CollecTorMain { } } - private class DirectoryNode implements Comparable<DirectoryNode> { - String path; - SortedSet<FileNode> files; - SortedSet<DirectoryNode> directories; - - DirectoryNode(String path, SortedSet<FileNode> files, - SortedSet<DirectoryNode> directories) { - this.path = path; - this.files = files; - this.directories = directories; - } - - public int compareTo(DirectoryNode other) { - return this.path.compareTo(other.path); - } - } - - @SuppressWarnings({"checkstyle:membername", "checkstyle:parametername"}) - private class IndexNode { - String index_created; - String path; - SortedSet<FileNode> files; - SortedSet<DirectoryNode> directories; - - IndexNode(String index_created, String path, - SortedSet<FileNode> files, - SortedSet<DirectoryNode> directories) { - this.index_created = index_created; - this.path = path; - this.files = files; - this.directories = directories; - } - } - - @SuppressWarnings({"checkstyle:membername", "checkstyle:parametername"}) - private class FileNode implements Comparable<FileNode> { - String path; - long size; - String last_modified; - - FileNode(String path, long size, String last_modified) { - this.path = path; - this.size = size; - this.last_modified = last_modified; - } - - public int compareTo(FileNode other) { - return this.path.compareTo(other.path); - } - } - private static DateFormat dateTimeFormat; static { @@ -198,24 +145,21 @@ public class CreateIndexJson extends CollecTorMain { return fileNode; } - private void writeIndex(IndexNode indexNode) throws IOException { + private void writeIndex(IndexNode indexNode) throws Exception { indexJsonFile.getParentFile().mkdirs(); Gson gson = new GsonBuilder().create(); String indexNodeString = gson.toJson(indexNode); - Writer[] writers = new Writer[] { - new FileWriter(indexJsonFile), - new OutputStreamWriter(new GZIPOutputStream( - new FileOutputStream(indexJsonFile + ".gz"))), - new OutputStreamWriter(new XZCompressorOutputStream( - new FileOutputStream(indexJsonFile + ".xz"))), - new OutputStreamWriter(new BZip2CompressorOutputStream( - new FileOutputStream(indexJsonFile + ".bz2"))) - }; - for (Writer writer : writers) { - BufferedWriter bufferedWriter = new BufferedWriter(writer); - bufferedWriter.write(indexNodeString); - bufferedWriter.close(); + for (String filename : new String[] {indexJsonFile.toString(), + indexJsonFile + ".gz", indexJsonFile + ".xz", indexJsonFile + ".bz2"}) { + FileType type = FileType.valueOf( + filename.substring(filename.lastIndexOf(".") + 1).toUpperCase()); + try (BufferedWriter bufferedWriter + = new BufferedWriter(new OutputStreamWriter(type.outputStream( + new FileOutputStream(filename))))) { + bufferedWriter.write(indexNodeString); + } } } + }

1 0

[collector/release] Bump version to 1.2.1-dev.
by karsten＠torproject.org 10 Oct '17

10 Oct '17

commit d162d90299a1d27fc8750832b56e60f3a5c97b66 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Aug 18 15:03:03 2017 +0200 Bump version to 1.2.1-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index ec0eb41..279cd2f 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.2.1" /> + <property name="release.version" value="1.2.1-dev" /> <property name="project-main-class" value="org.torproject.collector.Main" /> <property name="name" value="collector"/> <property name="metricslibversion" value="2.0.0" />

1 0