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

[onionoo/release] Stop excluding OR addresses from exit_addresses.
by karsten＠torproject.org 18 Apr '18

18 Apr '18

commit 5beef65a168e7bf74be9aa25b599380bf02052e1 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Apr 3 17:10:27 2018 +0200 Stop excluding OR addresses from exit_addresses. Fixes #25332. --- CHANGELOG.md | 4 ++++ .../org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java | 6 +----- .../org/torproject/onionoo/writer/DetailsDocumentWriter.java | 9 +++------ 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 692a417..b4efed7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changes in version 6.0-1.13.0 - 2018-04-?? + * Medium changes + - Change the "exit_addresses" field to not exclude current OR + addresses anymore. + * Minor changes - Turn valid utf-8 escape sequences into utf-8 characters. diff --git a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java index 6f9bdea..b34d2ef 100644 --- a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java +++ b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java @@ -833,11 +833,7 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, } } detailsStatus.setExitAddresses(exitAddresses); - SortedSet<String> exitAddressesWithoutOrAddresses = - new TreeSet<>(exitAddresses.keySet()); - exitAddressesWithoutOrAddresses.removeAll( - nodeStatus.getOrAddresses()); - nodeStatus.setExitAddresses(exitAddressesWithoutOrAddresses); + nodeStatus.setExitAddresses(new TreeSet<>(exitAddresses.keySet())); detailsStatus.setAllegedFamily(nodeStatus.getAllegedFamily()); detailsStatus.setEffectiveFamily(nodeStatus.getEffectiveFamily()); diff --git a/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java b/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java index 4aace51..a335916 100644 --- a/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java +++ b/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java @@ -143,12 +143,9 @@ public class DetailsDocumentWriter implements DocumentWriter { detailsStatus.getExitPolicyV6Summary()); detailsDocument.setHibernating(detailsStatus.getHibernating()); if (detailsStatus.getExitAddresses() != null) { - SortedSet<String> exitAddressesWithoutOrAddresses = - new TreeSet<>(detailsStatus.getExitAddresses().keySet()); - exitAddressesWithoutOrAddresses.removeAll( - detailsStatus.getOrAddresses()); - detailsDocument.setExitAddresses(new ArrayList<>( - exitAddressesWithoutOrAddresses)); + List<String> exitAddresses = new ArrayList<>(new TreeSet<>( + detailsStatus.getExitAddresses().keySet())); + detailsDocument.setExitAddresses(exitAddresses); } detailsDocument.setMeasured(detailsStatus.getMeasured()); List<String> unreachableOrAddresses = new ArrayList<>();

1 0

[onionoo/release] Make war-task depend on jar-task.
by karsten＠torproject.org 18 Apr '18

18 Apr '18

commit 59eb04b1df1e0e885566188be25152117f24617d Author: iwakeh <iwakeh(a)torproject.org> Date: Fri Apr 6 09:53:35 2018 +0000 Make war-task depend on jar-task. This makes the git-revision available even when running 'ant clean war'. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index f6b7e2f..9c5ea3e 100644 --- a/build.xml +++ b/build.xml @@ -74,7 +74,7 @@ </patternset> <target name="war" - depends="compile,gitrev"> + depends="jar"> <war destfile="${dist}/${warfile}" webxml="${resources}/web.xml" basedir="${classes}">

1 0

[onionoo/release] Bump version to 5.2-1.12.0-dev.
by karsten＠torproject.org 18 Apr '18

18 Apr '18

commit 1d874ba10dbc8ba82795e370941bed8eef71746d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Apr 6 11:53:34 2018 +0200 Bump version to 5.2-1.12.0-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 15e85ac..f6b7e2f 100644 --- a/build.xml +++ b/build.xml @@ -10,7 +10,7 @@ <property name="implementation-title" value="Onionoo" /> <property name="onionoo.protocol.version" value="5.2"/> <property name="release.version" - value="${onionoo.protocol.version}-1.12.0"/> + value="${onionoo.protocol.version}-1.12.0-dev"/> <property name="metricslibversion" value="2.2.0"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile"

1 0

[onionoo/release] Prepare for 6.0-1.13.0 release.
by karsten＠torproject.org 18 Apr '18

18 Apr '18

