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

[metrics-lib/release] Write build revision to index.json files.
by karsten＠torproject.org 10 Oct '17

10 Oct '17

commit 02ad9fcde0d48cdab7c8128b1193d5740ea97a99 Author: iwakeh <iwakeh(a)torproject.org> Date: Fri Sep 15 14:07:07 2017 +0000 Write build revision to index.json files. Implements part of task-21414. Adapt IndexNode to supply a revision. --- CHANGELOG.md | 7 ++++++ src/build | 2 +- .../org/torproject/descriptor/index/IndexNode.java | 26 +++++++++++++++++----- 3 files changed, 28 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c40c10..b7021d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# Changes in version 2.?.? - 2017-??-?? + + * Medium changes + - Add new optional "build_revision" field to index.json with the + Git revision supplied by the calling software. + + # Changes in version 2.1.0 - 2017-09-15 * Major changes diff --git a/src/build b/src/build index a64b94a..78e533f 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit a64b94a635e5396266d5c5b5cf88850b9f4b6a24 +Subproject commit 78e533fdc84e20769a8a155d1426cbea59c6e7cc diff --git a/src/main/java/org/torproject/descriptor/index/IndexNode.java b/src/main/java/org/torproject/descriptor/index/IndexNode.java index 516bbdf..8b61b75 100644 --- a/src/main/java/org/torproject/descriptor/index/IndexNode.java +++ b/src/main/java/org/torproject/descriptor/index/IndexNode.java @@ -46,6 +46,11 @@ public class IndexNode { @SerializedName("index_created") public final String created; + /** The software's build revision JSON as 'build_revision' field. */ + @Expose + @SerializedName("build_revision") + public final String revision; + /** Path (i.e. base url) is exposed in JSON. */ @Expose public final String path; @@ -60,20 +65,29 @@ public class IndexNode { /* Added to satisfy Gson. */ private IndexNode() { - created = null; - path = null; - files = null; - directories = null; + this.created = null; + this.revision = null; + this.path = null; + this.files = null; + this.directories = null; } - /** An index node is the top-level node in the JSON structure. */ + /** For backwards compatibility and testing. */ public IndexNode(String created, String path, SortedSet<FileNode> files, SortedSet<DirectoryNode> directories) { + this(created, null, path, files, directories); + } + + /** An index node is the top-level node in the JSON structure. */ + public IndexNode(String created, String revision, String path, + SortedSet<FileNode> files, + SortedSet<DirectoryNode> directories) { + this.created = created; + this.revision = revision; this.path = path; this.files = files; this.directories = directories; - this.created = created; } /**

1 0

[collector/master] Add the build revision to index.json files.
by karsten＠torproject.org 10 Oct '17

10 Oct '17

