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

[onionoo/master] Add "version" field to details documents.
by karsten＠torproject.org 27 Nov '17

27 Nov '17

commit bd5b45a79cc71410c66b776c44d52f7f2e84a117 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Nov 18 17:32:27 2017 +0100 Add "version" field to details documents. Add a "version" field to relay details documents with the Tor software version listed in the consensus and similarly to bridge details documents with the Tor software version found in the server descriptor. Implements #22488. --- CHANGELOG.md | 9 +++++++++ .../org/torproject/onionoo/docs/DetailsDocument.java | 10 ++++++++++ .../org/torproject/onionoo/docs/DetailsStatus.java | 10 ++++++++++ .../java/org/torproject/onionoo/docs/NodeStatus.java | 3 +-- .../torproject/onionoo/server/ResponseBuilder.java | 2 ++ .../onionoo/updater/NodeDetailsStatusUpdater.java | 19 ++++++++++++++++++- .../onionoo/writer/DetailsDocumentWriter.java | 2 ++ 7 files changed, 52 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eef02a8..3adcdd4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# Changes in version 4.4-1.8.0 - 2017-??-?? + + * Medium changes + - Add a "version" field to relay details documents with the Tor + software version listed in the consensus and similarly to bridge + details documents with the Tor software version found in the + server descriptor. + + # Changes in version 4.3-1.7.1 - 2017-11-17 * Minor changes diff --git a/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java b/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java index bde3cae..911a978 100644 --- a/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java +++ b/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java @@ -346,6 +346,16 @@ public class DetailsDocument extends Document { return unescapeJson(this.platform); } + private String version; + + public void setVersion(String version) { + this.version = version; + } + + public String getVersion() { + return this.version; + } + private SortedSet<String> alleged_family; public void setAllegedFamily(SortedSet<String> allegedFamily) { diff --git a/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java b/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java index 77ff75f..9ed8658 100644 --- a/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java +++ b/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java @@ -540,5 +540,15 @@ public class DetailsStatus extends Document { public List<String> getAdvertisedOrAddresses() { return this.advertised_or_addresses; } + + private String version; + + public void setVersion(String version) { + this.version = version; + } + + public String getVersion() { + return this.version; + } } diff --git a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java index 3271ccc..7a8510e 100644 --- a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java +++ b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java @@ -324,8 +324,7 @@ public class NodeStatus extends Document { private String version; public void setVersion(String version) { - this.version = null == version ? null - : version.substring(version.lastIndexOf(" ") + 1); + this.version = version; } public String getVersion() { diff --git a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java index 58b66ce..a83234b 100644 --- a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java +++ b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java @@ -342,6 +342,8 @@ public class ResponseBuilder { } else if (field.equals("unreachable_or_addresses")) { dd.setUnreachableOrAddresses( detailsDocument.getUnreachableOrAddresses()); + } else if (field.equals("version")) { + dd.setVersion(detailsDocument.getVersion()); } } /* Don't escape HTML characters, like < and >, contained in diff --git a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java index fa3f3af..7792764 100644 --- a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java +++ b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java @@ -291,7 +291,12 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, nodeStatus.setRecommendedVersion((recommendedVersions == null || entry.getVersion() == null) ? null : recommendedVersions.contains(entry.getVersion())); - nodeStatus.setVersion(entry.getVersion()); + String version = null; + if (null != entry.getVersion() + && entry.getVersion().startsWith("Tor ")) { + version = entry.getVersion().split(" ")[1]; + } + nodeStatus.setVersion(version); } if (entry.getUnmeasured()) { if (!this.lastSeenUnmeasured.containsKey(fingerprint) @@ -784,6 +789,17 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, nodeStatus.setContact(detailsStatus.getContact()); + /* Extract tor software version for bridges from their "platform" line. + * (We already know this for relays from "v" lines in the consensus.) */ + if (!nodeStatus.isRelay()) { + String version = null; + if (null != detailsStatus.getPlatform() + && detailsStatus.getPlatform().startsWith("Tor ")) { + version = detailsStatus.getPlatform().split(" ")[1]; + } + nodeStatus.setVersion(version); + } + Map<String, Long> exitAddresses = new HashMap<>(); if (detailsStatus.getExitAddresses() != null) { for (Map.Entry<String, Long> e : @@ -890,6 +906,7 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, nodeStatus.getRecommendedVersion()); detailsStatus.setLastChangedOrAddressOrPort( nodeStatus.getLastChangedOrAddressOrPort()); + detailsStatus.setVersion(nodeStatus.getVersion()); this.documentStore.store(detailsStatus, fingerprint); this.documentStore.store(nodeStatus, fingerprint); diff --git a/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java b/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java index 9538cba..5eaa950 100644 --- a/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java +++ b/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java @@ -165,6 +165,7 @@ public class DetailsDocumentWriter implements DocumentWriter { if (!unreachableOrAddresses.isEmpty()) { detailsDocument.setUnreachableOrAddresses(unreachableOrAddresses); } + detailsDocument.setVersion(detailsStatus.getVersion()); this.documentStore.store(detailsDocument, fingerprint); } @@ -193,6 +194,7 @@ public class DetailsDocumentWriter implements DocumentWriter { detailsStatus.getAdvertisedBandwidth()); detailsDocument.setPlatform(detailsStatus.getPlatform()); detailsDocument.setTransports(detailsStatus.getTransports()); + detailsDocument.setVersion(detailsStatus.getVersion()); this.documentStore.store(detailsDocument, fingerprint); }

1 0

[onionoo/master] Extend "version" parameter to bridges.
by karsten＠torproject.org 27 Nov '17

27 Nov '17

