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

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 15 Mar '18

15 Mar '18

commit 7b8b2191bf5f94d8781fac98b5ad90f72fe18411 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 15 18:46:21 2018 +0000 Update translations for tor-launcher-properties --- ar/torlauncher.properties | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ar/torlauncher.properties b/ar/torlauncher.properties index 8dbc19a56..a0190e7e7 100644 --- a/ar/torlauncher.properties +++ b/ar/torlauncher.properties @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=من الضروري تحديد كل من ع torlauncher.error_proxy_type_missing=من الضروري تحديد نوع البروكسي. torlauncher.error_bridges_missing=من الضروري تحديد جسر واحد أو أكثر. torlauncher.error_default_bridges_type_missing=يجب عليك تحديد نوع الجسور المقدمة مع المتصفح. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=يُرجى طلب جسر. torlauncher.error_bridge_bad_default_type=هذا النوع غير متوفر بداخل الجسور المقدمة مع المتصفح. الرجاء تعديل إعداداتك. torlauncher.bridge_suffix.meek-amazon=(شغال في الصين) torlauncher.bridge_suffix.meek-azure=(شغال في الصين) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. +torlauncher.request_a_bridge=عملية طلب جسرٍ جارية … +torlauncher.request_a_new_bridge=عملية طلب جسرٍ جديدة جارية … +torlauncher.contacting_bridgedb=عملية الإتصال بقاعدة الجسور BridgeDB جارية. يُرجى الإنتظار. torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. +torlauncher.bad_captcha_solution=الحل ليس سليمًا بعد. يُرجى إعادة المحاولة. torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.no_bridges_available=المعذرة. لا توجد هناك جسور متوفرة حاليا. torlauncher.connect=اتصل torlauncher.restart_tor=إعادة تشغيل تور @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=لا طريق للمضيف torlauncher.bootstrapWarning.ioerror=خطأ في القراءة/الكتابة torlauncher.bootstrapWarning.pt_missing=الناقل المضاف مفقود -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=لقد قُطع الإتصال مع الخادوم. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=فشِل الإتصال بالخادوم. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=فشِل الإتصال بوكيل البروكسي.

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 15 Mar '18

15 Mar '18

commit 76dc82b68b86072f0a5fd817649c47c0d0c82f0e Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 15 18:45:13 2018 +0000 Update translations for bridgedb_completed --- ar/LC_MESSAGES/bridgedb.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ar/LC_MESSAGES/bridgedb.po b/ar/LC_MESSAGES/bridgedb.po index 6bd035b6d..80ebda27d 100644 --- a/ar/LC_MESSAGES/bridgedb.po +++ b/ar/LC_MESSAGES/bridgedb.po @@ -9,6 +9,7 @@ # allamiro <allamiro(a)gmail.com>, 2011 # Ash <ali.shatrieh(a)gmail.com>, 2014 # blah bleh <wshalash(a)protonmail.ch>, 2018 +# ButterflyOfFire <ButterflyOfFire(a)protonmail.com>, 2018 # debo debo <a.adeebo(a)yahoo.com>, 2015 # Mohamed El-Feky <elfeky.m(a)gmail.com>, 2014 # AnonymousLady <farah.jaza(a)hotmail.com>, 2014 @@ -28,8 +29,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2018-02-20 18:46+0000\n" -"Last-Translator: Martus Translations <translations(a)martus.org>\n" +"PO-Revision-Date: 2018-03-15 18:44+0000\n" +"Last-Translator: ButterflyOfFire <ButterflyOfFire(a)protonmail.com>\n" "Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -75,7 +76,7 @@ msgstr "حدد الكل" #: bridgedb/https/templates/bridges.html:40 msgid "Show QRCode" -msgstr "اظهار ال QR كود" +msgstr "إظهار رمز الإستجابة السريع QRCode" #: bridgedb/https/templates/bridges.html:52 msgid "QRCode for your bridge lines"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 15 Mar '18

15 Mar '18