commit 0a586c0be0a3d3f399f550ec3929a04ad4c71904 Author: iwakeh <iwakeh(a)torproject.org> Date: Wed Sep 20 10:15:32 2017 +0000 Add the build revision to index.json files. Implements the final part of task-21414 for CollecTor. --- CHANGELOG.md | 5 +++++ build.xml | 2 +- src/build | 2 +- .../torproject/collector/index/CreateIndexJson.java | 18 +++++++++++++++++- 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0810fcf..4973f7e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,11 @@ - Add "Sync" as OnionPerfSource to synchronize .tpf files from other CollecTor instances. + * Medium changes + - Add new optional "build_revision" field to index.json with the + Git revision of the CollecTor instance's software used to create + this file, which will be omitted if unknown. + * Minor changes - Remove all styling resources (fonts, CSS, etc.) from directory listings. diff --git a/build.xml b/build.xml index 943c717..d60350b 100644 --- a/build.xml +++ b/build.xml @@ -11,7 +11,7 @@ <property name="release.version" value="1.3.0-dev" /> <property name="project-main-class" value="org.torproject.collector.Main" /> <property name="name" value="collector"/> - <property name="metricslibversion" value="2.1.0" /> + <property name="metricslibversion" value="2.1.1" /> <property name="jarincludes" value="collector.properties logback.xml" /> <patternset id="runtime" > diff --git a/src/build b/src/build index a64b94a..78e533f 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit a64b94a635e5396266d5c5b5cf88850b9f4b6a24 +Subproject commit 78e533fdc84e20769a8a155d1426cbea59c6e7cc diff --git a/src/main/java/org/torproject/collector/index/CreateIndexJson.java b/src/main/java/org/torproject/collector/index/CreateIndexJson.java index e10109b..5c4daf9 100644 --- a/src/main/java/org/torproject/collector/index/CreateIndexJson.java +++ b/src/main/java/org/torproject/collector/index/CreateIndexJson.java @@ -21,10 +21,12 @@ import org.slf4j.LoggerFactory; import java.io.BufferedWriter; import java.io.File; import java.io.FileOutputStream; +import java.io.InputStream; import java.io.OutputStreamWriter; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Locale; +import java.util.Properties; import java.util.SortedSet; import java.util.TimeZone; import java.util.TreeSet; @@ -53,10 +55,23 @@ public class CreateIndexJson extends CollecTorMain { private static final TimeZone dateTimezone = TimeZone.getTimeZone("UTC"); + private static String buildRevision = null; + /** Creates indexes of directories containing archived and recent * descriptors and write index files to disk. */ public CreateIndexJson(Configuration conf) { super(conf); + Properties buildProperties = new Properties(); + try (InputStream is = getClass().getClassLoader() + .getResourceAsStream("collector.buildrevision.properties")) { + buildProperties.load(is); + buildRevision = buildProperties.getProperty("collector.build.revision", + null); + } catch (Exception ex) { + // This doesn't hamper the index creation: only log a warning. + logger.warn("No build revision available.", ex); + buildRevision = null; + } } @Override @@ -107,7 +122,8 @@ public class CreateIndexJson extends CollecTorMain { } } return new IndexNode(dateTimeFormat.format( - System.currentTimeMillis()), basePath, null, directoryNodes); + System.currentTimeMillis()), buildRevision, basePath, null, + directoryNodes); } private DirectoryNode indexDirectory(File directory) {

1 0

[collector/master] Prepare for 1.4.0 release.
by karsten＠torproject.org 10 Oct '17

10 Oct '17

commit 95051e9480a8a77badea6b6f48a8016bf24f6446 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Oct 9 14:23:52 2017 +0200 Prepare for 1.4.0 release. --- CHANGELOG.md | 2 +- build.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4973f7e..b12b33b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 1.?.? - 2017-??-?? +# Changes in version 1.4.0 - 2017-10-09 * Major changes - Rename "Onionperf*" configuration options in collector.properties diff --git a/build.xml b/build.xml index d60350b..7cbff44 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.3.0-dev" /> + <property name="release.version" value="1.4.0" /> <property name="project-main-class" value="org.torproject.collector.Main" /> <property name="name" value="collector"/> <property name="metricslibversion" value="2.1.1" />

1 0

[metrics-lib/master] Prepare for 2.1.1 release.
by karsten＠torproject.org 10 Oct '17

10 Oct '17

commit a8c9232e9f689944da861af22b81f7431cdb86eb Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Oct 9 14:04:00 2017 +0200 Prepare for 2.1.1 release. --- CHANGELOG.md | 4 ++-- build.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b7021d8..cd0dc6a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ -# Changes in version 2.?.? - 2017-??-?? +# Changes in version 2.1.1 - 2017-10-09 - * Medium changes + * Minor changes - Add new optional "build_revision" field to index.json with the Git revision supplied by the calling software. diff --git a/build.xml b/build.xml index 6f493fa..badaf37 100644 --- a/build.xml +++ b/build.xml @@ -6,7 +6,7 @@ <project default="usage" name="metrics-lib" basedir="."> - <property name="release.version" value="2.1.0-dev" /> + <property name="release.version" value="2.1.1" /> <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

[onionoo/master] Prepare for 4.2-1.6.0 release.
by karsten＠torproject.org 10 Oct '17

10 Oct '17

commit bce585f4a5dfe0fa795e67efd02b37c95925b613 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Oct 9 17:05:57 2017 +0200 Prepare for 4.2-1.6.0 release. --- CHANGELOG.md | 2 +- build.xml | 4 ++-- src/build | 2 +- src/main/java/org/torproject/onionoo/server/ResponseBuilder.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b7b379c..b2aff31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 4.?-?.?.? - 2017-??-?? +# Changes in version 4.2-1.6.0 - 2017-10-09 * Medium changes - Only set the "running" field in a bridge's details document to diff --git a/build.xml b/build.xml index 72f3ecc..ee3c0da 100644 --- a/build.xml +++ b/build.xml @@ -8,9 +8,9 @@ <property name="javadoc-title" value="Onionoo API Documentation"/> <property name="implementation-title" value="Onionoo" /> - <property name="onionoo.protocol.version" value="4.1"/> + <property name="onionoo.protocol.version" value="4.2"/> <property name="release.version" - value="${onionoo.protocol.version}-1.5.0-dev"/> + value="${onionoo.protocol.version}-1.6.0"/> <property name="metricslibversion" value="2.1.1"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile" diff --git a/src/build b/src/build index a64b94a..4b34756 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit a64b94a635e5396266d5c5b5cf88850b9f4b6a24 +Subproject commit 4b34756ddd71ccaf0fc30e5f5bf0a813a297d4a3 diff --git a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java index 6b6b8ee..c0b2772 100644 --- a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java +++ b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java @@ -123,7 +123,7 @@ public class ResponseBuilder { return this.charsWritten; } - private static final String PROTOCOL_VERSION = "4.1"; + private static final String PROTOCOL_VERSION = "4.2"; private static final String NEXT_MAJOR_VERSION_SCHEDULED = null;

1 0

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

10 Oct '17

commit 57980616349f7d43631f3005c0eb5d1ea98a8e65 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 10 04:20:43 2017 +0000 Update translations for tor-browser-manual --- ga/ga.po | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ga/ga.po b/ga/ga.po index 3fce39840..b9d79975a 100644 --- a/ga/ga.po +++ b/ga/ga.po @@ -677,6 +677,8 @@ msgid "" "The following firewall software have been known to interfere with Tor and " "may need to be temporarily disabled:" msgstr "" +"Is eol dúinn go gcuireann na bogearraí balla dóiteáin seo isteach ar Tor, " +"agus seans gur gá duit iad a dhíchumasú go sealadach:" #: known-issues.page:23 msgid "Webroot SecureAnywhere" @@ -1713,6 +1715,9 @@ msgid "" "(see the <link xref=\"uninstalling\">Uninstalling</link> section for more " "information)." msgstr "" +"Chun Brabhsálaí Tor a bhaint de do chóras, scrios an fillteán ina bhfuil sé " +"(féach ar <link xref=\"uninstalling\">Díshuiteáil</link> le tuilleadh eolais" +" a fháil)." #: updating.page:74 msgid ""

1 0

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

10 Oct '17

commit be74a214775979e7d3bebe2d4525319bba9d6510 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 10 03:50:45 2017 +0000 Update translations for tor-browser-manual --- ga/ga.po | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/ga/ga.po b/ga/ga.po index 9e0dbb468..3fce39840 100644 --- a/ga/ga.po +++ b/ga/ga.po @@ -1151,6 +1151,13 @@ msgid "" " privacy and security. It is strongly discouraged to install additional add-" "ons, and the Tor Project will not offer support for these configurations." msgstr "" +"Ní dhearnadh tástáil ar bith ar bhreiseáin seachas ar na cinn a thagann le " +"Brabhsálaí Tor de réir réamhshocraithe. Má shuiteálann tú aon bhreiseán " +"eile, seans maith nach bhfeidhmeoidh Brabhsálaí Tor i gceart, agus go minic " +"is cúis le fadhbanna níos tromchúisí na breiseáin seo, fadhbanna a dhéanann " +"dochar don phríobháideachas agus don tslándáil. Molaimid go láidir duit gan " +"breiseáin eile a shuiteáil, agus ní thacóidh Tionscadal Tor leis na " +"cumraíochtaí malartacha seo." #: secure-connections.page:8 msgid "Learn how to protect your data using Tor Browser and HTTPS" @@ -1171,6 +1178,12 @@ msgid "" " verify this in the URL bar: if your connection is encrypted, the address " "will begin with “https://”, rather than “http://”." msgstr "" +"Má sheolann tú sonraí phearsanta, mar shampla focail fhaire, ar an Idirlíon " +"gan chriptiú, tá sé an-éasca do chúléisteoir iad a idircheapadh. Má tá tú ag" +" logáil isteach i suíomh Gréasáin, ba chóir duit deimhniú go n-úsáideann an " +"suíomh criptiú HTTPS, rud a chosnaíonn ar an sórt seo cúléisteachta thú. Is" +" féidir leat é seo a dheimhniú sa bharra URL: má tá do cheangal criptithe, " +"tosóidh an seoladh le “https://”, in áit “http://”." #. 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

1 0

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

10 Oct '17

commit 985dc58b95c4be143ca2d651ccedcecf6e921b2a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 10 03:20:41 2017 +0000 Update translations for tor-browser-manual --- ga/ga.po | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ga/ga.po b/ga/ga.po index 15f806757..9e0dbb468 100644 --- a/ga/ga.po +++ b/ga/ga.po @@ -1096,6 +1096,10 @@ msgid "" "icon at the top-left of the window, which allows you to control the " "JavaScript that runs on individual web pages, or to block it entirely." msgstr "" +"Tá breiseán darb ainm NoScript ag gabháil le Brabhsálaí Tor, ar fáil tríd an" +" deilbhín “S” ag barr na fuinneoige ar chlé. Ligeann sé duit smacht a " +"choinneáil ar an gcód JavaScript a ritheann ar leathanaigh ar leith, nó cosc" +" iomlán a chur air." #. 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 @@ -1119,6 +1123,13 @@ msgid "" " many websites from displaying correctly, so Tor Browser’s default setting " "is to allow all websites to run scripts." msgstr "" +"Ba chóir d'úsáideoirí a dteastaíonn slándáil an-daingean uathu an <link xref" +"=\"security-slider\">Sleamhnán Slándála</link> i mBrabhsálaí Tor a shocrú go" +" dtí an “Meán-Ardleibhéal” (a dhíchumasaíonn JavaScript ar shuímh nach " +"n-úsáideann HTTPS) nó “Ardleibhéal” (a dhíchumasaíonn ar gach suíomh é). " +"Ach, má dhíchumasaíonn tú JavaScript, ní fheidhmeoidh go leor suíomh mar is " +"ceart, agus dá bharr sin ligeann Brabhsálaí Tor do gach suíomh scripteanna a" +" rith de réir réamhshocraithe." #: plugins.page:58 msgid "Browser Add-ons"

1 0

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

10 Oct '17

commit 2ce2a6e0cd13674fb18bed5b23ebc1990328a5e6 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 10 02:50:41 2017 +0000 Update translations for tor-browser-manual --- ga/ga.po | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ga/ga.po b/ga/ga.po index 96fff8b81..15f806757 100644 --- a/ga/ga.po +++ b/ga/ga.po @@ -1016,6 +1016,10 @@ msgid "" "entered the 16-character onion address correctly: even a small mistake will " "stop Tor Browser from being able to reach the site." msgstr "" +"Murar féidir leat an tseirbhís onion atá uait a bhaint amach, deimhnigh gur " +"chuir tú an seoladh onion 16-carachtar isteach i gceart: chuirfeadh fiú " +"botún beag Brabhsálaí Tor ar strae agus ní bheadh Brabhsálaí Tor in ann an " +"tseirbhís a bhaint amach." #: onionsites.page:64 msgid "" @@ -1023,6 +1027,9 @@ msgid "" "later. There may be a temporary connection issue, or the site operators may " "have allowed it to go offline without warning." msgstr "" +"Murar féidir leat ceangal leis an tseirbhís onion fós, bain triail eile as " +"ar ball. B'fhéidir go bhfuil fadhb shealadach leis an líonra, nó b'fhéidir " +"gur lig stiúrthóirí an tsuímh dó dul as líne gan rabhadh." #: onionsites.page:69 msgid "" @@ -1078,6 +1085,10 @@ msgid "" "Unfortunately, JavaScript can also enable attacks on the security of the " "browser, which might lead to deanonymization." msgstr "" +"Is teanga ríomhchlárúcháin é JavaScript a úsáideann suímh Ghréasáin chun " +"gnéithe idirghníomhacha a chur ar fáil, mar shampla físeáin, beochan, fuaim," +" agus amlínte stádas. Faraor, éascaíonn JavaScript ionsaithe áirithe ar " +"shlándáil an bhrabhsálaí, ionsaithe a d'fhéadfadh d'aitheantas a nochtadh." #: plugins.page:39 msgid ""

1 0

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

10 Oct '17

commit 57bed6b24bcb2a27fa84513cccf8be913337cb88 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 10 00:50:45 2017 +0000 Update translations for tor-browser-manual --- ga/ga.po | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ga/ga.po b/ga/ga.po index c4f94327a..96fff8b81 100644 --- a/ga/ga.po +++ b/ga/ga.po @@ -1002,6 +1002,9 @@ msgid "" "service in order to connect to it. An onion address is a string of sixteen " "mostly random letters and numbers, followed by “.onion”." msgstr "" +"Go díreach cosúil le haon suíomh Gréasáin eile, teastaíonn uait seoladh na " +"seirbhíse onion chun ceangal léi. Is éard atá i seoladh onion ná teaghrán de" +" 16 litir agus uimhir, agus “.onion” ag an deireadh." #: onionsites.page:58 troubleshooting.page:10 msgid "Troubleshooting"

1 0