commit 919d5ff967ecaa401b8a0a91885fbe7b84c9807c Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Nov 18 17:35:30 2017 +0100 Extend "version" parameter to bridges. Extend the "version" parameter to also return bridges with the given version or version prefix. Implements #23962. --- CHANGELOG.md | 2 ++ .../org/torproject/onionoo/server/NodeIndex.java | 10 ++++++++ .../org/torproject/onionoo/server/NodeIndexer.java | 10 ++++++++ .../torproject/onionoo/server/RequestHandler.java | 9 ++++++- .../onionoo/server/ResourceServletTest.java | 29 +++++++++++++--------- 5 files changed, 47 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3adcdd4..918a1ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ software version listed in the consensus and similarly to bridge details documents with the Tor software version found in the server descriptor. + - Extend the "version" parameter to also return bridges with the + given version or version prefix. # Changes in version 4.3-1.7.1 - 2017-11-17 diff --git a/src/main/java/org/torproject/onionoo/server/NodeIndex.java b/src/main/java/org/torproject/onionoo/server/NodeIndex.java index 126cd5c..c41dd7a 100644 --- a/src/main/java/org/torproject/onionoo/server/NodeIndex.java +++ b/src/main/java/org/torproject/onionoo/server/NodeIndex.java @@ -180,6 +180,16 @@ class NodeIndex { return this.relaysByVersion; } + private Map<String, Set<String>> bridgesByVersion; + + public void setBridgesByVersion(Map<String, Set<String>> bridgesByVersion) { + this.bridgesByVersion = bridgesByVersion; + } + + public Map<String, Set<String>> getBridgesByVersion() { + return this.bridgesByVersion; + } + private Map<String, Set<String>> relaysByHostName; public void setRelaysByHostName(Map<String, Set<String>> relaysByHostName) { diff --git a/src/main/java/org/torproject/onionoo/server/NodeIndexer.java b/src/main/java/org/torproject/onionoo/server/NodeIndexer.java index d609f63..585d33f 100644 --- a/src/main/java/org/torproject/onionoo/server/NodeIndexer.java +++ b/src/main/java/org/torproject/onionoo/server/NodeIndexer.java @@ -154,6 +154,7 @@ public class NodeIndexer implements ServletContextListener, Runnable { Map<String, Set<String>> newRelaysByContact = new HashMap<>(); Map<String, Set<String>> newRelaysByFamily = new HashMap<>(); Map<String, Set<String>> newRelaysByVersion = new HashMap<>(); + Map<String, Set<String>> newBridgesByVersion = new HashMap<>(); Map<String, Set<String>> newRelaysByHostName = new HashMap<>(); SortedMap<Integer, Set<String>> newRelaysByFirstSeenDays = new TreeMap<>(); SortedMap<Integer, Set<String>> newBridgesByFirstSeenDays = new TreeMap<>(); @@ -323,6 +324,14 @@ public class NodeIndexer implements ServletContextListener, Runnable { hashedFingerprint); newBridgesByLastSeenDays.get(daysSinceLastSeen).add( hashedHashedFingerprint); + String version = entry.getVersion(); + if (null != version) { + if (!newBridgesByVersion.containsKey(version)) { + newBridgesByVersion.put(version, new HashSet<>()); + } + newBridgesByVersion.get(version).add(hashedFingerprint); + newBridgesByVersion.get(version).add(hashedHashedFingerprint); + } } NodeIndex newNodeIndex = new NodeIndex(); newNodeIndex.setRelayFingerprintSummaryLines( @@ -342,6 +351,7 @@ public class NodeIndexer implements ServletContextListener, Runnable { newNodeIndex.setRelaysPublishedMillis(relaysLastValidAfterMillis); newNodeIndex.setBridgesPublishedMillis(bridgesLastPublishedMillis); newNodeIndex.setRelaysByVersion(newRelaysByVersion); + newNodeIndex.setBridgesByVersion(newBridgesByVersion); newNodeIndex.setRelaysByHostName(newRelaysByHostName); synchronized (this) { this.lastIndexed = updateStatusMillis; diff --git a/src/main/java/org/torproject/onionoo/server/RequestHandler.java b/src/main/java/org/torproject/onionoo/server/RequestHandler.java index 23af60b..067a738 100644 --- a/src/main/java/org/torproject/onionoo/server/RequestHandler.java +++ b/src/main/java/org/torproject/onionoo/server/RequestHandler.java @@ -541,7 +541,14 @@ public class RequestHandler { } } this.filteredRelays.keySet().retainAll(keepRelays); - this.filteredBridges.clear(); + Set<String> keepBridges = new HashSet<>(); + for (Map.Entry<String, Set<String>> e + : this.nodeIndex.getBridgesByVersion().entrySet()) { + if (e.getKey().startsWith(this.version)) { + keepBridges.addAll(e.getValue()); + } + } + this.filteredBridges.keySet().retainAll(keepBridges); } private void filterByHostName() { diff --git a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java index 2720f7a..d763988 100644 --- a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java +++ b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java @@ -129,6 +129,7 @@ public class ResourceServletTest { @SuppressWarnings("JavadocMethod") @Before public void createSampleRelaysAndBridges() { + this.relays = new TreeMap<>(); org.torproject.onionoo.docs.SummaryDocument relayTorkaZ = new org.torproject.onionoo.docs.SummaryDocument(true, "TorkaZ", "000C5F55BD4814B917CC474BD537F1A3B33CCE2A", Arrays.asList( @@ -144,6 +145,8 @@ public class ResourceServletTest { new TreeSet<>(Arrays.asList( new String[] { "001C13B3A55A71B977CA65EC85539D79C653A3FC" })), "0.2.3.25", "ppp-62-216-201-221.dynamic.mnet-online.de"); + this.relays.put("000C5F55BD4814B917CC474BD537F1A3B33CCE2A", + relayTorkaZ); org.torproject.onionoo.docs.SummaryDocument relayFerrari458 = new org.torproject.onionoo.docs.SummaryDocument(true, "Ferrari458", "001C13B3A55A71B977CA65EC85539D79C653A3FC", Arrays.asList( @@ -157,9 +160,6 @@ public class ResourceServletTest { new TreeSet<>(Arrays.asList(new String[] { "000C5F55BD4814B917CC474BD537F1A3B33CCE2A" })), null, "c-68-38-171-200.hsd1.in.comcast.net"); - this.relays = new TreeMap<>(); - this.relays.put("000C5F55BD4814B917CC474BD537F1A3B33CCE2A", - relayTorkaZ); this.relays.put("001C13B3A55A71B977CA65EC85539D79C653A3FC", relayFerrari458); org.torproject.onionoo.docs.SummaryDocument relayTimMayTribute = @@ -172,7 +172,7 @@ public class ResourceServletTest { DateTimeHelper.parse("2013-04-16 18:00:00"), "AS6830", "1024d/51e2a1c7 \"steven j. murdoch\" " + "<tor+steven.murdoch(a)cl.cam.ac.uk> <fb-token:5sr_k_zs2wm=>", - new TreeSet<String>(), new TreeSet<String>(), "0.2.3.25", null); + new TreeSet<String>(), new TreeSet<String>(), "0.2.3.24-rc-dev", null); this.relays.put("0025C136C1F3A9EEFE2AE3F918F03BFA21B5070B", relayTimMayTribute); this.bridges = new TreeMap<>(); @@ -183,7 +183,7 @@ public class ResourceServletTest { DateTimeHelper.parse("2013-04-21 18:07:03"), false, new TreeSet<>(Arrays.asList(new String[] { "Valid" })), -1L, null, DateTimeHelper.parse("2013-04-20 15:37:04"), null, null, - null, null, null, null); + null, null, "0.2.2.39", null); this.bridges.put("0000831B236DFF73D409AD17B40E2A728A53994F", bridgeec2bridgercc7f31fe); org.torproject.onionoo.docs.SummaryDocument bridgeUnnamed = @@ -204,7 +204,7 @@ public class ResourceServletTest { new TreeSet<>(Arrays.asList(new String[] { "Running", "Valid" })), -1L, null, DateTimeHelper.parse("2013-01-16 21:07:04"), null, null, null, - null, null, null); + null, "0.2.4.4-alpha-dev", null); this.bridges.put("1FEDE50ED8DBA1DD9F9165F78C8131E4A44AB756", bridgegummy); } @@ -1571,14 +1571,19 @@ public class ResourceServletTest { @Test public void testVersion02325() { - this.assertSummaryDocument("/summary?version=0.2.3.25", 2, - new String[] { "TorkaZ", "TimMayTribute" }, 0, null); + this.assertSummaryDocument("/summary?version=0.2.3.25", 1, + new String[] { "TorkaZ" }, 0, null); } @Test public void testVersion02324() { - this.assertSummaryDocument("/summary?version=0.2.3.24-rc-dev", 0, - new String[] { "Ferrari458" }, 0, null); + this.assertSummaryDocument("/summary?version=0.2.3.24-rc-dev", 1, + new String[] { "TimMayTribute" }, 0, null); + } + + @Test + public void testVersion02326() { + this.assertSummaryDocument("/summary?version=0.2.3.26", 0, null, 0, null); } @Test @@ -1594,12 +1599,12 @@ public class ResourceServletTest { @Test public void testVersion0() { - this.assertSummaryDocument("/summary?version=0", 2, null, 0, null); + this.assertSummaryDocument("/summary?version=0", 2, null, 2, null); } @Test public void testVersion02() { - this.assertSummaryDocument("/summary?version=0.2", 2, null, 0, null); + this.assertSummaryDocument("/summary?version=0.2", 2, null, 2, null); } @Test