commit edf5c2c3a946ff9dc3562da74b0a6e0444b24bfe Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Apr 17 14:46:04 2018 +0200 Prepare for 6.0-1.13.0 release. --- CHANGELOG.md | 2 +- build.xml | 4 ++-- src/main/java/org/torproject/onionoo/server/ResponseBuilder.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b4efed7..199cf6f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 6.0-1.13.0 - 2018-04-?? +# Changes in version 6.0-1.13.0 - 2018-04-17 * Medium changes - Change the "exit_addresses" field to not exclude current OR diff --git a/build.xml b/build.xml index 9c5ea3e..315989b 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="5.2"/> + <property name="onionoo.protocol.version" value="6.0"/> <property name="release.version" - value="${onionoo.protocol.version}-1.12.0-dev"/> + value="${onionoo.protocol.version}-1.13.0"/> <property name="metricslibversion" value="2.2.0"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile" diff --git a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java index 6930d92..64e23ed 100644 --- a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java +++ b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java @@ -122,9 +122,9 @@ public class ResponseBuilder { return this.charsWritten; } - private static final String PROTOCOL_VERSION = "5.2"; + private static final String PROTOCOL_VERSION = "6.0"; - private static final String NEXT_MAJOR_VERSION_SCHEDULED = "2018-04-14"; + private static final String NEXT_MAJOR_VERSION_SCHEDULED = null; private void writeRelays(List<SummaryDocument> relays, PrintWriter pw) { this.write(pw, "{\"version\":\"%s\",\n", PROTOCOL_VERSION);

1 0

[onionoo/release] Provide utf-characters instead of escape strings.
by karsten＠torproject.org 18 Apr '18

18 Apr '18

commit 947ce706bb46c5d7e5c4cd2b0716a2458b4af86b Author: iwakeh <iwakeh(a)torproject.org> Date: Fri Apr 6 09:53:35 2018 +0000 Provide utf-characters instead of escape strings. Also adapt tests to check the new functionality. Implements task-25740. --- CHANGELOG.md | 6 +++++ .../torproject/onionoo/util/FormattingUtils.java | 6 +++-- src/test/resources/lines-for-escape-tests.txt | 26 +++++++++++++--------- 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b903acc..692a417 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# Changes in version 6.0-1.13.0 - 2018-04-?? + + * Minor changes + - Turn valid utf-8 escape sequences into utf-8 characters. + + # Changes in version 5.2-1.12.0 - 2018-04-06 * Medium changes diff --git a/src/main/java/org/torproject/onionoo/util/FormattingUtils.java b/src/main/java/org/torproject/onionoo/util/FormattingUtils.java index 3d16f5a..558477d 100644 --- a/src/main/java/org/torproject/onionoo/util/FormattingUtils.java +++ b/src/main/java/org/torproject/onionoo/util/FormattingUtils.java @@ -3,6 +3,8 @@ package org.torproject.onionoo.util; +import static org.apache.commons.lang3.StringEscapeUtils.unescapeJava; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -58,8 +60,8 @@ public class FormattingUtils { StringBuffer sb = new StringBuffer(); Matcher mat = escapePattern.matcher(text); while (mat.find()) { - String unescaped = mat.group(1); - mat.appendReplacement(sb, unescaped); + String unescaped = mat.group(1).substring(1); + mat.appendReplacement(sb, unescapeJava(unescaped)); } mat.appendTail(sb); return sb.toString(); diff --git a/src/test/resources/lines-for-escape-tests.txt b/src/test/resources/lines-for-escape-tests.txt index 4fb5895..b08b723 100644 --- a/src/test/resources/lines-for-escape-tests.txt +++ b/src/test/resources/lines-for-escape-tests.txt @@ -2,15 +2,21 @@ abc abc -\\\\u -\\\\u +\\\\u00bb \\\\u \\\\u00ab +» \\\\u « Haha/\\\\(a)/\\\\live/\\\\./\\\\co/\\\\./\\\uk Haha/\\\\(a)/\\\\live/\\\\./\\\\co/\\\\./\\\uk -\\\\u20ac -\\u20ac -\\\\u0024 -\\u0024 -some \\\\u20ac other string \\\\u0024 to unescape -some \\u20ac other string \\u0024 to unescape -abcd efg\\\\u0024xyz\\\\uxxxx -abcd efg\\u0024xyz\\\\uxxxx +Euro \\\\u20ac +Euro € +Dollar \\\\u0024 +Dollar $ +Pound \\\\u00a3 +Pound £ +Yen \\\\u00a5 +Yen ¥ +\\\\u00a1some \\\\u00dE other string \\\\u00e7 to unescape! +¡some Þ other string ç to unescape! +abcd efg cent \\\\u00a2xyz\\\\uxxxx +abcd efg cent ¢xyz\\\\uxxxx +Telef\\\\u00F4nica +Telefônica