commit a335ade36a783cfc2515b04127d4c604fc33202f Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 15 18:45:05 2018 +0000 Update translations for bridgedb --- ar/LC_MESSAGES/bridgedb.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ar/LC_MESSAGES/bridgedb.po b/ar/LC_MESSAGES/bridgedb.po index 6bd035b6d..80ebda27d 100644 --- a/ar/LC_MESSAGES/bridgedb.po +++ b/ar/LC_MESSAGES/bridgedb.po @@ -9,6 +9,7 @@ # allamiro <allamiro(a)gmail.com>, 2011 # Ash <ali.shatrieh(a)gmail.com>, 2014 # blah bleh <wshalash(a)protonmail.ch>, 2018 +# ButterflyOfFire <ButterflyOfFire(a)protonmail.com>, 2018 # debo debo <a.adeebo(a)yahoo.com>, 2015 # Mohamed El-Feky <elfeky.m(a)gmail.com>, 2014 # AnonymousLady <farah.jaza(a)hotmail.com>, 2014 @@ -28,8 +29,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2018-02-20 18:46+0000\n" -"Last-Translator: Martus Translations <translations(a)martus.org>\n" +"PO-Revision-Date: 2018-03-15 18:44+0000\n" +"Last-Translator: ButterflyOfFire <ButterflyOfFire(a)protonmail.com>\n" "Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -75,7 +76,7 @@ msgstr "حدد الكل" #: bridgedb/https/templates/bridges.html:40 msgid "Show QRCode" -msgstr "اظهار ال QR كود" +msgstr "إظهار رمز الإستجابة السريع QRCode" #: bridgedb/https/templates/bridges.html:52 msgid "QRCode for your bridge lines"

1 0

[onionoo/master] Bump version to 5.1-1.11.0-dev.
by karsten＠torproject.org 15 Mar '18

15 Mar '18

commit e7ac4ca99571d8aeb501559713184b5601982111 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Mar 15 14:58:16 2018 +0100 Bump version to 5.1-1.11.0-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index c7b0b98..149dcde 100644 --- a/build.xml +++ b/build.xml @@ -10,7 +10,7 @@ <property name="implementation-title" value="Onionoo" /> <property name="onionoo.protocol.version" value="5.1"/> <property name="release.version" - value="${onionoo.protocol.version}-1.11.0"/> + value="${onionoo.protocol.version}-1.11.0-dev"/> <property name="metricslibversion" value="2.1.1"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile"

1 0

[onionoo/release] Stop omitting "n" in summary docs for "Unnamed" relays/bridges.
by karsten＠torproject.org 15 Mar '18

15 Mar '18

commit 81c72b0531ecc474bfc92afcb62e4fb78348d2d8 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Feb 8 16:42:25 2018 +0100 Stop omitting "n" in summary docs for "Unnamed" relays/bridges. Fixes #24494. --- .../org/torproject/onionoo/server/ResponseBuilder.java | 16 ++++++---------- .../torproject/onionoo/server/ResourceServletTest.java | 4 ++-- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java index 80ee223..5f66f62 100644 --- a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java +++ b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java @@ -210,8 +210,7 @@ public class ResponseBuilder { } private String writeRelaySummaryLine(SummaryDocument entry) { - String nickname = !entry.getNickname().equals("Unnamed") - ? entry.getNickname() : null; + String nickname = entry.getNickname(); String fingerprint = entry.getFingerprint(); String running = entry.isRunning() ? "true" : "false"; List<String> addresses = entry.getAddresses(); @@ -221,19 +220,16 @@ public class ResponseBuilder { addressesBuilder.append((written++ > 0 ? "," : "") + "\"" + address.toLowerCase() + "\""); } - return String.format("{%s\"f\":\"%s\",\"a\":[%s],\"r\":%s}", - (nickname == null ? "" : "\"n\":\"" + nickname + "\","), - fingerprint, addressesBuilder.toString(), running); + return String.format("{\"n\":\"%s\",\"f\":\"%s\",\"a\":[%s],\"r\":%s}", + nickname, fingerprint, addressesBuilder.toString(), running); } private String writeBridgeSummaryLine(SummaryDocument entry) { - String nickname = !entry.getNickname().equals("Unnamed") - ? entry.getNickname() : null; + String nickname = entry.getNickname(); String hashedFingerprint = entry.getFingerprint(); String running = entry.isRunning() ? "true" : "false"; - return String.format("{%s\"h\":\"%s\",\"r\":%s}", - (nickname == null ? "" : "\"n\":\"" + nickname + "\","), - hashedFingerprint, running); + return String.format("{\"n\":\"%s\",\"h\":\"%s\",\"r\":%s}", + nickname, hashedFingerprint, running); } private String writeDetailsLines(SummaryDocument entry) { diff --git a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java index 5f07140..c371d71 100644 --- a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java +++ b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java @@ -1419,7 +1419,7 @@ public class ResourceServletTest { "/summary?order=" + OrderParameterValues.FIRST_SEEN_ASC + "," + OrderParameterValues.CONSENSUS_WEIGHT_ASC, 3, new String[] { "TimMayTribute", "Ferrari458", "TorkaZ" }, 3, - new String[] { "gummy", null, "ec2bridgercc7f31fe" }); + new String[] { "gummy", "Unnamed", "ec2bridgercc7f31fe" }); } @Test(timeout = 100) @@ -1428,7 +1428,7 @@ public class ResourceServletTest { + OrderParameterValues.FIRST_SEEN_DES + "," + OrderParameterValues.CONSENSUS_WEIGHT_ASC, 3, new String[] { "TorkaZ", "TimMayTribute", "Ferrari458" }, 3, - new String[] { "ec2bridgercc7f31fe", null, "gummy" }); + new String[] { "ec2bridgercc7f31fe", "Unnamed", "gummy" }); } @Test(timeout = 100)

