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

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 13 Mar '18

13 Mar '18

commit 3ddb546fbe7568afc6da14dfb7b66cb9075b7080 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 13 18:46:47 2018 +0000 Update translations for tails-misc_completed --- es.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/es.po b/es.po index 1529337a2..ff1e898e4 100644 --- a/es.po +++ b/es.po @@ -16,8 +16,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-03-12 19:03+0100\n" -"PO-Revision-Date: 2018-03-13 09:11+0000\n" -"Last-Translator: strel\n" +"PO-Revision-Date: 2018-03-13 18:29+0000\n" +"Last-Translator: Emma Peel\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -204,7 +204,7 @@ msgstr "Falló el MAC spoofing para la tarjeta de red ${nic_name} (${nic}). La r #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:109 msgid "Lock Screen" -msgstr "Pantalla de bloqueo" +msgstr "Bloquear pantalla" #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:118 #: config/chroot_local-includes/usr/local/bin/tor-browser:46 @@ -217,7 +217,7 @@ msgstr "Bloqueo de pantalla" #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:130 msgid "Set up a password to unlock the screen." -msgstr "Establezca una contraseña para desbloquear la pantalla." +msgstr "Establece una contraseña para desbloquear la pantalla" #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:135 msgid "Password"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 13 Mar '18

13 Mar '18

commit a26542814689029df71044b13cda6365579bf88e Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 13 18:46:42 2018 +0000 Update translations for tails-misc --- es.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/es.po b/es.po index 1529337a2..ff1e898e4 100644 --- a/es.po +++ b/es.po @@ -16,8 +16,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-03-12 19:03+0100\n" -"PO-Revision-Date: 2018-03-13 09:11+0000\n" -"Last-Translator: strel\n" +"PO-Revision-Date: 2018-03-13 18:29+0000\n" +"Last-Translator: Emma Peel\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -204,7 +204,7 @@ msgstr "Falló el MAC spoofing para la tarjeta de red ${nic_name} (${nic}). La r #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:109 msgid "Lock Screen" -msgstr "Pantalla de bloqueo" +msgstr "Bloquear pantalla" #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:118 #: config/chroot_local-includes/usr/local/bin/tor-browser:46 @@ -217,7 +217,7 @@ msgstr "Bloqueo de pantalla" #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:130 msgid "Set up a password to unlock the screen." -msgstr "Establezca una contraseña para desbloquear la pantalla." +msgstr "Establece una contraseña para desbloquear la pantalla" #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:135 msgid "Password"

1 0

[onionoo/master] Add missing change log entry for #25241.
by karsten＠torproject.org 13 Mar '18

13 Mar '18

commit f6ff7bfeb7121c54a85e18cbe0f886dbb53cec19 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Mar 13 17:43:16 2018 +0100 Add missing change log entry for #25241. --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fa33c82..c95dacf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ * Medium changes - Stop omitting "n" in summary docs for "Unnamed" relays/bridges. + - Always add a relay to its own "effective_family". * Minor changes - Make responses deterministic by always sorting results by

1 0

[webwml/master] Add new Tor Browser version: 8.0a3
by boklm＠torproject.org 13 Mar '18

13 Mar '18

commit e204f1626bac7d820f35af4e2579af9dc5b934ad Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Mar 13 16:26:35 2018 +0100 Add new Tor Browser version: 8.0a3 --- include/versions.wmi | 4 ++-- projects/torbrowser/RecommendedTBBVersions | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index d8ef0edd..fe86cd4d 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -22,8 +22,8 @@ <define-tag package-win32-stable whitespace=delete>../dist/torbrowser/<version-torbrowserbundle>/tor-win32-<version-win32-stable>.zip</define-tag> # *** tor browser beta/alpha *** -<define-tag version-torbrowserbundlebeta-all whitespace=delete>8.0a2</define-tag> -<define-tag releasedate-torbrowserbundlebeta-all whitespace=delete>2018-02-23</define-tag> +<define-tag version-torbrowserbundlebeta-all whitespace=delete>8.0a3</define-tag> +<define-tag releasedate-torbrowserbundlebeta-all whitespace=delete>2018-03-13</define-tag> <define-tag version-torbrowsersandboxlinux whitespace=delete>0.0.16</define-tag> # If all platforms are on the same version, you only need to update diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 413e64f3..c0248336 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -14,5 +14,9 @@ "8.0a2", "8.0a2-MacOS", "8.0a2-Linux", -"8.0a2-Windows" +"8.0a2-Windows", +"8.0a3", +"8.0a3-MacOS", +"8.0a3-Linux", +"8.0a3-Windows" ]

1 0

[webwml/master] Add new Tor Browser version: 7.5.1
by boklm＠torproject.org 13 Mar '18

13 Mar '18