1 0

[onionoo/master] Add "recommended_version" field to bridge details documents.
by karsten＠torproject.org 27 Nov '17

27 Nov '17

commit edc796cd890fdc656947dd11c6832a5d99ee0ae6 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Nov 18 17:37:46 2017 +0100 Add "recommended_version" field to bridge details documents. Add a "recommended_version" field to bridge details documents based on whether the directory authorities recommend the bridge's version. Implements #21827. --- CHANGELOG.md | 3 +++ .../onionoo/updater/NodeDetailsStatusUpdater.java | 24 ++++++++++++---------- .../onionoo/writer/DetailsDocumentWriter.java | 2 ++ 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 918a1ae..5a84259 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ server descriptor. - Extend the "version" parameter to also return bridges with the given version or version prefix. + - Add a "recommended_version" field to bridge details documents + based on whether the directory authorities recommend the bridge's + version. # Changes in version 4.3-1.7.1 - 2017-11-17 diff --git a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java index 7792764..0a5a93d 100644 --- a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java +++ b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java @@ -89,6 +89,8 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, private SortedMap<String, Integer> lastBandwidthWeights = null; + private Set<String> lastRecommendedServerVersions = null; + private int relayConsensusesProcessed = 0; private int bridgeStatusesProcessed = 0; @@ -248,14 +250,6 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, if (validAfterMillis > this.relaysLastValidAfterMillis) { this.relaysLastValidAfterMillis = validAfterMillis; } - Set<String> recommendedVersions = null; - if (consensus.getRecommendedServerVersions() != null) { - recommendedVersions = new HashSet<>(); - for (String recommendedVersion : - consensus.getRecommendedServerVersions()) { - recommendedVersions.add("Tor " + recommendedVersion); - } - } for (Map.Entry<String, NetworkStatusEntry> e : consensus.getStatusEntries().entrySet()) { String fingerprint = e.getKey(); @@ -288,9 +282,6 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, nodeStatus.setConsensusWeight(entry.getBandwidth()); nodeStatus.setDefaultPolicy(entry.getDefaultPolicy()); nodeStatus.setPortList(entry.getPortList()); - nodeStatus.setRecommendedVersion((recommendedVersions == null - || entry.getVersion() == null) ? null : - recommendedVersions.contains(entry.getVersion())); String version = null; if (null != entry.getVersion() && entry.getVersion().startsWith("Tor ")) { @@ -315,6 +306,8 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, this.relayConsensusesProcessed++; if (this.relaysLastValidAfterMillis == validAfterMillis) { this.lastBandwidthWeights = consensus.getBandwidthWeights(); + this.lastRecommendedServerVersions + = new HashSet<>(consensus.getRecommendedServerVersions()); } } @@ -800,6 +793,15 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, nodeStatus.setVersion(version); } + /* Compare tor software version (for relays and bridges) with the + * recommended-server-versions line in the last known consensus and set + * the recommended_version field accordingly. */ + if (null != this.lastRecommendedServerVersions + && null != nodeStatus.getVersion()) { + nodeStatus.setRecommendedVersion(this.lastRecommendedServerVersions + .contains(nodeStatus.getVersion())); + } + Map<String, Long> exitAddresses = new HashMap<>(); if (detailsStatus.getExitAddresses() != null) { for (Map.Entry<String, Long> e : diff --git a/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java b/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java index 5eaa950..1b53ffe 100644 --- a/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java +++ b/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java @@ -189,6 +189,8 @@ public class DetailsDocumentWriter implements DocumentWriter { detailsDocument.setFirstSeen(detailsStatus.getFirstSeenMillis()); detailsDocument.setRunning(detailsStatus.isRunning()); detailsDocument.setFlags(detailsStatus.getRelayFlags()); + detailsDocument.setRecommendedVersion( + detailsStatus.getRecommendedVersion()); detailsDocument.setLastRestarted(detailsStatus.getLastRestarted()); detailsDocument.setAdvertisedBandwidth( detailsStatus.getAdvertisedBandwidth());