1 0

[onionoo/release] Bump version to 5.0-1.10.1-dev.
by karsten＠torproject.org 15 Mar '18

15 Mar '18

commit 934bdd961a7235c90dc11f2dd68201756018c807 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Feb 7 16:50:22 2018 +0100 Bump version to 5.0-1.10.1-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index f1d6149..aafbd50 100644 --- a/build.xml +++ b/build.xml @@ -10,7 +10,7 @@ <property name="implementation-title" value="Onionoo" /> <property name="onionoo.protocol.version" value="5.0"/> <property name="release.version" - value="${onionoo.protocol.version}-1.10.1"/> + value="${onionoo.protocol.version}-1.10.1-dev"/> <property name="metricslibversion" value="2.1.1"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile"

1 0

[onionoo/release] Return results in deterministic order.
by karsten＠torproject.org 15 Mar '18

15 Mar '18

commit 8dfabbe36d5f90e2df14b504461298b1585fd5ae Author: iwakeh <iwakeh(a)torproject.org> Date: Wed Dec 20 16:16:03 2017 +0000 Return results in deterministic order. Part of task-25002. --- CHANGELOG.md | 5 +++++ .../java/org/torproject/onionoo/server/RequestHandler.java | 10 ++++------ .../torproject/onionoo/server/SummaryDocumentComparator.java | 6 +++++- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d0fed40..fa33c82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ * Medium changes - Stop omitting "n" in summary docs for "Unnamed" relays/bridges. + * Minor changes + - Make responses deterministic by always sorting results by + fingerprint, either if no specific order was requested or to + break ties after ordering results as requested. + # Changes in version 5.0-1.10.1 - 2018-02-07 diff --git a/src/main/java/org/torproject/onionoo/server/RequestHandler.java b/src/main/java/org/torproject/onionoo/server/RequestHandler.java index 55938c5..63b8fe9 100644 --- a/src/main/java/org/torproject/onionoo/server/RequestHandler.java +++ b/src/main/java/org/torproject/onionoo/server/RequestHandler.java @@ -603,12 +603,10 @@ public class RequestHandler { uniqueBridges.add(bridge); } } - if (this.order != null) { - Comparator<SummaryDocument> comparator - = new SummaryDocumentComparator(this.order); - Collections.sort(uniqueRelays, comparator); - Collections.sort(uniqueBridges, comparator); - } + Comparator<SummaryDocument> comparator + = new SummaryDocumentComparator(this.order); + Collections.sort(uniqueRelays, comparator); + Collections.sort(uniqueBridges, comparator); this.orderedRelays.addAll(uniqueRelays); this.orderedBridges.addAll(uniqueBridges); } diff --git a/src/main/java/org/torproject/onionoo/server/SummaryDocumentComparator.java b/src/main/java/org/torproject/onionoo/server/SummaryDocumentComparator.java index 0e6729b..86d4d32 100644 --- a/src/main/java/org/torproject/onionoo/server/SummaryDocumentComparator.java +++ b/src/main/java/org/torproject/onionoo/server/SummaryDocumentComparator.java @@ -13,7 +13,8 @@ public class SummaryDocumentComparator implements Comparator<SummaryDocument> { /** Comparator is initialized with the order parameters. */ public SummaryDocumentComparator(String ... orderParameters) { - this.orderParameters = orderParameters; + this.orderParameters + = null == orderParameters ? new String[]{} : orderParameters; } @Override @@ -45,6 +46,9 @@ public class SummaryDocumentComparator implements Comparator<SummaryDocument> { break; } } + if (0 == result) { + result = o1.getFingerprint().compareTo(o2.getFingerprint()); + } return result; } }

1 0

[onionoo/release] Update protocol version to 5.1.
by karsten＠torproject.org 15 Mar '18

15 Mar '18

