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

[metrics-lib/master] Replace Comparator with lambda.
by karsten＠torproject.org 27 Aug '18

27 Aug '18

commit ad0c33015c8ca141d99645d03a92822e369496b7 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 12:34:09 2018 +0200 Replace Comparator with lambda. --- .../descriptor/impl/ExtraInfoDescriptorImpl.java | 35 ++++++++-------------- 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/src/main/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java index ade341b..7590d47 100644 --- a/src/main/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java @@ -11,7 +11,6 @@ import java.io.File; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; -import java.util.Comparator; import java.util.EnumSet; import java.util.HashMap; import java.util.List; @@ -605,28 +604,20 @@ public abstract class ExtraInfoDescriptorImpl extends DescriptorImpl private SortedMap<String, Long> sortByPorts( SortedMap<String, Long> naturalOrder) { SortedMap<String, Long> byPortNumber = - new TreeMap<>(new Comparator<String>() { - public int compare(String arg0, String arg1) { - int port0 = 0; - int port1 = 0; - try { - port1 = Integer.parseInt(arg1); - } catch (NumberFormatException e) { - return -1; - } - try { - port0 = Integer.parseInt(arg0); - } catch (NumberFormatException e) { - return 1; - } - if (port0 < port1) { - return -1; - } else if (port0 > port1) { - return 1; - } else { - return 0; - } + new TreeMap<>((arg0, arg1) -> { + int port0; + int port1; + try { + port1 = Integer.parseInt(arg1); + } catch (NumberFormatException e) { + return -1; + } + try { + port0 = Integer.parseInt(arg0); + } catch (NumberFormatException e) { + return 1; } + return Integer.compare(port0, port1); } ); byPortNumber.putAll(naturalOrder);

1 0

[metrics-lib/master] Use Java 5 and 7 idioms in more places.
by karsten＠torproject.org 27 Aug '18

27 Aug '18

commit c5568eec63f21c325f8122ea8a67943c5ee0ce41 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 12:22:16 2018 +0200 Use Java 5 and 7 idioms in more places. --- .../java/org/torproject/descriptor/impl/DescriptorImpl.java | 2 +- .../torproject/descriptor/impl/ExtraInfoDescriptorImpl.java | 2 +- .../org/torproject/descriptor/impl/MicrodescriptorImpl.java | 4 ++-- .../org/torproject/descriptor/impl/NetworkStatusEntryImpl.java | 4 ++-- src/main/java/org/torproject/descriptor/impl/ParseHelper.java | 10 +++++----- .../org/torproject/descriptor/impl/RelayDirectoryImpl.java | 3 +-- .../org/torproject/descriptor/impl/ServerDescriptorImpl.java | 4 ++-- .../java/org/torproject/descriptor/impl/TorperfResultImpl.java | 3 +-- .../descriptor/index/DescriptorIndexCollectorTest.java | 2 +- 9 files changed, 16 insertions(+), 18 deletions(-) diff --git a/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java index a6acee7..2e7b0f9 100644 --- a/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java @@ -189,7 +189,7 @@ public abstract class DescriptorImpl implements Descriptor { @Override public List<String> getUnrecognizedLines() { - return this.unrecognizedLines == null ? new ArrayList<String>() + return this.unrecognizedLines == null ? new ArrayList<>() : new ArrayList<>(this.unrecognizedLines); } diff --git a/src/main/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java index d0e3d7e..ade341b 100644 --- a/src/main/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java @@ -605,7 +605,7 @@ public abstract class ExtraInfoDescriptorImpl extends DescriptorImpl private SortedMap<String, Long> sortByPorts( SortedMap<String, Long> naturalOrder) { SortedMap<String, Long> byPortNumber = - new TreeMap<String, Long>(new Comparator<String>() { + new TreeMap<>(new Comparator<String>() { public int compare(String arg0, String arg1) { int port0 = 0; int port1 = 0; diff --git a/src/main/java/org/torproject/descriptor/impl/MicrodescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/MicrodescriptorImpl.java index f91362e..44c25a2 100644 --- a/src/main/java/org/torproject/descriptor/impl/MicrodescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/MicrodescriptorImpl.java @@ -170,8 +170,8 @@ public class MicrodescriptorImpl extends DescriptorImpl case "accept": case "reject": String[] ports = parts[2].split(",", -1); - for (int i = 0; i < ports.length; i++) { - if (ports[i].length() < 1) { + for (String port : ports) { + if (port.length() < 1) { isValid = false; break; } diff --git a/src/main/java/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java b/src/main/java/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java index 4472875..3c0c1af 100644 --- a/src/main/java/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java @@ -235,8 +235,8 @@ public class NetworkStatusEntryImpl implements NetworkStatusEntry { this.defaultPolicy = parts[1]; this.portList = parts[2]; String[] ports = parts[2].split(",", -1); - for (int i = 0; i < ports.length; i++) { - if (ports[i].length() < 1) { + for (String port : ports) { + if (port.length() < 1) { isValid = false; break; } diff --git a/src/main/java/org/torproject/descriptor/impl/ParseHelper.java b/src/main/java/org/torproject/descriptor/impl/ParseHelper.java index 49a3430..93ad610 100644 --- a/src/main/java/org/torproject/descriptor/impl/ParseHelper.java +++ b/src/main/java/org/torproject/descriptor/impl/ParseHelper.java @@ -252,14 +252,14 @@ public class ParseHelper { protected static SortedMap<String, String> parseKeyValueStringPairs( String line, String[] parts, int startIndex) throws DescriptorParseException { - return (new KeyValueMap<String>(String.class)) + return (new KeyValueMap<>(String.class)) .parseKeyValueList(line, parts, startIndex, 0, " "); } protected static SortedMap<String, Integer> parseKeyValueIntegerPairs( String line, String[] parts, int startIndex) throws DescriptorParseException { - return (new KeyValueMap<Integer>(Integer.class)) + return (new KeyValueMap<>(Integer.class)) .parseKeyValueList(line, parts, startIndex, 0, " "); } @@ -354,7 +354,7 @@ public class ParseHelper { parseCommaSeparatedKeyLongValueList(String line, String[] partsNoOpt, int index, int keyLength) throws DescriptorParseException { - return (new KeyValueMap<Long>(Long.class)) + return (new KeyValueMap<>(Long.class)) .parseKeyValueList(line, partsNoOpt, index, keyLength, ","); } @@ -410,7 +410,7 @@ public class ParseHelper { parseSpaceSeparatedStringKeyDoubleValueMap(String line, String[] partsNoOpt, int startIndex) throws DescriptorParseException { - return (new KeyValueMap<Double>(Double.class)) + return (new KeyValueMap<>(Double.class)) .parseKeyValueList(line, partsNoOpt, startIndex, -1, " "); } @@ -418,7 +418,7 @@ public class ParseHelper { parseSpaceSeparatedStringKeyLongValueMap(String line, String[] partsNoOpt, int startIndex) throws DescriptorParseException { - return (new KeyValueMap<Long>(Long.class)) + return (new KeyValueMap<>(Long.class)) .parseKeyValueList(line, partsNoOpt, startIndex, -1, " "); } diff --git a/src/main/java/org/torproject/descriptor/impl/RelayDirectoryImpl.java b/src/main/java/org/torproject/descriptor/impl/RelayDirectoryImpl.java index 590b7ab..802469f 100644 --- a/src/main/java/org/torproject/descriptor/impl/RelayDirectoryImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/RelayDirectoryImpl.java @@ -284,8 +284,7 @@ public class RelayDirectoryImpl extends DescriptorImpl + "'."); } else if (partsNoOpt.length == 2) { String[] versions = partsNoOpt[1].split(",", -1); - for (int i = 0; i < versions.length; i++) { - String version = versions[i]; + for (String version : versions) { if (version.length() < 1) { throw new DescriptorParseException("Illegal versions line '" + line + "'."); diff --git a/src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java index e3b2a17..804976f 100644 --- a/src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java @@ -546,8 +546,8 @@ public abstract class ServerDescriptorImpl extends DescriptorImpl this.ipv6DefaultPolicy = partsNoOpt[1]; this.ipv6PortList = partsNoOpt[2]; String[] ports = partsNoOpt[2].split(",", -1); - for (int i = 0; i < ports.length; i++) { - if (ports[i].length() < 1) { + for (String port : ports) { + if (port.length() < 1) { isValid = false; break; } diff --git a/src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java b/src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java index de436b5..92b7750 100644 --- a/src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java @@ -74,8 +74,7 @@ public class TorperfResultImpl extends DescriptorImpl throw new DescriptorParseException("Blank lines are not allowed."); } String[] parts = line.split(" "); - for (int i = 0; i < parts.length; i++) { - String keyValue = parts[i]; + for (String keyValue : parts) { String[] keyValueParts = keyValue.split("="); if (keyValueParts.length != 2) { throw new DescriptorParseException("Illegal key-value pair in " diff --git a/src/test/java/org/torproject/descriptor/index/DescriptorIndexCollectorTest.java b/src/test/java/org/torproject/descriptor/index/DescriptorIndexCollectorTest.java index 1180301..bde64d6 100644 --- a/src/test/java/org/torproject/descriptor/index/DescriptorIndexCollectorTest.java +++ b/src/test/java/org/torproject/descriptor/index/DescriptorIndexCollectorTest.java @@ -288,7 +288,7 @@ public class DescriptorIndexCollectorTest { SortedMap<String, FileNode> fm = new TreeMap<>(); fm.put("readonly", new FileNode("w", 2L, "2100-01-01 01:01")); new DescriptorIndexCollector() - .fetchRemoteFiles("", fm, 100L, dir, new TreeMap<String, Long>()); + .fetchRemoteFiles("", fm, 100L, dir, new TreeMap<>()); } }

1 0

[metrics-lib/master] Use more powerful Map methods.
by karsten＠torproject.org 27 Aug '18

27 Aug '18

commit 27fe727b7c830195d41deb1840165227ca01ba97 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 15:20:45 2018 +0200 Use more powerful Map methods. --- src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java index 2e7b0f9..70fe7c6 100644 --- a/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java @@ -354,11 +354,7 @@ public abstract class DescriptorImpl implements Descriptor { } protected int getKeyCount(Key key) { - if (!this.parsedKeys.containsKey(key)) { - return 0; - } else { - return this.parsedKeys.get(key); - } + return this.parsedKeys.getOrDefault(key, 0); } protected void clearParsedKeys() {

1 0

[metrics-lib/master] Remove unthrown exceptions.
by karsten＠torproject.org 27 Aug '18

27 Aug '18

commit 27b197ff04ddef0e112ccd8dfb680cb0bcf23b7e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 14:32:45 2018 +0200 Remove unthrown exceptions. --- .../org/torproject/descriptor/impl/DescriptorParserImpl.java | 3 +-- .../java/org/torproject/descriptor/impl/RelayDirectoryImpl.java | 3 +-- .../org/torproject/descriptor/impl/RelayNetworkStatusImpl.java | 6 ++---- .../torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java | 9 +++------ .../org/torproject/descriptor/impl/ServerDescriptorImpl.java | 6 ++---- .../java/org/torproject/descriptor/impl/TorperfResultImpl.java | 3 +-- .../torproject/descriptor/index/DescriptorIndexCollector.java | 4 ++-- src/test/java/org/torproject/descriptor/DescriptorTest.java | 8 ++++---- .../org/torproject/descriptor/impl/DescriptorParserImplTest.java | 4 ++-- src/test/java/org/torproject/descriptor/impl/TestDescriptor.java | 3 +-- .../descriptor/index/DescriptorIndexCollectorTest.java | 2 +- .../java/org/torproject/descriptor/log/LogDescriptorTest.java | 2 +- 12 files changed, 21 insertions(+), 32 deletions(-) diff --git a/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java b/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java index ed97ef9..e8b8b08 100644 --- a/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java @@ -140,8 +140,7 @@ public class DescriptorParserImpl implements DescriptorParser { private List<Descriptor> parseOneOrMoreDescriptors(byte[] rawDescriptorBytes, File sourceFile, Key key, - Class<? extends DescriptorImpl> descriptorClass) - throws DescriptorParseException { + Class<? extends DescriptorImpl> descriptorClass) { List<Descriptor> parsedDescriptors = new ArrayList<>(); Constructor<? extends DescriptorImpl> constructor; try { diff --git a/src/main/java/org/torproject/descriptor/impl/RelayDirectoryImpl.java b/src/main/java/org/torproject/descriptor/impl/RelayDirectoryImpl.java index 802469f..d87b962 100644 --- a/src/main/java/org/torproject/descriptor/impl/RelayDirectoryImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/RelayDirectoryImpl.java @@ -60,8 +60,7 @@ public class RelayDirectoryImpl extends DescriptorImpl } } - private void parseServerDescriptors(int offset, int length) - throws DescriptorParseException { + private void parseServerDescriptors(int offset, int length) { List<int[]> offsetsAndLengths = this.splitByKey(Key.ROUTER, offset, length, true); for (int[] offsetAndLength : offsetsAndLengths) { diff --git a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java index a531395..93c66de 100644 --- a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java @@ -188,8 +188,7 @@ public class RelayNetworkStatusImpl extends NetworkStatusImpl parts[1]); } - private void parseContactLine(String line) - throws DescriptorParseException { + private void parseContactLine(String line) { if (line.length() > Key.CONTACT.keyword.length() + 1) { this.contactLine = line.substring(Key.CONTACT.keyword.length() + 1); } else { @@ -222,8 +221,7 @@ public class RelayNetworkStatusImpl extends NetworkStatusImpl 1, 2); } - private void parseDirOptionsLine(String[] parts) - throws DescriptorParseException { + private void parseDirOptionsLine(String[] parts) { String[] dirOptions = new String[parts.length - 1]; for (int i = 1; i < parts.length; i++) { dirOptions[i - 1] = parts[i]; diff --git a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java index 3373eaa..d686fa5 100644 --- a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java @@ -436,8 +436,7 @@ public class RelayNetworkStatusVoteImpl extends NetworkStatusImpl this.orPort = ParseHelper.parsePort(line, parts[6]); } - private void parseContactLine(String line) - throws DescriptorParseException { + private void parseContactLine(String line) { if (line.length() > Key.CONTACT.keyword.length() + 1) { this.contactLine = line.substring(Key.CONTACT.keyword.length() + 1); } else { @@ -454,8 +453,7 @@ public class RelayNetworkStatusVoteImpl extends NetworkStatusImpl this.sharedRandParticipate = true; } - private void parseSharedRandCommitLine(String line) - throws DescriptorParseException { + private void parseSharedRandCommitLine(String line) { if (this.sharedRandCommitLines == null) { this.sharedRandCommitLines = new ArrayList<>(); } @@ -571,8 +569,7 @@ public class RelayNetworkStatusVoteImpl extends NetworkStatusImpl } } - protected void parseFooter(int offset, int length) - throws DescriptorParseException { + protected void parseFooter(int offset, int length) { Scanner scanner = this.newScanner(offset, length).useDelimiter(NL); while (scanner.hasNext()) { String line = scanner.next(); diff --git a/src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java index 804976f..c06fb6e 100644 --- a/src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java @@ -286,8 +286,7 @@ public abstract class ServerDescriptorImpl extends DescriptorImpl } } - private void parsePlatformLine(String lineNoOpt) - throws DescriptorParseException { + private void parsePlatformLine(String lineNoOpt) { if (lineNoOpt.length() > Key.PLATFORM.keyword.length() + 1) { this.platform = lineNoOpt.substring(Key.PLATFORM.keyword.length() + 1); } else { @@ -384,8 +383,7 @@ public abstract class ServerDescriptorImpl extends DescriptorImpl } } - private void parseContactLine(String lineNoOpt) - throws DescriptorParseException { + private void parseContactLine(String lineNoOpt) { if (lineNoOpt.length() > Key.CONTACT.keyword.length() + 1) { this.contact = lineNoOpt.substring(Key.CONTACT.keyword.length() + 1); } else { diff --git a/src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java b/src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java index 92b7750..5a8ec66 100644 --- a/src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java @@ -215,8 +215,7 @@ public class TorperfResultImpl extends DescriptorImpl } } - private void parseSource(String value) - throws DescriptorParseException { + private void parseSource(String value) { this.source = value; } diff --git a/src/main/java/org/torproject/descriptor/index/DescriptorIndexCollector.java b/src/main/java/org/torproject/descriptor/index/DescriptorIndexCollector.java index 873eb81..48bb40c 100644 --- a/src/main/java/org/torproject/descriptor/index/DescriptorIndexCollector.java +++ b/src/main/java/org/torproject/descriptor/index/DescriptorIndexCollector.java @@ -170,8 +170,8 @@ public class DescriptorIndexCollector implements DescriptorCollector { Files.walkFileTree(localDir.toPath(), new SimpleFileVisitor<Path>() { @Override - public FileVisitResult visitFile(Path path, BasicFileAttributes bfa) - throws IOException { + public FileVisitResult visitFile(Path path, + BasicFileAttributes bfa) { locals.put(path.toFile().getAbsolutePath() .replace(localDir.getAbsolutePath() + "/", ""), path.toFile().lastModified()); diff --git a/src/test/java/org/torproject/descriptor/DescriptorTest.java b/src/test/java/org/torproject/descriptor/DescriptorTest.java index 2dd72e7..85ea813 100644 --- a/src/test/java/org/torproject/descriptor/DescriptorTest.java +++ b/src/test/java/org/torproject/descriptor/DescriptorTest.java @@ -107,7 +107,7 @@ public class DescriptorTest { } @Test - public void testCounts() throws Exception { + public void testCounts() { int descCount = 0; while (descs.hasNext()) { Descriptor desc = descs.next(); @@ -119,7 +119,7 @@ public class DescriptorTest { } @Test - public void testNewline() throws Exception { + public void testNewline() { while (descs.hasNext()) { Descriptor desc = descs.next(); byte[] raw = desc.getRawDescriptorBytes(); @@ -128,7 +128,7 @@ public class DescriptorTest { } @Test - public void testTypes() throws Exception { + public void testTypes() { while (descs.hasNext()) { Descriptor desc = descs.next(); assertTrue(filename + ": Expected " + descClass.getName() @@ -139,7 +139,7 @@ public class DescriptorTest { } @Test - public void testAnnotations() throws Exception { + public void testAnnotations() { while (descs.hasNext()) { Descriptor desc = descs.next(); for (String anno : annos) { diff --git a/src/test/java/org/torproject/descriptor/impl/DescriptorParserImplTest.java b/src/test/java/org/torproject/descriptor/impl/DescriptorParserImplTest.java index 70594d8..00b99a4 100644 --- a/src/test/java/org/torproject/descriptor/impl/DescriptorParserImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/DescriptorParserImplTest.java @@ -24,7 +24,7 @@ public class DescriptorParserImplTest { @Rule public ExpectedException thrown = ExpectedException.none(); - private TestDescriptor makeTestDesc(byte[] bytes) throws Exception { + private TestDescriptor makeTestDesc(byte[] bytes) { return new TestDescriptor(bytes, new int[]{0, bytes.length}); } @@ -40,7 +40,7 @@ public class DescriptorParserImplTest { + "id ed25519 ihsbrlWToq8b01rvfszqqTMUl2ulyPV3TniKuTENCzY\n"; @Test - public void testAnnotation() throws Exception { + public void testAnnotation() { TestDescriptor des = makeTestDesc(MICRO.getBytes()); DescriptorParserImpl dpi = new DescriptorParserImpl(); int parsedDescriptors = 0; diff --git a/src/test/java/org/torproject/descriptor/impl/TestDescriptor.java b/src/test/java/org/torproject/descriptor/impl/TestDescriptor.java index 1309070..9748f00 100644 --- a/src/test/java/org/torproject/descriptor/impl/TestDescriptor.java +++ b/src/test/java/org/torproject/descriptor/impl/TestDescriptor.java @@ -13,8 +13,7 @@ public class TestDescriptor extends DescriptorImpl { super(rawDescriptorBytes, offsetAndLength, null, blankLinesAllowed); } - protected TestDescriptor(byte[] rawDescriptorBytes, int[] offsetAndLength) - throws DescriptorParseException { + protected TestDescriptor(byte[] rawDescriptorBytes, int[] offsetAndLength) { super(rawDescriptorBytes, offsetAndLength, null); } } diff --git a/src/test/java/org/torproject/descriptor/index/DescriptorIndexCollectorTest.java b/src/test/java/org/torproject/descriptor/index/DescriptorIndexCollectorTest.java index bde64d6..6e4978b 100644 --- a/src/test/java/org/torproject/descriptor/index/DescriptorIndexCollectorTest.java +++ b/src/test/java/org/torproject/descriptor/index/DescriptorIndexCollectorTest.java @@ -276,7 +276,7 @@ public class DescriptorIndexCollectorTest { } @Test(expected = IllegalArgumentException.class) - public void testNullDirectory() throws IOException { + public void testNullDirectory() { new DescriptorIndexCollector().collectDescriptors( null, new String[]{}, 100L, null, false); } diff --git a/src/test/java/org/torproject/descriptor/log/LogDescriptorTest.java b/src/test/java/org/torproject/descriptor/log/LogDescriptorTest.java index e76566a..2e13a52 100644 --- a/src/test/java/org/torproject/descriptor/log/LogDescriptorTest.java +++ b/src/test/java/org/torproject/descriptor/log/LogDescriptorTest.java @@ -142,7 +142,7 @@ public class LogDescriptorTest { } @Test - public void testUnknownLogType() throws Exception { + public void testUnknownLogType() { assertEquals(dataUsed(), 1, this.reader.getParsedFiles().size()); File logFile = new File(this.reader.getParsedFiles().firstKey()); DescriptorParser dp = DescriptorSourceFactory.createDescriptorParser();

1 0

[metrics-lib/master] Avoid manual array copies.
by karsten＠torproject.org 27 Aug '18

27 Aug '18

commit 438c8ee334f3ec16ec83fcc81ec72c39d971cab6 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 15:42:09 2018 +0200 Avoid manual array copies. --- .../torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java | 4 +--- .../java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java | 4 +--- .../org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java index bb14c28..904dc35 100644 --- a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java @@ -285,9 +285,7 @@ public class RelayNetworkStatusConsensusImpl extends NetworkStatusImpl + "'."); } String[] knownFlags = new String[parts.length - 1]; - for (int i = 1; i < parts.length; i++) { - knownFlags[i - 1] = parts[i]; - } + System.arraycopy(parts, 1, knownFlags, 0, parts.length - 1); this.knownFlags = knownFlags; } diff --git a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java index 93c66de..11cc631 100644 --- a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java @@ -223,9 +223,7 @@ public class RelayNetworkStatusImpl extends NetworkStatusImpl private void parseDirOptionsLine(String[] parts) { String[] dirOptions = new String[parts.length - 1]; - for (int i = 1; i < parts.length; i++) { - dirOptions[i - 1] = parts[i]; - } + System.arraycopy(parts, 1, dirOptions, 0, parts.length - 1); this.dirOptions = dirOptions; } diff --git a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java index d686fa5..bb71842 100644 --- a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java @@ -355,9 +355,7 @@ public class RelayNetworkStatusVoteImpl extends NetworkStatusImpl + "'."); } String[] knownFlags = new String[parts.length - 1]; - for (int i = 1; i < parts.length; i++) { - knownFlags[i - 1] = parts[i]; - } + System.arraycopy(parts, 1, knownFlags, 0, parts.length - 1); this.knownFlags = knownFlags; }

1 0

[metrics-lib/master] Replace lambda with method reference.
by karsten＠torproject.org 27 Aug '18

27 Aug '18

commit 7e37ef510ff8ec25786b52508a56c54ded01f278 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 15:17:13 2018 +0200 Replace lambda with method reference. --- .../java/org/torproject/descriptor/log/WebServerAccessLogImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/descriptor/log/WebServerAccessLogImpl.java b/src/main/java/org/torproject/descriptor/log/WebServerAccessLogImpl.java index ffaef7b..27ec355 100644 --- a/src/main/java/org/torproject/descriptor/log/WebServerAccessLogImpl.java +++ b/src/main/java/org/torproject/descriptor/log/WebServerAccessLogImpl.java @@ -17,6 +17,7 @@ import java.nio.file.Paths; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.ArrayList; +import java.util.Collection; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -163,7 +164,7 @@ public class WebServerAccessLogImpl extends LogDescriptorImpl lineStr = br.readLine(); } br.close(); - return lists.stream().flatMap(list -> list.stream()); + return lists.stream().flatMap(Collection::stream); } catch (Exception ex) { throw new DescriptorParseException("Cannot retrieve log lines.", ex); }

1 0

[metrics-lib/master] Remove unnecessary boxing.
by karsten＠torproject.org 27 Aug '18

27 Aug '18

commit 1335a527a7ba745177a08ce9e5c3f86d19ae88fa Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 15:00:36 2018 +0200 Remove unnecessary boxing. --- .../org/torproject/descriptor/DescriptorTest.java | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/test/java/org/torproject/descriptor/DescriptorTest.java b/src/test/java/org/torproject/descriptor/DescriptorTest.java index 85ea813..9e32ac9 100644 --- a/src/test/java/org/torproject/descriptor/DescriptorTest.java +++ b/src/test/java/org/torproject/descriptor/DescriptorTest.java @@ -29,58 +29,58 @@ public class DescriptorTest { {"other/2017-07-17-17-02-00", // test-filename in src/test/resources ExitList.class, // descriptor type, i.e., the most specific interface new String[] {"@type tordnsel 1.0"}, // all annotations - Integer.valueOf(1)}, // expected descriptor count in descriptor file + 1}, // expected descriptor count in descriptor file {"other/op-nl-5242880-2017-07-17.tpf", TorperfResult.class, new String[] {"@type torperf 1.1"}, - Integer.valueOf(4)}, + 4}, {"relay/2017-07-17-17-00-00-consensus", RelayNetworkStatusConsensus.class, new String[] {"@type network-status-consensus-3 1.0"}, - Integer.valueOf(1)}, + 1}, {"relay/2017-07-17-17-00-00-consensus-microdesc", RelayNetworkStatusConsensus.class, new String[] {"@type network-status-microdesc-consensus-3 1.0"}, - Integer.valueOf(1)}, + 1}, {"relay/2017-07-17-17-00-00-vote-0232AF901C31A04EE9848595AF9BB" + "7620D4C5B2E-6C2F5B0D52DFB3E4CA3DDEEAD690CC563CAF0601", RelayNetworkStatusVote.class, new String[] {"@type network-status-vote-3 1.0"}, - Integer.valueOf(1)}, + 1}, {"relay/2017-07-17-17-20-00-extra-infos", RelayExtraInfoDescriptor.class, new String[] {"@type extra-info 1.0"}, - Integer.valueOf(6)}, + 6}, {"relay/2017-07-17-17-20-00-micro", Microdescriptor.class, new String[] {"@type microdescriptor 1.0"}, - Integer.valueOf(14)}, + 14}, {"relay/2017-07-17-17-20-00-server-descriptors", RelayServerDescriptor.class, new String[] {"@type server-descriptor 1.0"}, - Integer.valueOf(4)}, + 4}, {"bridge/20170717-170645-1D8F3A91C37C5D1C4C19B1AD1D0CFBE8BF72D8E1", BridgeNetworkStatus.class, new String[] {"@type bridge-network-status 1.2"}, - Integer.valueOf(1)}, + 1}, {"bridge/2017-07-17-17-09-00-extra-infos", BridgeExtraInfoDescriptor.class, new String[] {"@type bridge-extra-info 1.3"}, - Integer.valueOf(6)}, + 6}, {"bridge/2017-07-17-17-09-00-server-descriptors", BridgeServerDescriptor.class, new String[] {"@type bridge-server-descriptor 1.2"}, - Integer.valueOf(13)} + 13} }); }

1 0

[metrics-lib/master] Remove redundant casts.
by karsten＠torproject.org 27 Aug '18

27 Aug '18

commit d15ef8018b560e9054dbf926bedccdaa51711682 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 15:52:48 2018 +0200 Remove redundant casts. --- .../descriptor/impl/ServerDescriptorImplTest.java | 56 +++++++++++----------- .../descriptor/impl/TorperfResultImplTest.java | 12 ++--- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/test/java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java b/src/test/java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java index b81c3fb..977a16e 100644 --- a/src/test/java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java @@ -464,22 +464,22 @@ public class ServerDescriptorImplTest { ServerDescriptor descriptor = db.buildDescriptor(); assertEquals("saberrider2008", descriptor.getNickname()); assertEquals("94.134.192.243", descriptor.getAddress()); - assertEquals(9001, (int) descriptor.getOrPort()); - assertEquals(0, (int) descriptor.getSocksPort()); - assertEquals(0, (int) descriptor.getDirPort()); + assertEquals(9001, descriptor.getOrPort()); + assertEquals(0, descriptor.getSocksPort()); + assertEquals(0, descriptor.getDirPort()); assertEquals("Tor 0.2.2.35 (git-b04388f9e7546a9f) on Linux i686", descriptor.getPlatform()); - assertEquals(new TreeSet<Long>(Arrays.asList( - new Long[] { 1L, 2L, 3L, 4L })), descriptor.getProtocols().get("Link")); - assertEquals(new TreeSet<Long>(Arrays.asList( - new Long[] { 1L })), descriptor.getProtocols().get("LinkAuth")); + assertEquals(new TreeSet<>(Arrays.asList( + new Long[]{1L, 2L, 3L, 4L})), descriptor.getProtocols().get("Link")); + assertEquals(new TreeSet<>(Arrays.asList( + new Long[]{1L})), descriptor.getProtocols().get("LinkAuth")); assertEquals(1325390599000L, descriptor.getPublishedMillis()); assertEquals("D8733048FC8EC9102466AD8F3098622BF1BF71FD", descriptor.getFingerprint()); assertEquals(48, descriptor.getUptime().longValue()); - assertEquals(51200, (int) descriptor.getBandwidthRate()); - assertEquals(51200, (int) descriptor.getBandwidthBurst()); - assertEquals(53470, (int) descriptor.getBandwidthObserved()); + assertEquals(51200, descriptor.getBandwidthRate()); + assertEquals(51200, descriptor.getBandwidthBurst()); + assertEquals(53470, descriptor.getBandwidthObserved()); assertEquals("1469D1550738A25B1E7B47CDDBCD7B2899F51B74", descriptor.getExtraInfoDigestSha1Hex()); assertTrue(descriptor.isHiddenServiceDir()); @@ -516,9 +516,9 @@ public class ServerDescriptorImplTest { + "94.134.192.243 9001 0 0"); assertEquals("saberrider2008", descriptor.getNickname()); assertEquals("94.134.192.243", descriptor.getAddress()); - assertEquals(9001, (int) descriptor.getOrPort()); - assertEquals(0, (int) descriptor.getSocksPort()); - assertEquals(0, (int) descriptor.getDirPort()); + assertEquals(9001, descriptor.getOrPort()); + assertEquals(0, descriptor.getSocksPort()); + assertEquals(0, descriptor.getDirPort()); } @Test @@ -710,9 +710,9 @@ public class ServerDescriptorImplTest { public void testProtoGreenPurple() throws DescriptorParseException { ServerDescriptor descriptor = DescriptorBuilder .createWithProtoLine("proto Green=23 Purple=42"); - assertEquals(new TreeSet<Long>(Arrays.asList(new Long[] { 23L })), + assertEquals(new TreeSet<>(Arrays.asList(new Long[]{23L})), descriptor.getProtocols().get("Green")); - assertEquals(new TreeSet<Long>(Arrays.asList(new Long[] { 42L })), + assertEquals(new TreeSet<>(Arrays.asList(new Long[]{42L})), descriptor.getProtocols().get("Purple")); } @@ -876,9 +876,9 @@ public class ServerDescriptorImplTest { public void testBandwidthOpt() throws DescriptorParseException { ServerDescriptor descriptor = DescriptorBuilder .createWithBandwidthLine("opt bandwidth 51200 51200 53470"); - assertEquals(51200, (int) descriptor.getBandwidthRate()); - assertEquals(51200, (int) descriptor.getBandwidthBurst()); - assertEquals(53470, (int) descriptor.getBandwidthObserved()); + assertEquals(51200, descriptor.getBandwidthRate()); + assertEquals(51200, descriptor.getBandwidthBurst()); + assertEquals(53470, descriptor.getBandwidthObserved()); } @Test @@ -904,9 +904,9 @@ public class ServerDescriptorImplTest { * value. */ ServerDescriptor descriptor = DescriptorBuilder .createWithBandwidthLine("bandwidth 51200 51200"); - assertEquals(51200, (int) descriptor.getBandwidthRate()); - assertEquals(51200, (int) descriptor.getBandwidthBurst()); - assertEquals(-1, (int) descriptor.getBandwidthObserved()); + assertEquals(51200, descriptor.getBandwidthRate()); + assertEquals(51200, descriptor.getBandwidthBurst()); + assertEquals(-1, descriptor.getBandwidthObserved()); } @Test @@ -1298,9 +1298,9 @@ public class ServerDescriptorImplTest { assertNotNull(descriptor.getWriteHistory()); BandwidthHistory parsedWriteHistory = descriptor.getWriteHistory(); assertEquals(writeHistoryLine, parsedWriteHistory.getLine()); - assertEquals(1325389904000L, (long) parsedWriteHistory + assertEquals(1325389904000L, parsedWriteHistory .getHistoryEndMillis()); - assertEquals(900L, (long) parsedWriteHistory.getIntervalLength()); + assertEquals(900L, parsedWriteHistory.getIntervalLength()); SortedMap<Long, Long> bandwidthValues = parsedWriteHistory .getBandwidthValues(); assertEquals(4345856L, (long) bandwidthValues.remove(1325387204000L)); @@ -1386,7 +1386,7 @@ public class ServerDescriptorImplTest { ServerDescriptor descriptor = DescriptorBuilder .createWithWriteHistoryLine("write-history 2012-01-01 03:51:44 " + "(900 s) "); - assertEquals(900, (long) descriptor.getWriteHistory() + assertEquals(900, descriptor.getWriteHistory() .getIntervalLength()); assertTrue(descriptor.getWriteHistory().getBandwidthValues() .isEmpty()); @@ -1398,7 +1398,7 @@ public class ServerDescriptorImplTest { ServerDescriptor descriptor = DescriptorBuilder .createWithWriteHistoryLine("write-history 2012-01-01 03:51:44 " + "(900 s)"); - assertEquals(900, (long) descriptor.getWriteHistory() + assertEquals(900, descriptor.getWriteHistory() .getIntervalLength()); assertTrue(descriptor.getWriteHistory().getBandwidthValues() .isEmpty()); @@ -1426,7 +1426,7 @@ public class ServerDescriptorImplTest { ServerDescriptor descriptor = DescriptorBuilder .createWithWriteHistoryLine("write-history 2012-01-01 03:51:44 " + "(1800 s) 4345856"); - assertEquals(1800L, (long) descriptor.getWriteHistory() + assertEquals(1800L, descriptor.getWriteHistory() .getIntervalLength()); } @@ -1439,9 +1439,9 @@ public class ServerDescriptorImplTest { assertNotNull(descriptor.getReadHistory()); BandwidthHistory parsedReadHistory = descriptor.getReadHistory(); assertEquals(readHistoryLine, parsedReadHistory.getLine()); - assertEquals(1325389904000L, (long) parsedReadHistory + assertEquals(1325389904000L, parsedReadHistory .getHistoryEndMillis()); - assertEquals(900L, (long) parsedReadHistory.getIntervalLength()); + assertEquals(900L, parsedReadHistory.getIntervalLength()); SortedMap<Long, Long> bandwidthValues = parsedReadHistory .getBandwidthValues(); assertEquals(4268032L, (long) bandwidthValues.remove(1325387204000L)); diff --git a/src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java b/src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java index 7bc689e..2af458f 100644 --- a/src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java @@ -41,12 +41,12 @@ public class TorperfResultImplTest { List<Descriptor> result = TorperfResultImpl.parseTorperfResults( asciiBytes, null); assertEquals("Expected one annotation.", 1, - ((TorperfResultImpl)(result.get(0))).getAnnotations().size()); + result.get(0).getAnnotations().size()); assertEquals(3, result.size()); assertEquals("Expected zero annotations.", 0, - ((TorperfResultImpl)(result.get(1))).getAnnotations().size()); + result.get(1).getAnnotations().size()); assertEquals("Expected zero annotations.", 0, - ((TorperfResultImpl)(result.get(2))).getAnnotations().size()); + result.get(2).getAnnotations().size()); } @Test @@ -57,12 +57,12 @@ public class TorperfResultImplTest { List<Descriptor> result = TorperfResultImpl.parseTorperfResults( asciiBytes, null); assertEquals("Expected one annotation.", 1, - ((TorperfResultImpl)(result.get(0))).getAnnotations().size()); + result.get(0).getAnnotations().size()); assertEquals(3, result.size()); assertEquals("Expected one annotation.", 1, - ((TorperfResultImpl)(result.get(1))).getAnnotations().size()); + result.get(1).getAnnotations().size()); assertEquals("Expected one annotation.", 1, - ((TorperfResultImpl)(result.get(2))).getAnnotations().size()); + result.get(2).getAnnotations().size()); } @Test

1 0

[metrics-lib/master] Replace while with for loops.
by karsten＠torproject.org 27 Aug '18

27 Aug '18

commit 0f4896c1f45122d4aaf46bcf48ce1730a645062b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 15:33:17 2018 +0200 Replace while with for loops. --- .../descriptor/benchmark/MeasurePerformance.java | 27 ++++++++-------------- 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/src/test/java/org/torproject/descriptor/benchmark/MeasurePerformance.java b/src/test/java/org/torproject/descriptor/benchmark/MeasurePerformance.java index 20df999..cf85e22 100644 --- a/src/test/java/org/torproject/descriptor/benchmark/MeasurePerformance.java +++ b/src/test/java/org/torproject/descriptor/benchmark/MeasurePerformance.java @@ -14,7 +14,6 @@ import org.torproject.descriptor.ServerDescriptor; import java.io.File; import java.util.HashSet; -import java.util.Iterator; import java.util.Set; import java.util.SortedMap; @@ -93,10 +92,8 @@ public class MeasurePerformance { long countedServerDescriptors = 0; DescriptorReader descriptorReader = DescriptorSourceFactory.createDescriptorReader(); - Iterator<Descriptor> descriptors = - descriptorReader.readDescriptors(tarballFileOrDirectory).iterator(); - while (descriptors.hasNext()) { - Descriptor descriptor = descriptors.next(); + for (Descriptor descriptor + : descriptorReader.readDescriptors(tarballFileOrDirectory)) { if (!(descriptor instanceof ServerDescriptor)) { continue; } @@ -127,10 +124,8 @@ public class MeasurePerformance { long countedExtraInfoDescriptors = 0; DescriptorReader descriptorReader = DescriptorSourceFactory.createDescriptorReader(); - Iterator<Descriptor> descriptors = - descriptorReader.readDescriptors(tarballFile).iterator(); - while (descriptors.hasNext()) { - Descriptor descriptor = descriptors.next(); + for (Descriptor descriptor + : descriptorReader.readDescriptors(tarballFile)) { if (!(descriptor instanceof ExtraInfoDescriptor)) { continue; } @@ -165,10 +160,8 @@ public class MeasurePerformance { long countedConsensuses = 0L; DescriptorReader descriptorReader = DescriptorSourceFactory.createDescriptorReader(); - Iterator<Descriptor> descriptors = - descriptorReader.readDescriptors(tarballFileOrDirectory).iterator(); - while (descriptors.hasNext()) { - Descriptor descriptor = descriptors.next(); + for (Descriptor descriptor + : descriptorReader.readDescriptors(tarballFileOrDirectory)) { if (!(descriptor instanceof RelayNetworkStatusConsensus)) { continue; } @@ -207,10 +200,8 @@ public class MeasurePerformance { long countedMicrodescriptors = 0L; DescriptorReader descriptorReader = DescriptorSourceFactory.createDescriptorReader(); - Iterator<Descriptor> descriptors = - descriptorReader.readDescriptors(tarballFile).iterator(); - while (descriptors.hasNext()) { - Descriptor descriptor = descriptors.next(); + for (Descriptor descriptor + : descriptorReader.readDescriptors(tarballFile)) { if (!(descriptor instanceof Microdescriptor)) { continue; } @@ -221,7 +212,7 @@ public class MeasurePerformance { continue; } boolean accept = "accept".equals( - microdescriptor.getDefaultPolicy()); + microdescriptor.getDefaultPolicy()); for (String ports : microdescriptor.getPortList().split(",")) { if (ports.contains("-")) { String[] parts = ports.split("-");

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 27 Aug '18

27 Aug '18

commit ff9e4fbe933847f757a38f69649744480bbfcd38 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 27 12:17:57 2018 +0000 Update translations for torbutton-torbuttondtd --- pa/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pa/torbutton.dtd b/pa/torbutton.dtd index 43f4110a6..f75bf93a5 100644 --- a/pa/torbutton.dtd +++ b/pa/torbutton.dtd @@ -5,7 +5,7 @@ <!ENTITY torbutton.context_menu.preferences "Security Settings…"> <!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Tor Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "N"> +<!ENTITY torbutton.context_menu.networksettings.key "ਨ"> <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Update…"> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections…">

1 0