commit 545bbe03bffe8094ed4de68becd42dbf07e7d32f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Mar 13 16:25:00 2018 +0100 Add new Tor Browser version: 7.5.1 --- include/versions.wmi | 6 +++--- projects/torbrowser/RecommendedTBBVersions | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index cf50a5a9..d8ef0edd 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -4,9 +4,9 @@ <define-tag version-torbrowserdevelopbranch whitespace=delete>maint-7.5</define-tag> # *** tor browser stable *** -<define-tag version-torbrowserbundle-all whitespace=delete>7.5</define-tag> -<define-tag releasedate-torbrowserbundle-all whitespace=delete>2018-01-23</define-tag> -<define-tag version-win32-stable whitespace=delete>0.3.2.9</define-tag> +<define-tag version-torbrowserbundle-all whitespace=delete>7.5.1</define-tag> +<define-tag releasedate-torbrowserbundle-all whitespace=delete>2018-03-13</define-tag> +<define-tag version-win32-stable whitespace=delete>0.3.2.10</define-tag> # If all platforms are on the same version, you only to update # version-torbrowserbundle-all and releasedate-torbrowserbundle-all diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index ee821ff1..413e64f3 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -3,6 +3,10 @@ "7.5-MacOS", "7.5-Linux", "7.5-Windows", +"7.5.1", +"7.5.1-MacOS", +"7.5.1-Linux", +"7.5.1-Windows", "8.0a1", "8.0a1-MacOS", "8.0a1-Linux",

1 0

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

13 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/master] Always add own fingerprint to effective family.
by karsten＠torproject.org 13 Mar '18

13 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

[tor/maint-0.3.3] Improve the documentation of AccountingStart parameter.
by nickm＠torproject.org 13 Mar '18

13 Mar '18

commit eb089ecaa023eaacd06f042e67bf4b4adda1c8ee Author: Fernando Fernandez Mancera <ffmancera(a)riseup.net> Date: Mon Feb 12 17:10:04 2018 +0100 Improve the documentation of AccountingStart parameter. Fixes #23635. Signed-off-by: Fernando Fernandez Mancera <ffmancera(a)riseup.net> --- changes/ticket23635 | 3 +++ doc/tor.1.txt | 19 ++++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/changes/ticket23635 b/changes/ticket23635 new file mode 100644 index 000000000..54d303e4b --- /dev/null +++ b/changes/ticket23635 @@ -0,0 +1,3 @@ + o Documentation: + - Improved the documentation of AccountingStart paremeter. + Closes ticket 23635. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 5ad818365..54375300a 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2170,15 +2170,16 @@ is non-zero): (Default: max) [[AccountingStart]] **AccountingStart** **day**|**week**|**month** [__day__] __HH:MM__:: - Specify how long accounting periods last. If **month** is given, each - accounting period runs from the time __HH:MM__ on the __dayth__ day of one - month to the same day and time of the next. (The day must be between 1 and - 28.) If **week** is given, each accounting period runs from the time __HH:MM__ - of the __dayth__ day of one week to the same day and time of the next week, - with Monday as day 1 and Sunday as day 7. If **day** is given, each - accounting period runs from the time __HH:MM__ each day to the same time on - the next day. All times are local, and given in 24-hour time. (Default: - "month 1 0:00") + Specify how long accounting periods last. If **month** is given, + each accounting period runs from the time __HH:MM__ on the __dayth__ day of one + month to the same day and time of the next. The relay will go at full speed, + use all the quota you specify, then hibernate for the rest of the month.(The + day must be between 1 and 28.) If **week** is given, each accounting period + runs from the time __HH:MM__ of the __dayth__ day of one week to the same day + and time of the next week, with Monday as day 1 and Sunday as day 7. If **day** + is given, each accounting period runs from the time __HH:MM__ each day to the + same time on the next day. All times are local, and given in 24-hour time. + (Default: "month 1 0:00") [[RefuseUnknownExits]] **RefuseUnknownExits** **0**|**1**|**auto**:: Prevent nodes that don't appear in the consensus from exiting using this

1 0

[tor/maint-0.3.3] Tweaks into AccountingStart documentation.
by nickm＠torproject.org 13 Mar '18

13 Mar '18

commit c1cfa0fbc4864ae5c54cb89c84a184523ea1aa9e Author: Fernando Fernandez Mancera <ffmancera(a)riseup.net> Date: Thu Mar 8 12:28:34 2018 +0100 Tweaks into AccountingStart documentation. Signed-off-by: Fernando Fernandez Mancera <ffmancera(a)riseup.net> --- doc/tor.1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 54375300a..41dab4ae3 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2173,7 +2173,7 @@ is non-zero): Specify how long accounting periods last. If **month** is given, each accounting period runs from the time __HH:MM__ on the __dayth__ day of one month to the same day and time of the next. The relay will go at full speed, - use all the quota you specify, then hibernate for the rest of the month.(The + use all the quota you specify, then hibernate for the rest of the period. (The day must be between 1 and 28.) If **week** is given, each accounting period runs from the time __HH:MM__ of the __dayth__ day of one week to the same day and time of the next week, with Monday as day 1 and Sunday as day 7. If **day**

1 0

[tor/maint-0.3.3] Merge remote-tracking branch 'ffmancera-1/bug23635' into maint-0.3.3
by nickm＠torproject.org 13 Mar '18

13 Mar '18

commit f0f2fab5e16cadf37938b48a47c062e539eef9c0 Merge: 6bc324c96 c1cfa0fbc Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 13 11:02:34 2018 -0400 Merge remote-tracking branch 'ffmancera-1/bug23635' into maint-0.3.3 changes/ticket23635 | 3 +++ doc/tor.1.txt | 19 ++++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-)

1 0