commit aae8e5d563290239ae583346923e55eb50494568 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Mar 8 09:34:25 2018 +0100 Update protocol version to 5.1. --- CHANGELOG.md | 6 ++++++ build.xml | 2 +- src/main/java/org/torproject/onionoo/server/ResponseBuilder.java | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 08360ba..d0fed40 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# Changes in version 5.1-1.??.? - 2018-??-?? + + * Medium changes + - Stop omitting "n" in summary docs for "Unnamed" relays/bridges. + + # Changes in version 5.0-1.10.1 - 2018-02-07 * Medium changes diff --git a/build.xml b/build.xml index aafbd50..47516ca 100644 --- a/build.xml +++ b/build.xml @@ -8,7 +8,7 @@ <property name="javadoc-title" value="Onionoo API Documentation"/> <property name="implementation-title" value="Onionoo" /> - <property name="onionoo.protocol.version" value="5.0"/> + <property name="onionoo.protocol.version" value="5.1"/> <property name="release.version" value="${onionoo.protocol.version}-1.10.1-dev"/> <property name="metricslibversion" value="2.1.1"/> diff --git a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java index 5f66f62..1e92469 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 = "5.0"; + private static final String PROTOCOL_VERSION = "5.1"; private static final String NEXT_MAJOR_VERSION_SCHEDULED = null;

1 0

[onionoo/release] Always add own fingerprint to effective family.
by karsten＠torproject.org 15 Mar '18

15 Mar '18