1 0

[onionoo/master] Add "recommended_version" parameter.
by karsten＠torproject.org 27 Nov '17

27 Nov '17

commit 11e5bbd80c24bb6c11ab3450d208517d4d145780 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Nov 18 20:43:59 2017 +0100 Add "recommended_version" parameter. Add a "recommended_version" parameter to return only relays and bridges running a Tor software version that is recommended or not recommended by the directory authorities. Implements #23544. --- CHANGELOG.md | 3 ++ .../org/torproject/onionoo/docs/DocumentStore.java | 4 ++- .../torproject/onionoo/docs/SummaryDocument.java | 16 +++++++++- .../org/torproject/onionoo/server/NodeIndex.java | 22 +++++++++++++ .../org/torproject/onionoo/server/NodeIndexer.java | 21 +++++++++++++ .../torproject/onionoo/server/RequestHandler.java | 20 ++++++++++++ .../torproject/onionoo/server/ResourceServlet.java | 19 ++++++++++-- .../onionoo/writer/SummaryDocumentWriter.java | 3 +- .../onionoo/docs/SummaryDocumentTest.java | 2 +- .../onionoo/server/ResourceServletTest.java | 36 ++++++++++++++++++---- .../server/SummaryDocumentComparatorTest.java | 2 +- 11 files changed, 134 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a84259..8acdc0b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,9 @@ - Add a "recommended_version" field to bridge details documents based on whether the directory authorities recommend the bridge's version. + - Add a "recommended_version" parameter to return only relays and + bridges running a Tor software version that is recommended or not + recommended by the directory authorities. # Changes in version 4.3-1.7.1 - 2017-11-17 diff --git a/src/main/java/org/torproject/onionoo/docs/DocumentStore.java b/src/main/java/org/torproject/onionoo/docs/DocumentStore.java index 57d4165..23f11c7 100644 --- a/src/main/java/org/torproject/onionoo/docs/DocumentStore.java +++ b/src/main/java/org/torproject/onionoo/docs/DocumentStore.java @@ -440,10 +440,12 @@ public class DocumentStore { long consensusWeight = -1L; long firstSeenMillis = -1L; String hostName = null; + Boolean recommendedVersion = null; SummaryDocument summaryDocument = new SummaryDocument(isRelay, nickname, fingerprint, addresses, lastSeenMillis, running, relayFlags, consensusWeight, countryCode, firstSeenMillis, - asNumber, contact, family, family, version, hostName); + asNumber, contact, family, family, version, hostName, + recommendedVersion); return summaryDocument; } diff --git a/src/main/java/org/torproject/onionoo/docs/SummaryDocument.java b/src/main/java/org/torproject/onionoo/docs/SummaryDocument.java index cca5ab9..11f6070 100644 --- a/src/main/java/org/torproject/onionoo/docs/SummaryDocument.java +++ b/src/main/java/org/torproject/onionoo/docs/SummaryDocument.java @@ -322,6 +322,18 @@ public class SummaryDocument extends Document { return this.hostName; } + @Expose + @SerializedName("rv") + private Boolean recommendedVersion; + + public void setRecommendedVersion(Boolean recommendedVersion) { + this.recommendedVersion = recommendedVersion; + } + + public Boolean getRecommendedVersion() { + return this.recommendedVersion; + } + /* The familyFingerprints parameter can go away after September 8, 2015. * See above. */ /** Instantiates a summary document with all given properties. */ @@ -330,7 +342,8 @@ public class SummaryDocument extends Document { boolean running, SortedSet<String> relayFlags, long consensusWeight, String countryCode, long firstSeenMillis, String asNumber, String contact, SortedSet<String> familyFingerprints, - SortedSet<String> effectiveFamily, String version, String hostName) { + SortedSet<String> effectiveFamily, String version, String hostName, + Boolean recommendedVersion) { this.setRelay(isRelay); this.setNickname(nickname); this.setFingerprint(fingerprint); @@ -347,6 +360,7 @@ public class SummaryDocument extends Document { this.setEffectiveFamily(effectiveFamily); this.setVersion(version); this.setHostName(hostName); + this.setRecommendedVersion(recommendedVersion); } } diff --git a/src/main/java/org/torproject/onionoo/server/NodeIndex.java b/src/main/java/org/torproject/onionoo/server/NodeIndex.java index c41dd7a..8ab22a4 100644 --- a/src/main/java/org/torproject/onionoo/server/NodeIndex.java +++ b/src/main/java/org/torproject/onionoo/server/NodeIndex.java @@ -199,5 +199,27 @@ class NodeIndex { public Map<String, Set<String>> getRelaysByHostName() { return this.relaysByHostName; } + + private Map<Boolean, Set<String>> relaysByRecommendedVersion; + + public void setRelaysByRecommendedVersion( + Map<Boolean, Set<String>> relaysByRecommendedVersion) { + this.relaysByRecommendedVersion = relaysByRecommendedVersion; + } + + public Map<Boolean, Set<String>> getRelaysByRecommendedVersion() { + return this.relaysByRecommendedVersion; + } + + private Map<Boolean, Set<String>> bridgesByRecommendedVersion; + + public void setBridgesByRecommendedVersion( + Map<Boolean, Set<String>> bridgesByRecommendedVersion) { + this.bridgesByRecommendedVersion = bridgesByRecommendedVersion; + } + + public Map<Boolean, Set<String>> getBridgesByRecommendedVersion() { + return this.bridgesByRecommendedVersion; + } } diff --git a/src/main/java/org/torproject/onionoo/server/NodeIndexer.java b/src/main/java/org/torproject/onionoo/server/NodeIndexer.java index 585d33f..815a02e 100644 --- a/src/main/java/org/torproject/onionoo/server/NodeIndexer.java +++ b/src/main/java/org/torproject/onionoo/server/NodeIndexer.java @@ -156,6 +156,12 @@ public class NodeIndexer implements ServletContextListener, Runnable { Map<String, Set<String>> newRelaysByVersion = new HashMap<>(); Map<String, Set<String>> newBridgesByVersion = new HashMap<>(); Map<String, Set<String>> newRelaysByHostName = new HashMap<>(); + Map<Boolean, Set<String>> newRelaysByRecommendedVersion = new HashMap<>(); + newRelaysByRecommendedVersion.put(true, new HashSet<>()); + newRelaysByRecommendedVersion.put(false, new HashSet<>()); + Map<Boolean, Set<String>> newBridgesByRecommendedVersion = new HashMap<>(); + newBridgesByRecommendedVersion.put(true, new HashSet<>()); + newBridgesByRecommendedVersion.put(false, new HashSet<>()); SortedMap<Integer, Set<String>> newRelaysByFirstSeenDays = new TreeMap<>(); SortedMap<Integer, Set<String>> newBridgesByFirstSeenDays = new TreeMap<>(); SortedMap<Integer, Set<String>> newRelaysByLastSeenDays = new TreeMap<>(); @@ -269,6 +275,12 @@ public class NodeIndexer implements ServletContextListener, Runnable { newRelaysByHostName.get(hostNameLowerCase).add(fingerprint); newRelaysByHostName.get(hostNameLowerCase).add(hashedFingerprint); } + Boolean recommendedVersion = entry.getRecommendedVersion(); + if (null != recommendedVersion) { + newRelaysByRecommendedVersion.get(recommendedVersion).add(fingerprint); + newRelaysByRecommendedVersion.get(recommendedVersion).add( + hashedFingerprint); + } } /* This loop can go away once all Onionoo services had their hourly * updater write effective families to summary documents at least @@ -332,6 +344,13 @@ public class NodeIndexer implements ServletContextListener, Runnable { newBridgesByVersion.get(version).add(hashedFingerprint); newBridgesByVersion.get(version).add(hashedHashedFingerprint); } + Boolean recommendedVersion = entry.getRecommendedVersion(); + if (null != recommendedVersion) { + newBridgesByRecommendedVersion.get(recommendedVersion).add( + hashedFingerprint); + newBridgesByRecommendedVersion.get(recommendedVersion).add( + hashedHashedFingerprint); + } } NodeIndex newNodeIndex = new NodeIndex(); newNodeIndex.setRelayFingerprintSummaryLines( @@ -353,6 +372,8 @@ public class NodeIndexer implements ServletContextListener, Runnable { newNodeIndex.setRelaysByVersion(newRelaysByVersion); newNodeIndex.setBridgesByVersion(newBridgesByVersion); newNodeIndex.setRelaysByHostName(newRelaysByHostName); + newNodeIndex.setRelaysByRecommendedVersion(newRelaysByRecommendedVersion); + newNodeIndex.setBridgesByRecommendedVersion(newBridgesByRecommendedVersion); synchronized (this) { this.lastIndexed = updateStatusMillis; this.latestNodeIndex = newNodeIndex; diff --git a/src/main/java/org/torproject/onionoo/server/RequestHandler.java b/src/main/java/org/torproject/onionoo/server/RequestHandler.java index 067a738..c81051e 100644 --- a/src/main/java/org/torproject/onionoo/server/RequestHandler.java +++ b/src/main/java/org/torproject/onionoo/server/RequestHandler.java @@ -103,6 +103,12 @@ public class RequestHandler { this.hostName = hostName; } + private Boolean recommendedVersion; + + public void setRecommendedVersion(Boolean recommendedVersion) { + this.recommendedVersion = recommendedVersion; + } + private String[] order; public void setOrder(String[] order) { @@ -172,6 +178,7 @@ public class RequestHandler { this.filterByFamily(); this.filterByVersion(); this.filterByHostName(); + this.filterByRecommendedVersion(); this.order(); this.offset(); this.limit(); @@ -570,6 +577,19 @@ public class RequestHandler { this.filteredBridges.clear(); } + private void filterByRecommendedVersion() { + if (null == this.recommendedVersion) { + /* Not filtering by recommended version. */ + return; + } + Set<String> keepRelays = this.nodeIndex.getRelaysByRecommendedVersion() + .get(this.recommendedVersion); + this.filteredRelays.keySet().retainAll(keepRelays); + Set<String> keepBridges = this.nodeIndex.getBridgesByRecommendedVersion() + .get(this.recommendedVersion); + this.filteredBridges.keySet().retainAll(keepBridges); + } + private void order() { List<SummaryDocument> uniqueRelays = new ArrayList<>(); List<SummaryDocument> uniqueBridges = new ArrayList<>(); diff --git a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java index f1521e2..3449407 100644 --- a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java +++ b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java @@ -66,9 +66,10 @@ public class ResourceServlet extends HttpServlet { private static final long CACHE_INTERVAL = 5L * 60L * 1000L; private static Set<String> knownParameters = new HashSet<>( - Arrays.asList(("type,running,search,lookup,fingerprint,country,as," - + "flag,first_seen_days,last_seen_days,contact,order,limit," - + "offset,fields,family,version,host_name").split(","))); + Arrays.asList("type", "running", "search", "lookup", "fingerprint", + "country", "as", "flag", "first_seen_days", "last_seen_days", + "contact", "order", "limit", "offset", "fields", "family", "version", + "host_name", "recommended_version")); private static Set<String> illegalSearchQualifiers = new HashSet<>(Arrays.asList(("search,fingerprint,order,limit," @@ -301,6 +302,18 @@ public class ResourceServlet extends HttpServlet { } rh.setHostName(hostNameParameter); } + if (parameterMap.containsKey("recommended_version")) { + String recommendedVersionParameterValue = + parameterMap.get("recommended_version").toLowerCase(); + boolean recommendedVersionRequested = true; + if (recommendedVersionParameterValue.equals("false")) { + recommendedVersionRequested = false; + } else if (!recommendedVersionParameterValue.equals("true")) { + response.sendError(HttpServletResponse.SC_BAD_REQUEST); + return; + } + rh.setRecommendedVersion(recommendedVersionRequested); + } if (parameterMap.containsKey("order")) { String[] order = this.parseOrderParameter(parameterMap.get("order")); if (order == null) { diff --git a/src/main/java/org/torproject/onionoo/writer/SummaryDocumentWriter.java b/src/main/java/org/torproject/onionoo/writer/SummaryDocumentWriter.java index faf54fa..a412eec 100644 --- a/src/main/java/org/torproject/onionoo/writer/SummaryDocumentWriter.java +++ b/src/main/java/org/torproject/onionoo/writer/SummaryDocumentWriter.java @@ -93,11 +93,12 @@ public class SummaryDocumentWriter implements DocumentWriter { String nickname = nodeStatus.getNickname(); String version = nodeStatus.getVersion(); String hostName = nodeStatus.getHostName(); + Boolean recommendedVersion = nodeStatus.getRecommendedVersion(); SummaryDocument summaryDocument = new SummaryDocument(isRelay, nickname, fingerprint, addresses, lastSeenMillis, running, relayFlags, consensusWeight, countryCode, firstSeenMillis, asNumber, contact, declaredFamily, effectiveFamily, version, - hostName); + hostName, recommendedVersion); if (this.documentStore.store(summaryDocument, fingerprint)) { this.writtenDocuments++; } diff --git a/src/test/java/org/torproject/onionoo/docs/SummaryDocumentTest.java b/src/test/java/org/torproject/onionoo/docs/SummaryDocumentTest.java index 8c45ed2..ce13ccc 100644 --- a/src/test/java/org/torproject/onionoo/docs/SummaryDocumentTest.java +++ b/src/test/java/org/torproject/onionoo/docs/SummaryDocumentTest.java @@ -27,7 +27,7 @@ public class SummaryDocumentTest { "0025C136C1F3A9EEFE2AE3F918F03BFA21B5070B" })), new TreeSet<>(Arrays.asList( new String[] { "001C13B3A55A71B977CA65EC85539D79C653A3FC" })), null, - null); + null, true); } @Test() diff --git a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java index d763988..dee5139 100644 --- a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java +++ b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java @@ -144,7 +144,7 @@ public class ResourceServletTest { "0025C136C1F3A9EEFE2AE3F918F03BFA21B5070B" })), new TreeSet<>(Arrays.asList( new String[] { "001C13B3A55A71B977CA65EC85539D79C653A3FC" })), - "0.2.3.25", "ppp-62-216-201-221.dynamic.mnet-online.de"); + "0.2.3.25", "ppp-62-216-201-221.dynamic.mnet-online.de", true); this.relays.put("000C5F55BD4814B917CC474BD537F1A3B33CCE2A", relayTorkaZ); org.torproject.onionoo.docs.SummaryDocument relayFerrari458 = @@ -159,7 +159,7 @@ public class ResourceServletTest { "000C5F55BD4814B917CC474BD537F1A3B33CCE2A" })), new TreeSet<>(Arrays.asList(new String[] { "000C5F55BD4814B917CC474BD537F1A3B33CCE2A" })), null, - "c-68-38-171-200.hsd1.in.comcast.net"); + "c-68-38-171-200.hsd1.in.comcast.net", null); this.relays.put("001C13B3A55A71B977CA65EC85539D79C653A3FC", relayFerrari458); org.torproject.onionoo.docs.SummaryDocument relayTimMayTribute = @@ -172,7 +172,8 @@ public class ResourceServletTest { DateTimeHelper.parse("2013-04-16 18:00:00"), "AS6830", "1024d/51e2a1c7 \"steven j. murdoch\" " + "<tor+steven.murdoch(a)cl.cam.ac.uk> <fb-token:5sr_k_zs2wm=>", - new TreeSet<String>(), new TreeSet<String>(), "0.2.3.24-rc-dev", null); + new TreeSet<String>(), new TreeSet<String>(), "0.2.3.24-rc-dev", null, + false); this.relays.put("0025C136C1F3A9EEFE2AE3F918F03BFA21B5070B", relayTimMayTribute); this.bridges = new TreeMap<>(); @@ -183,7 +184,7 @@ public class ResourceServletTest { DateTimeHelper.parse("2013-04-21 18:07:03"), false, new TreeSet<>(Arrays.asList(new String[] { "Valid" })), -1L, null, DateTimeHelper.parse("2013-04-20 15:37:04"), null, null, - null, null, "0.2.2.39", null); + null, null, "0.2.2.39", null, true); this.bridges.put("0000831B236DFF73D409AD17B40E2A728A53994F", bridgeec2bridgercc7f31fe); org.torproject.onionoo.docs.SummaryDocument bridgeUnnamed = @@ -193,7 +194,7 @@ public class ResourceServletTest { DateTimeHelper.parse("2013-04-20 17:37:04"), false, new TreeSet<>(Arrays.asList(new String[] { "Valid" })), -1L, null, DateTimeHelper.parse("2013-04-14 07:07:05"), null, null, - null, null, null, null); + null, null, null, null, null); this.bridges.put("0002D9BDBBC230BD9C78FF502A16E0033EF87E0C", bridgeUnnamed); org.torproject.onionoo.docs.SummaryDocument bridgegummy = @@ -204,7 +205,7 @@ public class ResourceServletTest { new TreeSet<>(Arrays.asList(new String[] { "Running", "Valid" })), -1L, null, DateTimeHelper.parse("2013-01-16 21:07:04"), null, null, null, - null, "0.2.4.4-alpha-dev", null); + null, "0.2.4.4-alpha-dev", null, false); this.bridges.put("1FEDE50ED8DBA1DD9F9165F78C8131E4A44AB756", bridgegummy); } @@ -1695,5 +1696,28 @@ public class ResourceServletTest { public void testHostNameUmlaut() { this.assertErrorStatusCode("/summary?host_name=äöü", 400); } + + @Test + public void testRecommendedVersionTrue() { + this.assertSummaryDocument("/summary?recommended_version=true", 1, + new String[] { "TorkaZ" }, 1, new String[] { "ec2bridgercc7f31fe" }); + } + + @Test + public void testRecommendedVersionFalse() { + this.assertSummaryDocument("/summary?recommended_version=false", 1, + new String[] { "TimMayTribute" }, 1, new String[] { "gummy" }); + } + + @Test + public void testRecommendedVersionTrueCapitalized() { + this.assertSummaryDocument("/summary?recommended_version=TRUE", 1, + new String[] { "TorkaZ" }, 1,new String[] { "ec2bridgercc7f31fe" }); + } + + @Test + public void testRecommendedVersionNull() { + this.assertErrorStatusCode("/summary?recommended_version=null", 400); + } } diff --git a/src/test/java/org/torproject/onionoo/server/SummaryDocumentComparatorTest.java b/src/test/java/org/torproject/onionoo/server/SummaryDocumentComparatorTest.java index 38d94fa..6820372 100644 --- a/src/test/java/org/torproject/onionoo/server/SummaryDocumentComparatorTest.java +++ b/src/test/java/org/torproject/onionoo/server/SummaryDocumentComparatorTest.java @@ -41,7 +41,7 @@ public class SummaryDocumentComparatorTest { "0025C136C1F3A9EEFE2AE3F918F03BFA21B5070B" })), new TreeSet<>(Arrays.asList( new String[] { "001C13B3A55A71B977CA65EC85539D79C653A3FC" })), null, - null); + null, null); } /** Some values for running all comparison types. */