1 0

[onionoo/master] Prepare for 6.0-1.13.0 release.
by karsten＠torproject.org 18 Apr '18

18 Apr '18

commit edf5c2c3a946ff9dc3562da74b0a6e0444b24bfe Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Apr 17 14:46:04 2018 +0200 Prepare for 6.0-1.13.0 release. --- CHANGELOG.md | 2 +- build.xml | 4 ++-- src/main/java/org/torproject/onionoo/server/ResponseBuilder.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b4efed7..199cf6f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 6.0-1.13.0 - 2018-04-?? +# Changes in version 6.0-1.13.0 - 2018-04-17 * Medium changes - Change the "exit_addresses" field to not exclude current OR diff --git a/build.xml b/build.xml index 9c5ea3e..315989b 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="5.2"/> + <property name="onionoo.protocol.version" value="6.0"/> <property name="release.version" - value="${onionoo.protocol.version}-1.12.0-dev"/> + value="${onionoo.protocol.version}-1.13.0"/> <property name="metricslibversion" value="2.2.0"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile" diff --git a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java index 6930d92..64e23ed 100644 --- a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java +++ b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java @@ -122,9 +122,9 @@ public class ResponseBuilder { return this.charsWritten; } - private static final String PROTOCOL_VERSION = "5.2"; + private static final String PROTOCOL_VERSION = "6.0"; - private static final String NEXT_MAJOR_VERSION_SCHEDULED = "2018-04-14"; + private static final String NEXT_MAJOR_VERSION_SCHEDULED = null; private void writeRelays(List<SummaryDocument> relays, PrintWriter pw) { this.write(pw, "{\"version\":\"%s\",\n", PROTOCOL_VERSION);

1 0

[translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed
by translation＠torproject.org 18 Apr '18

18 Apr '18

commit 763e728a6d61ef18a8c0575ce23fb91aecee291d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 18 09:48:04 2018 +0000 Update translations for torbutton-abouttorproperties_completed --- ja/abouttor.properties | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ja/abouttor.properties b/ja/abouttor.properties index 04863e392..5e85397ca 100644 --- a/ja/abouttor.properties +++ b/ja/abouttor.properties @@ -7,3 +7,14 @@ aboutTor.searchDDG.privacy=<a href="%2$S">DuckDuckGo</a>で<a href="%1$S">安全 aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ + +aboutTor.donationBanner.donate=今すぐ寄付願います！ + +aboutTor.donationBanner.slogan=Tor: デジタル抵抗運動に力を与える。 +aboutTor.donationBanner.mozilla=今から寄付すると、Mozillaが一緒に同じ金額を寄付します！ + +aboutTor.donationBanner.tagline1=2006年以来、ジャーナリスト、内部告発者、そして活動家を守っています。 +aboutTor.donationBanner.tagline2=世界的ネットワーク自由 +aboutTor.donationBanner.tagline3=フリーダムオンライン +aboutTor.donationBanner.tagline4=世界的に自由な表現を促進します。 +aboutTor.donationBanner.tagline5=数百万件以上のプライバシーを毎日保護しています。

1 0

[translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties
by translation＠torproject.org 18 Apr '18

18 Apr '18

commit 5fdc8bf8dc8453b23c4fea56c14543b48bf8c72b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 18 09:48:00 2018 +0000 Update translations for torbutton-abouttorproperties --- ja/abouttor.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ja/abouttor.properties b/ja/abouttor.properties index 848d0dcef..5e85397ca 100644 --- a/ja/abouttor.properties +++ b/ja/abouttor.properties @@ -10,11 +10,11 @@ aboutTor.searchDDG.search.link=https://duckduckgo.com/ aboutTor.donationBanner.donate=今すぐ寄付願います！ -aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance -aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! +aboutTor.donationBanner.slogan=Tor: デジタル抵抗運動に力を与える。 +aboutTor.donationBanner.mozilla=今から寄付すると、Mozillaが一緒に同じ金額を寄付します！ -aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 -aboutTor.donationBanner.tagline2=Networking Freedom Worldwide +aboutTor.donationBanner.tagline1=2006年以来、ジャーナリスト、内部告発者、そして活動家を守っています。 +aboutTor.donationBanner.tagline2=世界的ネットワーク自由 aboutTor.donationBanner.tagline3=フリーダムオンライン -aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide +aboutTor.donationBanner.tagline4=世界的に自由な表現を促進します。 aboutTor.donationBanner.tagline5=数百万件以上のプライバシーを毎日保護しています。

1 0

[translation/support-tormobile] Update translations for support-tormobile
by translation＠torproject.org 18 Apr '18

18 Apr '18

commit 96c81b8e300e75dd6c626bc246e289535c1a1b1d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 18 09:20:45 2018 +0000 Update translations for support-tormobile --- ja.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ja.json b/ja.json index 6af1b57d9..d96cc8d31 100644 --- a/ja.json +++ b/ja.json @@ -8,25 +8,25 @@ "tormobile-2": { "id": "#tormobile-2", "control": "tormobile-2", - "title": "Who is the Guardian Project?", - "description": "The Guardian Project maintains Tor (and other privacy applications) on Android. More info can be found on the <a href=\"https://guardianproject.info/\">Guardian Project's website</a>." + "title": "ガーディアンプロジェクトは誰ですか？", + "description": "Guardianプロジェクトは、Android上でTor（およびその他のプライバシーアプリケーション）を管理しています。詳細については、23Guardian Projectのウェブサイトをご覧ください。" }, "tormobile-3": { "id": "#tormobile-3", "control": "tormobile-3", - "title": "Can I run Tor on an iOS device?", - "description": " We recommend an iOS app called Onion Browser, which is open source, uses Tor routing, and is developed by someone who works closely with the Tor Project. However, Apple requires browsers on iOS to use something called Webkit, which prevents Onion Browser from having the same privacy protections as Tor Browser. <a href=\"https://blog.torproject.org/tor-heart-onion-browser-and-more-ios-tor\">Learn more about Onion Browser</a>." + "title": "TorをiOSデバイスで利用できますか？", + "description": "Onion Browserと呼ばれるiOSアプリケーションは、オープンソースであり、Torのルーティングを使用し、Torプロジェクトと密接に協力する人が開発することをお勧めします。しかしAppleはiOS上のブラウザにWebkitというものを使用する必要があり、これはOnion BrowserがTorブラウザと同じプライバシー保護を持つことを妨げている。オニオンブラウザの詳細。" }, "tormobile-4": { "id": "#tormobile-4", "control": "tormobile-4", - "title": "How do I run Tor on Windows Phone?", - "description": "There is currently no supported method for running Tor on Windows Phone." + "title": "Windows PhoneでTorを利用するにはどうすればよいですか？", + "description": "現在のところ、Windows PhoneでTorを実行するためのサポートされている方法はありません。" }, "tormobile-5": { "id": "#tormobile-5", "control": "tormobile-5", - "title": "When is Tor Browser for Android being released?", - "description": "We are currently working on Tor Browser for Android, and you may see alpha releases appear over the coming months. Please watch our <a href=\"https://blog.torproject.org\">blog</a> for future announcements and details regarding this project." + "title": "Android用Torブラウザはいつリリースされますか？", + "description": "私たちは現在、Android用のTorブラウザに取り組んでおり、今後数ヶ月でアルファ版が公開されることがあります。このプロジェクトに関する今後の発表や詳細については、23blog32をご覧ください。" } }

1 0

[translation/support-tormobile] Update translations for support-tormobile
by translation＠torproject.org 18 Apr '18

18 Apr '18

commit 61e87fecf9bd0867a54e6f43eb97ef1d6a7d8e08 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 18 08:50:58 2018 +0000 Update translations for support-tormobile --- ja.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ja.json b/ja.json index d832318fe..6af1b57d9 100644 --- a/ja.json +++ b/ja.json @@ -2,8 +2,8 @@ "tormobile-1": { "id": "#tormobile-1", "control": "tormobile-1", - "title": "Can I run Tor on an Android device?", - "description": "Tor on Android is provided by The Guardian Project. More information can be found on the <a href=\"https://guardianproject.info/apps/orbot/\">Orbot</a> and <a href=\"https://guardianproject.info/apps/orfox/\">Orfox</a> web pages. Orbot is for web browsing, and Orfox can route other apps on your Android phone over the Tor network." + "title": "TorをAndroid搭載端末で利用できますか？", + "description": "AndroidのTorはThe Guardian Projectによって提供されています。詳細については、23Orbot32および45 Orfox54ウェブページ。 Orbotはウェブブラウジング用で、OrfoxはAndroidネットワーク上の他のアプリをTorネットワーク経由でルーティングすることができます。" }, "tormobile-2": { "id": "#tormobile-2",

1 0