commit a9a0f7054cf66ee51b245b02369119832e330585 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Feb 14 22:40:52 2018 +0100 Always add own fingerprint to effective family. Some relays include their own fingerprint in the family line of their server descriptor and others don't. To provide consistent data Onionoo now adds a relay's own fingerprint to its effective family. Implements task-25241. --- .../org/torproject/onionoo/docs/NodeStatus.java | 31 +++++++++++----------- .../torproject/onionoo/docs/NodeStatusTest.java | 19 ++++++------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java index cfd13aa..94da8c8 100644 --- a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java +++ b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java @@ -19,6 +19,7 @@ import java.util.SortedMap; import java.util.SortedSet; import java.util.TreeMap; import java.util.TreeSet; +import java.util.stream.Collectors; public class NodeStatus extends Document { @@ -54,33 +55,31 @@ public class NodeStatus extends Document { private String[] declaredFamily; + @SuppressWarnings("checkstyle:javadocmethod") public void setDeclaredFamily(SortedSet<String> declaredFamily) { - this.declaredFamily = collectionToStringArray(declaredFamily); + SortedSet<String> declaredFamilyIncludingSelf + = new TreeSet<>(declaredFamily); + declaredFamilyIncludingSelf.add(this.fingerprint); + this.declaredFamily = collectionToStringArray(declaredFamilyIncludingSelf); } + @SuppressWarnings("checkstyle:javadocmethod") public SortedSet<String> getDeclaredFamily() { - return stringArrayToSortedSet(this.declaredFamily); + SortedSet<String> declaredFamilyIncludingSelf = + stringArrayToSortedSet(this.declaredFamily); + declaredFamilyIncludingSelf.add(this.fingerprint); + return declaredFamilyIncludingSelf; } private static String[] collectionToStringArray( Collection<String> collection) { - String[] stringArray = null; - if (collection != null && !collection.isEmpty()) { - stringArray = new String[collection.size()]; - int index = 0; - for (String string : collection) { - stringArray[index++] = string; - } - } - return stringArray; + return (null == collection || collection.isEmpty()) ? null + : collection.toArray(new String[collection.size()]); } private SortedSet<String> stringArrayToSortedSet(String[] stringArray) { - SortedSet<String> sortedSet = new TreeSet<>(); - if (stringArray != null) { - sortedSet.addAll(Arrays.asList(stringArray)); - } - return sortedSet; + return stringArray == null ? new TreeSet<>() : Arrays.stream(stringArray) + .collect(Collectors.toCollection(TreeSet::new)); } /* From network status entries: */ diff --git a/src/test/java/org/torproject/onionoo/docs/NodeStatusTest.java b/src/test/java/org/torproject/onionoo/docs/NodeStatusTest.java index e2c5dac..2b90ece 100644 --- a/src/test/java/org/torproject/onionoo/docs/NodeStatusTest.java +++ b/src/test/java/org/torproject/onionoo/docs/NodeStatusTest.java @@ -53,36 +53,37 @@ public class NodeStatusTest { private static final String D = "DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD"; private static final String E = "EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE"; private static final String F = "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"; + private static final String G = "F2044413DAC2E02E3D6BCF4735A19BCA1DE97281"; private static final String NICK = "nickname"; @Test public void testFamiliesEmpty() { assertFamiliesCanBeDeSerialized( - new String[] {}, new String[] {}, new String[] {}); + new String[] { G }, new String[] {}, new String[] {}); } @Test public void testFamiliesOneNotMutual() { assertFamiliesCanBeDeSerialized( - new String[] { A }, new String[] {}, new String[] {}); + new String[] { A, G }, new String[] {}, new String[] {}); } @Test public void testFamiliesTwoNotMutual() { assertFamiliesCanBeDeSerialized( - new String[] { A, B }, new String[] {}, new String[] {}); + new String[] { A, B, G }, new String[] {}, new String[] {}); } @Test public void testFamiliesOneNotMutualOneMutual() { assertFamiliesCanBeDeSerialized( - new String[] { A, B }, new String[] { B }, new String[] { B }); + new String[] { A, B, G }, new String[] { B }, new String[] { B }); } @Test public void testFamiliesOneMutualOneIndirect() { assertFamiliesCanBeDeSerialized( - new String[] { A }, new String[] { A }, new String[] { A, B }); + new String[] { A, G }, new String[] { A }, new String[] { A, B }); } @Test @@ -92,26 +93,26 @@ public class NodeStatusTest { * with this relay. It's a valid case, because B can be in a mutual * family relationship with A. */ assertFamiliesCanBeDeSerialized( - new String[] { A, B }, new String[] { A }, new String[] { A, B}); + new String[] { A, B, G }, new String[] { A }, new String[] { A, B}); } @Test public void testFamiliesOneNotMutualOneMutualOneIndirect() { assertFamiliesCanBeDeSerialized( - new String[] { A, B }, new String[] { B }, new String[] { B, C}); + new String[] { A, B, G }, new String[] { B }, new String[] { B, C}); } @Test public void testFamiliesTwoNotMutualTwoMutualTwoIndirect() { assertFamiliesCanBeDeSerialized( - new String[] { A, B, C, D }, new String[] { C, D }, + new String[] { A, B, C, D, G }, new String[] { C, D }, new String[] { C, D, E, F }); } @Test public void testFamiliesNickname() { assertFamiliesCanBeDeSerialized( - new String[] { NICK }, new String[] {}, new String[] {}); + new String[] { NICK, G }, new String[] {}, new String[] {}); } private static final String KI_LAST_SEEN_1970_NODE_STATUS =

1 0

[onionoo/release] Prepare for 5.1-1.11.0 release.
by karsten＠torproject.org 15 Mar '18

15 Mar '18

commit 88ca11145535220973ce3bcfc54c62c1288b781d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Mar 13 17:45:35 2018 +0100 Prepare for 5.1-1.11.0 release. --- CHANGELOG.md | 3 ++- build.xml | 2 +- src/main/java/org/torproject/onionoo/server/ResponseBuilder.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c95dacf..6fe389b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 5.1-1.??.? - 2018-??-?? +# Changes in version 5.1-1.11.0 - 2018-03-14 * Medium changes - Stop omitting "n" in summary docs for "Unnamed" relays/bridges. @@ -8,6 +8,7 @@ - Make responses deterministic by always sorting results by fingerprint, either if no specific order was requested or to break ties after ordering results as requested. + - Announce next major protocol version update on April 14, 2018. # Changes in version 5.0-1.10.1 - 2018-02-07 diff --git a/build.xml b/build.xml index 47516ca..c7b0b98 100644 --- a/build.xml +++ b/build.xml @@ -10,7 +10,7 @@ <property name="implementation-title" value="Onionoo" /> <property name="onionoo.protocol.version" value="5.1"/> <property name="release.version" - value="${onionoo.protocol.version}-1.10.1-dev"/> + value="${onionoo.protocol.version}-1.11.0"/> <property name="metricslibversion" value="2.1.1"/> <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 1e92469..bb36a2c 100644 --- a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java +++ b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java @@ -125,7 +125,7 @@ public class ResponseBuilder { private static final String PROTOCOL_VERSION = "5.1"; - private static final String NEXT_MAJOR_VERSION_SCHEDULED = null; + private static final String NEXT_MAJOR_VERSION_SCHEDULED = "2018-04-14"; private void writeRelays(List<SummaryDocument> relays, PrintWriter pw) { this.write(pw, "{\"version\":\"%s\",\n", PROTOCOL_VERSION);

1 0