1 0

[metrics-web/master] Update news.json to version 196 of doc/MetricsTimeline.
by karsten＠torproject.org 27 Nov '17

27 Nov '17

commit 3a28645ac3b51fe7727926fbd2924324cb4beacc Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Nov 27 10:02:03 2017 +0100 Update news.json to version 196 of doc/MetricsTimeline. --- website/src/main/resources/etc/news.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/website/src/main/resources/etc/news.json b/website/src/main/resources/etc/news.json index fd290be..1f7bf0a 100644 --- a/website/src/main/resources/etc/news.json +++ b/website/src/main/resources/etc/news.json @@ -2770,6 +2770,17 @@ ] }, { + "start": "2017-11-25", + "places": [ + "pk" + ], + "description": "Social media block in Pakistan.", + "links": [ + "<a href=\"https://dailytimes.com.pk/147132/social-media-goes-down-in-pakistan/\">article</a>", + "<a href=\"https://digitalrightsfoundation.pk/press-release-drf-and-netblocks-find-bla…">NetBlocks data</a>" + ] + }, + { "start": "2016-02-24", "places": [ "tm"

1 0

[atlas/master] Ensure that bootstrap loads after jQuery
by irl＠torproject.org 26 Nov '17

26 Nov '17

commit 891a5fca398b0a3ec0256c5c2b176f24c230e386 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Sun Nov 26 20:51:28 2017 +0000 Ensure that bootstrap loads after jQuery --- js/main.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/js/main.js b/js/main.js index cc18403..69de082 100644 --- a/js/main.js +++ b/js/main.js @@ -3,6 +3,9 @@ // based on work done by @jrburke // Configure require.js shortcut aliases require.config({ + shim : { + "bootstrap" : { "deps" :['jquery'] } + }, paths: { jquery: 'https://metrics.torproject.org/js/jquery-3.2.1.min', underscore: 'libs/underscore/underscore-min',

1 0

[atlas/master] Bump cache breaker
by irl＠torproject.org 26 Nov '17

26 Nov '17

commit 018ddedb770854c2d775b3872dfabe03368f72b0 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Sun Nov 26 19:01:13 2017 +0000 Bump cache breaker --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 9897c0c..1ef9d2b 100644 --- a/index.html +++ b/index.html @@ -41,7 +41,7 @@ <script src="https://metrics.torproject.org/js/script.js"></script>  - <link rel="stylesheet" href="css/atlas.css?v9"> + <link rel="stylesheet" href="css/atlas.css?v10"> </head> @@ -167,7 +167,7 @@ $('.cookie-message').cookieBar({ closeButton: '.cbc' }); </script> <script> var require = { - urlArgs: "v9" + urlArgs: "v10" }; </script> <script data-main="js/main" src="js/libs/require/require.js"></script>

1 0

[atlas/master] Allows country based sorting in search view (Fixes: #24411)
by irl＠torproject.org 26 Nov '17

26 Nov '17

commit 5871fa62a0e594eddb34daef4d96a1d6a3a685ef Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Sun Nov 26 19:00:53 2017 +0000 Allows country based sorting in search view (Fixes: #24411) --- templates/search/do.html | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/templates/search/do.html b/templates/search/do.html index 3935182..a30fe96 100644 --- a/templates/search/do.html +++ b/templates/search/do.html @@ -92,11 +92,13 @@ <% if (relay.get('running') === false) { %><s><% } %><%= relay.get('uptime_hr') %><% if (relay.get('running') === false) { %></s><% } %> </span> </td> - <td> <% if ( relay.get('country')) { %> - <img class="tip inline country" title="<%= relay.get('countryname') %>" alt="<%= relay.get('countryname') %>" src="img/cc/<%= relay.get('country') %>.png"/> + <td data-order="<%= relay.get('countryname') %>"> + <img class="tip inline country" title="<%= relay.get('countryname') %>" alt="<%= relay.get('countryname') %>" src="img/cc/<%= relay.get('country') %>.png"/> + </td> + <% } else { %> + <td data-order="Unknown"><img class="tip inline country" title="Unknown" alt="Unknown" src="img/cc/xz.png"></td> <% } %> - </td> <td><%= relay.get('or_address') %></td> <td class="flags-cell"> <% _.each(relay.get('flags'), function(flag) { %><img class="tip flags" src="img/flags/<%= flag[1] %>.png" alt="<%= flag[0] %>" title="<%= flag[0] %><br /><%= flag[2] %>"/><% }); %>

1 0

[atlas/master] Improve JavaScript required message
by irl＠torproject.org 26 Nov '17

26 Nov '17

commit 1e9a7c9d781d77ce0b5715edf55e282138638fb2 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Sun Nov 26 18:05:36 2017 +0000 Improve JavaScript required message --- css/atlas.css | 4 ++++ img/noscript.png | Bin 0 -> 943 bytes index.html | 7 +++---- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/css/atlas.css b/css/atlas.css index 41f799f..b027534 100644 --- a/css/atlas.css +++ b/css/atlas.css @@ -8,6 +8,10 @@ width: 100%; } +#secondary-search { + display: none; +} + a.alleged { color: #FE9F30; } diff --git a/img/noscript.png b/img/noscript.png new file mode 100644 index 0000000..3bc118b Binary files /dev/null and b/img/noscript.png differ diff --git a/index.html b/index.html index 7928fb6..9897c0c 100644 --- a/index.html +++ b/index.html @@ -155,10 +155,9 @@ </div> <div id="content"> <noscript> - <div class="page-header"> - <h1>JavaScript required</h1> - </div> - <p class="lead">Please enable JavaScript to use this service.</p> + <div class="alert alert-warning"> + <p><strong>JavaScript required</strong><br> + Please enable JavaScript to use this service. If you are using Tor Browser on High Security mode, it is possible to enable JavaScript to run only on this page. Click the NoScript <img src="img/noscript.png"> icon on your address bar and select "Temporarily allow all on this page". Relay Search only uses JavaScript resources that are hosted by the Tor Metrics team.</p> </noscript> </div> </div>

1 0

[atlas/master] Bump cache breaker
by irl＠torproject.org 26 Nov '17

26 Nov '17

commit 49ebff359fdf86280f5db4a6a4daa64f4060c8ae Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Sun Nov 26 15:49:19 2017 +0000 Bump cache breaker --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 6236f18..7928fb6 100644 --- a/index.html +++ b/index.html @@ -41,7 +41,7 @@ <script src="https://metrics.torproject.org/js/script.js"></script>  - <link rel="stylesheet" href="css/atlas.css?v8"> + <link rel="stylesheet" href="css/atlas.css?v9"> </head> @@ -168,7 +168,7 @@ $('.cookie-message').cookieBar({ closeButton: '.cbc' }); </script> <script> var require = { - urlArgs: "v8" + urlArgs: "v9" }; </script> <script data-main="js/main" src="js/libs/require/require.js"></script>

1 0