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

[metrics-base/master] Add new *-thin.jar file without dependencies.
by karsten＠torproject.org 29 Jul '18

29 Jul '18

commit 08514a32afefbeef848b80f9a338ee840c282604 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jul 26 14:03:23 2018 +0200 Add new *-thin.jar file without dependencies. Implements part of #23549. --- java/base.xml | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/java/base.xml b/java/base.xml index f66644d..d77af65 100644 --- a/java/base.xml +++ b/java/base.xml @@ -19,6 +19,8 @@ <property name="testclasses" value="${generated}/testclasses/"/> <property name="cobertura.ser.file" value="${basedir}/cobertura.ser" /> <property name="jarfile" value="${name}-${release.version}.jar" /> + <property name="jarthinfile" + value="${name}-${release.version}-thin.jar" /> <property name="jarsourcesfile" value="${name}-${release.version}-sources.jar" /> <property name="jardocsfile" @@ -241,18 +243,22 @@ <manifest file="${manifestattributes}" > <attribute name="Main-Class" value="${project-main-class}" /> </manifest> - <condition property="jarpattern" - value="${jarpatternprop}" - else="runtime" > - <isset property="jarpatternprop"/> - </condition> <antcall target="jarring" > <param name="destfile" value="${dist}/${jarfile}" /> <param name="usebase" value="${classes}" /> <param name="usepath" value="${sources}" /> <param name="usepattern" value="empty" /> <param name="uselibpath" value="${libs}" /> - <param name="uselibpattern" value="${jarpattern}" /> + <param name="uselibpattern" value="runtime" /> + <param name="resourceincludes" value="${jarincludes}" /> + </antcall> + <antcall target="jarring" > + <param name="destfile" value="${dist}/${jarthinfile}" /> + <param name="usebase" value="${classes}" /> + <param name="usepath" value="${sources}" /> + <param name="usepattern" value="empty" /> + <param name="uselibpath" value="${libs}" /> + <param name="uselibpattern" value="empty" /> <param name="resourceincludes" value="${jarincludes}" /> </antcall> <antcall target="jarring" > @@ -317,8 +323,8 @@ <target name="signall" depends="jar,other"> <condition property="tobesigned" - value="${jarfile} ${jarsourcesfile} ${jardocsfile} ${additional2sign}" - else="${jarfile} ${jarsourcesfile} ${jardocsfile}" > + value="${jarfile} ${jarthinfile} ${jarsourcesfile} ${jardocsfile} ${additional2sign}" + else="${jarfile} ${jarthinfile} ${jarsourcesfile} ${jardocsfile}" > <isset property="additional2sign"/> </condition> <signjar alias="${jarsigner.alias}" @@ -338,6 +344,7 @@ <not> <and> <issigned file="${signed}/${jarfile}"/> + <issigned file="${signed}/${jarthinfile}"/> <issigned file="${signed}/${jarsourcesfile}"/> <issigned file="${signed}/${jardocsfile}"/> <or>

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 29 Jul '18

29 Jul '18

commit 2cd4f97b3fe2659b940cb666de56e48119f19d6f Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 29 20:19:41 2018 +0000 Update translations for support-portal --- contents+ru.po | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contents+ru.po b/contents+ru.po index 9c7441e32..90bf6aa3a 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -1393,6 +1393,8 @@ msgid "" "The Tor Browser works hard to isolate itself from the rest of your system, " "and the steps for making it the default browser are unreliable." msgstr "" +"Tor Browser старается не связывать себя с остальной системой. Попытки " +"сделать его браузером по умолчанию противоречат этому подходу." #: http//localhost/tbb/tbb-32/ #: (content/tbb/tbb-32/contents+en.lrquestion.description)

1 0

[onionoo/master] Add "as" field as a copy of "as_number".
by karsten＠torproject.org 29 Jul '18

29 Jul '18

commit dcd204de903fc844586796c27d25492ba890d27b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jul 24 10:43:31 2018 +0200 Add "as" field as a copy of "as_number". Implements part of #23713. --- CHANGELOG.md | 2 ++ .../org/torproject/onionoo/docs/DetailsDocument.java | 19 +++++++++++++++++++ .../torproject/onionoo/server/ResponseBuilder.java | 2 ++ .../onionoo/writer/DetailsDocumentWriter.java | 2 +- 4 files changed, 24 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 00a0c6a..9d0d091 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ - Support a comma-separated list of fingerprints in the lookup parameter to allow for URLs that specify a list of relays or bridges. + - Add "as" field as a copy of the "as_number" field in preparation + of removing the "as_number" field in the future. # Changes in version 6.1-1.15.0 - 2018-07-16 diff --git a/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java b/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java index 7820305..650ba5b 100644 --- a/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java +++ b/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java @@ -201,12 +201,31 @@ public class DetailsDocument extends Document { return this.longitude; } + private String as; + + @Deprecated private String asNumber; + public void setAs(String as) { + this.as = escapeJson(as); + } + + @Deprecated public void setAsNumber(String asNumber) { this.asNumber = escapeJson(asNumber); } + @Deprecated + public void setAsAndAsNumber(String asNumber) { + this.as = escapeJson(asNumber); + this.asNumber = escapeJson(asNumber); + } + + public String getAs() { + return unescapeJson(this.as); + } + + @Deprecated public String getAsNumber() { return unescapeJson(this.asNumber); } diff --git a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java index 241b3bd..1a5c925 100644 --- a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java +++ b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java @@ -279,6 +279,8 @@ public class ResponseBuilder { dd.setLatitude(detailsDocument.getLatitude()); } else if (field.equals("longitude")) { dd.setLongitude(detailsDocument.getLongitude()); + } else if (field.equals("as")) { + dd.setAs(detailsDocument.getAs()); } else if (field.equals("as_number")) { dd.setAsNumber(detailsDocument.getAsNumber()); } else if (field.equals("as_name")) { diff --git a/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java b/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java index bc5bf8c..0162d0b 100644 --- a/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java +++ b/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java @@ -97,7 +97,7 @@ public class DetailsDocumentWriter implements DocumentWriter { detailsDocument.setCountryName(detailsStatus.getCountryName()); detailsDocument.setRegionName(detailsStatus.getRegionName()); detailsDocument.setCityName(detailsStatus.getCityName()); - detailsDocument.setAsNumber(detailsStatus.getAsNumber()); + detailsDocument.setAsAndAsNumber(detailsStatus.getAsNumber()); detailsDocument.setAsName(detailsStatus.getAsName()); if (detailsStatus.isRunning()) { detailsDocument.setConsensusWeightFraction(

1 0

[onionoo/master] Add new "as_name" parameter.
by karsten＠torproject.org 29 Jul '18

29 Jul '18

commit a7d03e231499e37d82a47230886693a5d3127d20 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jul 24 14:46:50 2018 +0200 Add new "as_name" parameter. Implements another part of #23713. --- CHANGELOG.md | 1 + .../org/torproject/onionoo/docs/DocumentStore.java | 3 +- .../org/torproject/onionoo/docs/NodeStatus.java | 14 +++++++++ .../torproject/onionoo/docs/SummaryDocument.java | 14 ++++++++- .../org/torproject/onionoo/server/NodeIndex.java | 10 +++++++ .../org/torproject/onionoo/server/NodeIndexer.java | 8 +++++ .../torproject/onionoo/server/RequestHandler.java | 29 ++++++++++++++++++ .../torproject/onionoo/server/ResourceServlet.java | 25 ++++++++++++++-- .../onionoo/updater/NodeDetailsStatusUpdater.java | 4 +++ .../onionoo/writer/SummaryDocumentWriter.java | 3 +- .../onionoo/docs/SummaryDocumentTest.java | 1 + .../onionoo/server/ResourceServletTest.java | 35 +++++++++++++++++++--- .../server/SummaryDocumentComparatorTest.java | 1 + 13 files changed, 138 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d0d091..89b36eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ bridges. - Add "as" field as a copy of the "as_number" field in preparation of removing the "as_number" field in the future. + - Add new "as_name" parameter to search relays by AS name. # Changes in version 6.1-1.15.0 - 2018-07-16 diff --git a/src/main/java/org/torproject/onionoo/docs/DocumentStore.java b/src/main/java/org/torproject/onionoo/docs/DocumentStore.java index b044788..8cf76c8 100644 --- a/src/main/java/org/torproject/onionoo/docs/DocumentStore.java +++ b/src/main/java/org/torproject/onionoo/docs/DocumentStore.java @@ -415,6 +415,7 @@ public class DocumentStore { List<String> addresses = new ArrayList<>(); String countryCode = null; String asNumber = null; + String asName = null; String contact = null; for (String orAddressAndPort : detailsDocument.getOrAddresses()) { if (!orAddressAndPort.contains(":")) { @@ -451,7 +452,7 @@ public class DocumentStore { SummaryDocument summaryDocument = new SummaryDocument(isRelay, nickname, fingerprint, addresses, lastSeenMillis, running, relayFlags, consensusWeight, countryCode, firstSeenMillis, - asNumber, contact, family, family, version, operatingSystem, + asNumber, asName, contact, family, family, version, operatingSystem, hostName, verifiedHostNames, unverifiedHostNames, recommendedVersion); return summaryDocument; diff --git a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java index 46da822..63720d9 100644 --- a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java +++ b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java @@ -387,6 +387,16 @@ public class NodeStatus extends Document { return this.asNumber; } + private String asName; + + public void setAsName(String asName) { + this.asName = asName; + } + + public String getAsName() { + return this.asName; + } + /* Reverse DNS lookup result */ private String hostName; @@ -618,6 +628,9 @@ public class NodeStatus extends Document { if (parts.length >= 26) { nodeStatus.setVersionStatus(TorVersionStatus.ofAbbreviation(parts[25])); } + if (parts.length >= 27) { + nodeStatus.setAsName(parts[26]); + } return nodeStatus; } catch (NumberFormatException e) { log.error("Number format exception while parsing node " @@ -688,6 +701,7 @@ public class NodeStatus extends Document { .append((this.getHostName() != null ? this.getHostName() : "")); sb.append("\t").append(null != this.getVersionStatus() ? this.getVersionStatus().getAbbreviation() : ""); + sb.append("\t").append((this.asName != null ? this.asName : "")); return sb.toString(); } } diff --git a/src/main/java/org/torproject/onionoo/docs/SummaryDocument.java b/src/main/java/org/torproject/onionoo/docs/SummaryDocument.java index 92ebe69..fc84ba6 100644 --- a/src/main/java/org/torproject/onionoo/docs/SummaryDocument.java +++ b/src/main/java/org/torproject/onionoo/docs/SummaryDocument.java @@ -190,6 +190,17 @@ public class SummaryDocument extends Document { return this.asNumber; } + @JsonProperty("an") + private String asName; + + public void setAsName(String asName) { + this.asName = asName; + } + + public String getAsName() { + return this.asName; + } + @JsonProperty("fs") private String firstSeenMillis; @@ -364,7 +375,7 @@ public class SummaryDocument extends Document { public SummaryDocument(boolean isRelay, String nickname, String fingerprint, List<String> addresses, long lastSeenMillis, boolean running, SortedSet<String> relayFlags, long consensusWeight, - String countryCode, long firstSeenMillis, String asNumber, + String countryCode, long firstSeenMillis, String asNumber, String asName, String contact, SortedSet<String> familyFingerprints, SortedSet<String> effectiveFamily, String version, String operatingSystem, String hostName, List<String> verifiedHostNames, @@ -380,6 +391,7 @@ public class SummaryDocument extends Document { this.setCountryCode(countryCode); this.setFirstSeenMillis(firstSeenMillis); this.setAsNumber(asNumber); + this.setAsName(asName); this.setContact(contact); this.setFamilyFingerprints(familyFingerprints); this.setEffectiveFamily(effectiveFamily); diff --git a/src/main/java/org/torproject/onionoo/server/NodeIndex.java b/src/main/java/org/torproject/onionoo/server/NodeIndex.java index ed9ec44..d8b983a 100644 --- a/src/main/java/org/torproject/onionoo/server/NodeIndex.java +++ b/src/main/java/org/torproject/onionoo/server/NodeIndex.java @@ -85,6 +85,16 @@ class NodeIndex { return relaysByAsNumber; } + private Map<String, Set<String>> relaysByAsName = null; + + public void setRelaysByAsName(Map<String, Set<String>> relaysByAsName) { + this.relaysByAsName = relaysByAsName; + } + + public Map<String, Set<String>> getRelaysByAsName() { + return relaysByAsName; + } + private Map<String, Set<String>> relaysByFlag = null; public void setRelaysByFlag(Map<String, Set<String>> relaysByFlag) { diff --git a/src/main/java/org/torproject/onionoo/server/NodeIndexer.java b/src/main/java/org/torproject/onionoo/server/NodeIndexer.java index 1f1d279..5a2ea8d 100644 --- a/src/main/java/org/torproject/onionoo/server/NodeIndexer.java +++ b/src/main/java/org/torproject/onionoo/server/NodeIndexer.java @@ -151,6 +151,7 @@ public class NodeIndexer implements ServletContextListener, Runnable { new HashMap<>(); Map<String, Set<String>> newRelaysByCountryCode = new HashMap<>(); Map<String, Set<String>> newRelaysByAsNumber = new HashMap<>(); + Map<String, Set<String>> newRelaysByAsName = new HashMap<>(); Map<String, Set<String>> newRelaysByFlag = new HashMap<>(); Map<String, Set<String>> newBridgesByFlag = new HashMap<>(); Map<String, Set<String>> newRelaysByContact = new HashMap<>(); @@ -230,6 +231,12 @@ public class NodeIndexer implements ServletContextListener, Runnable { } newRelaysByAsNumber.get(asNumber).add(fingerprint); newRelaysByAsNumber.get(asNumber).add(hashedFingerprint); + String asName = entry.getAsName(); + if (!newRelaysByAsName.containsKey(asName)) { + newRelaysByAsName.put(asName, new HashSet<>()); + } + newRelaysByAsName.get(asName).add(fingerprint); + newRelaysByAsName.get(asName).add(hashedFingerprint); for (String flag : entry.getRelayFlags()) { String flagLowerCase = flag.toLowerCase(); if (!newRelaysByFlag.containsKey(flagLowerCase)) { @@ -402,6 +409,7 @@ public class NodeIndexer implements ServletContextListener, Runnable { newBridgeFingerprintSummaryLines); newNodeIndex.setRelaysByCountryCode(newRelaysByCountryCode); newNodeIndex.setRelaysByAsNumber(newRelaysByAsNumber); + newNodeIndex.setRelaysByAsName(newRelaysByAsName); newNodeIndex.setRelaysByFlag(newRelaysByFlag); newNodeIndex.setBridgesByFlag(newBridgesByFlag); newNodeIndex.setRelaysByContact(newRelaysByContact); diff --git a/src/main/java/org/torproject/onionoo/server/RequestHandler.java b/src/main/java/org/torproject/onionoo/server/RequestHandler.java index 344178b..e401ae9 100644 --- a/src/main/java/org/torproject/onionoo/server/RequestHandler.java +++ b/src/main/java/org/torproject/onionoo/server/RequestHandler.java @@ -78,6 +78,12 @@ public class RequestHandler { this.as = as; } + private String[] asName; + + public void setAsName(String[] asName) { + this.asName = asName; + } + private String flag; public void setFlag(String flag) { @@ -177,6 +183,7 @@ public class RequestHandler { this.filterByFingerprint(); this.filterByCountryCode(); this.filterByAsNumber(); + this.filterByAsName(); this.filterByFlag(); this.filterNodesByFirstSeenDays(); this.filterNodesByLastSeenDays(); @@ -427,6 +434,28 @@ public class RequestHandler { this.filteredBridges.clear(); } + private void filterByAsName() { + if (this.asName == null) { + /* Not filtering by AS name. */ + return; + } + Set<String> removeRelays = new HashSet<>(); + for (Map.Entry<String, Set<String>> e : + this.nodeIndex.getRelaysByAsName().entrySet()) { + String asName = e.getKey(); + for (String asNamePart : this.asName) { + if (asName == null || !asName.contains(asNamePart.toLowerCase())) { + removeRelays.addAll(e.getValue()); + break; + } + } + } + for (String fingerprint : removeRelays) { + this.filteredRelays.remove(fingerprint); + } + this.filteredBridges.clear(); + } + private void filterByFlag() { if (this.flag == null) { /* Not filtering by relay flag. */ diff --git a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java index 534dc0c..cf480d3 100644 --- a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java +++ b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java @@ -67,9 +67,9 @@ public class ResourceServlet extends HttpServlet { 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", - "os", "host_name", "recommended_version")); + "country", "as", "as_name", "flag", "first_seen_days", + "last_seen_days", "contact", "order", "limit", "offset", "fields", + "family", "version", "os", "host_name", "recommended_version")); private static Set<String> illegalSearchQualifiers = new HashSet<>(Arrays.asList(("search,fingerprint,order,limit," @@ -246,6 +246,15 @@ public class ResourceServlet extends HttpServlet { } rh.setAs(asNumberParameter); } + if (parameterMap.containsKey("as_name")) { + String[] asNameParameter = this.parseAsNameParameter( + parameterMap.get("as_name")); + if (null == asNameParameter) { + response.sendError(HttpServletResponse.SC_BAD_REQUEST); + return; + } + rh.setAsName(asNameParameter); + } if (parameterMap.containsKey("flag")) { String flagParameter = this.parseFlagParameter( parameterMap.get("flag")); @@ -503,6 +512,16 @@ public class ResourceServlet extends HttpServlet { return parameter; } + private String[] parseAsNameParameter(String parameter) { + for (char c : parameter.toCharArray()) { + if (c < 32 || c >= 127) { + /* Only accept printable ASCII. */ + return null; + } + } + return parameter.toLowerCase().split(" "); + } + private static Pattern flagPattern = Pattern.compile("^[a-zA-Z0-9]{1,20}$"); diff --git a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java index 6d22aa2..baba85f 100644 --- a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java +++ b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java @@ -492,6 +492,7 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, nodeStatus.getDefaultPolicy()); updatedNodeStatus.setPortList(nodeStatus.getPortList()); updatedNodeStatus.setAsNumber(nodeStatus.getAsNumber()); + updatedNodeStatus.setAsName(nodeStatus.getAsName()); updatedNodeStatus.setRecommendedVersion( nodeStatus.getRecommendedVersion()); updatedNodeStatus.setVersion(nodeStatus.getVersion()); @@ -879,6 +880,9 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, detailsStatus.setAsName(lookupResult.getAsName()); nodeStatus.setCountryCode(lookupResult.getCountryCode()); nodeStatus.setAsNumber(lookupResult.getAsNumber()); + if (null != lookupResult.getAsName()) { + nodeStatus.setAsName(lookupResult.getAsName().toLowerCase()); + } } if (this.consensusWeightFractions.containsKey(fingerprint)) { diff --git a/src/main/java/org/torproject/onionoo/writer/SummaryDocumentWriter.java b/src/main/java/org/torproject/onionoo/writer/SummaryDocumentWriter.java index dc6eba8..2bcc102 100644 --- a/src/main/java/org/torproject/onionoo/writer/SummaryDocumentWriter.java +++ b/src/main/java/org/torproject/onionoo/writer/SummaryDocumentWriter.java @@ -87,6 +87,7 @@ public class SummaryDocumentWriter implements DocumentWriter { String countryCode = nodeStatus.getCountryCode(); long firstSeenMillis = nodeStatus.getFirstSeenMillis(); String asNumber = nodeStatus.getAsNumber(); + String asName = nodeStatus.getAsName(); String contact = nodeStatus.getContact(); SortedSet<String> declaredFamily = nodeStatus.getDeclaredFamily(); SortedSet<String> effectiveFamily = nodeStatus.getEffectiveFamily(); @@ -100,7 +101,7 @@ public class SummaryDocumentWriter implements DocumentWriter { SummaryDocument summaryDocument = new SummaryDocument(isRelay, nickname, fingerprint, addresses, lastSeenMillis, running, relayFlags, consensusWeight, countryCode, firstSeenMillis, - asNumber, contact, declaredFamily, effectiveFamily, version, + asNumber, asName, contact, declaredFamily, effectiveFamily, version, operatingSystem, hostName, verifiedHostNames, unverifiedHostNames, recommendedVersion); if (this.documentStore.store(summaryDocument, fingerprint)) { diff --git a/src/test/java/org/torproject/onionoo/docs/SummaryDocumentTest.java b/src/test/java/org/torproject/onionoo/docs/SummaryDocumentTest.java index 405fff6..f81dc73 100644 --- a/src/test/java/org/torproject/onionoo/docs/SummaryDocumentTest.java +++ b/src/test/java/org/torproject/onionoo/docs/SummaryDocumentTest.java @@ -21,6 +21,7 @@ public class SummaryDocumentTest { false, new TreeSet<>(Arrays.asList(new String[] { "Running", "Valid" })), 20L, "de", DateTimeHelper.parse("2013-04-18 05:00:00"), "AS8767", + "m-net telekommunikations gmbh", "torkaz <klaus dot zufall at gmx dot de> " + "<fb-token:np5_g_83jmf=>", new TreeSet<>(Arrays.asList( new String[] { "001C13B3A55A71B977CA65EC85539D79C653A3FC", diff --git a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java index 8100c00..37f7923 100644 --- a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java +++ b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java @@ -140,6 +140,7 @@ public class ResourceServletTest { false, new TreeSet<>(Arrays.asList(new String[] { "Running", "Valid" })), 20L, "de", DateTimeHelper.parse("2013-04-18 05:00:00"), "AS8767", + "m-net telekommunikations gmbh", "torkaz <klaus dot zufall at gmx dot de> " + "<fb-token:np5_g_83jmf=>", new TreeSet<>(Arrays.asList( new String[] { "001C13B3A55A71B977CA65EC85539D79C653A3FC", @@ -159,7 +160,8 @@ public class ResourceServletTest { DateTimeHelper.parse("2013-04-24 12:00:00"), true, new TreeSet<>(Arrays.asList(new String[] { "Fast", "Named", "Running", "V2Dir", "Valid" })), 1140L, "us", - DateTimeHelper.parse("2013-04-16 18:00:00"), "AS7922", null, + DateTimeHelper.parse("2013-04-16 18:00:00"), "AS7922", + "comcast cable communications, llc", null, new TreeSet<String>(Arrays.asList(new String[] { "000C5F55BD4814B917CC474BD537F1A3B33CCE2A" })), new TreeSet<>(Arrays.asList(new String[] { @@ -178,6 +180,7 @@ public class ResourceServletTest { new TreeSet<>(Arrays.asList(new String[] { "Fast", "Running", "Unnamed", "V2Dir", "Valid" })), 63L, "a1", DateTimeHelper.parse("2013-04-16 18:00:00"), "AS6830", + "liberty global operations b.v.", "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", @@ -191,7 +194,7 @@ public class ResourceServletTest { Arrays.asList(new String[] { "10.199.7.176" }), 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, DateTimeHelper.parse("2013-04-20 15:37:04"), null, null, null, null, null, "0.2.2.39", null, null, null, null, true); this.bridges.put("0000831B236DFF73D409AD17B40E2A728A53994F", bridgeec2bridgercc7f31fe); @@ -201,7 +204,7 @@ public class ResourceServletTest { new String[] { "10.0.52.84" }), 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, DateTimeHelper.parse("2013-04-14 07:07:05"), null, null, null, null, null, null, null, null, null, null, null); this.bridges.put("0002D9BDBBC230BD9C78FF502A16E0033EF87E0C", bridgeUnnamed); @@ -212,7 +215,7 @@ public class ResourceServletTest { DateTimeHelper.parse("2013-04-24 01:07:04"), true, new TreeSet<>(Arrays.asList(new String[] { "Running", "Valid" })), -1L, null, - DateTimeHelper.parse("2013-01-16 21:07:04"), null, null, null, + DateTimeHelper.parse("2013-01-16 21:07:04"), null, null, null, null, null, "0.2.4.4-alpha-dev", "windows 7", null, null, null, false); this.bridges.put("1FEDE50ED8DBA1DD9F9165F78C8131E4A44AB756", bridgegummy); @@ -1171,6 +1174,30 @@ public class ResourceServletTest { } @Test(timeout = 100) + public void testAsNameComcast() { + this.assertSummaryDocument("/summary?as_name=Comcast", 1, null, 0, null); + } + + @Test(timeout = 100) + public void testAsNameComcastCable() { + this.assertSummaryDocument("/summary?as_name=Comcast Cable", + 1, null, 0, null); + } + + @Test(timeout = 100) + public void testAsNameCableComcast() { + this.assertSummaryDocument("/summary?as_name=Cable Comcast", + 1, null, 0, null); + } + + @Test(timeout = 100) + public void testAsNameMit() { + this.assertSummaryDocument( + "/summary?as_name=Massachusetts Institute of Technology", + 0, null, 0, null); + } + + @Test(timeout = 100) public void testFlagRunning() { this.assertSummaryDocument( "/summary?flag=Running", 3, null, 1, null); diff --git a/src/test/java/org/torproject/onionoo/server/SummaryDocumentComparatorTest.java b/src/test/java/org/torproject/onionoo/server/SummaryDocumentComparatorTest.java index 2b67206..c79565a 100644 --- a/src/test/java/org/torproject/onionoo/server/SummaryDocumentComparatorTest.java +++ b/src/test/java/org/torproject/onionoo/server/SummaryDocumentComparatorTest.java @@ -35,6 +35,7 @@ public class SummaryDocumentComparatorTest { false, new TreeSet<>(Arrays.asList(new String[] { "Running", "Valid" })), 20L, "de", DateTimeHelper.parse("2013-04-18 05:00:00"), "AS8767", + "m-net telekommunikations gmbh", "torkaz <klaus dot zufall at gmx dot de> " + "<fb-token:np5_g_83jmf=>", new TreeSet<>(Arrays.asList( new String[] { "001C13B3A55A71B977CA65EC85539D79C653A3FC",

1 0

[onionoo/master] Fix trivial whitespace issue.
by karsten＠torproject.org 29 Jul '18

29 Jul '18

commit f7f08b804f21f2ea703d868880ec7fc929780c8a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Jul 29 22:12:58 2018 +0200 Fix trivial whitespace issue. --- src/main/java/org/torproject/onionoo/server/ResourceServlet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java index 57c8f83..15087de 100644 --- a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java +++ b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java @@ -370,7 +370,7 @@ public class ResourceServlet extends HttpServlet { String[] familyParameter = this.parseFingerprintParameter( parameterMap.get("family")); if (null == familyParameter || 1 != familyParameter.length) { - response.sendError(HttpServletResponse.SC_BAD_REQUEST); + response.sendError(HttpServletResponse.SC_BAD_REQUEST); return; } rh.setFamily(familyParameter[0]);

1 0

[onionoo/master] Support comma-separated list in "as" parameter.
by karsten＠torproject.org 29 Jul '18

29 Jul '18

commit a6e08a33b95393dc29ace64bea8c50d808160e24 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jul 24 21:54:19 2018 +0200 Support comma-separated list in "as" parameter. Implements the last part of #23713. --- CHANGELOG.md | 2 ++ .../torproject/onionoo/server/RequestHandler.java | 32 +++++++++------------- .../torproject/onionoo/server/ResourceServlet.java | 14 +++++++--- .../onionoo/server/ResourceServletTest.java | 6 ++++ 4 files changed, 31 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 89b36eb..d024d83 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ - Add "as" field as a copy of the "as_number" field in preparation of removing the "as_number" field in the future. - Add new "as_name" parameter to search relays by AS name. + - Support a comma-separated list of AS numbers in the "as" + parameter. # Changes in version 6.1-1.15.0 - 2018-07-16 diff --git a/src/main/java/org/torproject/onionoo/server/RequestHandler.java b/src/main/java/org/torproject/onionoo/server/RequestHandler.java index e401ae9..33c35e1 100644 --- a/src/main/java/org/torproject/onionoo/server/RequestHandler.java +++ b/src/main/java/org/torproject/onionoo/server/RequestHandler.java @@ -72,9 +72,9 @@ public class RequestHandler { this.country = country; } - private String as; + private String[] as; - public void setAs(String as) { + public void setAs(String[] as) { this.as = as; } @@ -408,29 +408,23 @@ public class RequestHandler { } private void filterByAsNumber() { - if (this.as == null) { + if (this.as == null || 0 == this.as.length) { /* Not filtering by AS number. */ return; } - String asNumber = this.as.toUpperCase(); - if (!asNumber.startsWith("AS")) { - asNumber = "AS" + asNumber; - } - if (!this.nodeIndex.getRelaysByAsNumber().containsKey(asNumber)) { - this.filteredRelays.clear(); - } else { - Set<String> relaysWithAsNumber = - this.nodeIndex.getRelaysByAsNumber().get(asNumber); - Set<String> removeRelays = new HashSet<>(); - for (String fingerprint : this.filteredRelays.keySet()) { - if (!relaysWithAsNumber.contains(fingerprint)) { - removeRelays.add(fingerprint); + Map<String, SummaryDocument> matchingRelays = new HashMap<>(); + for (String asNumber : this.as) { + if (this.nodeIndex.getRelaysByAsNumber().containsKey(asNumber)) { + for (String fingerprint + : this.nodeIndex.getRelaysByAsNumber().get(asNumber)) { + if (this.filteredRelays.containsKey(fingerprint)) { + matchingRelays.put(fingerprint, + this.filteredRelays.get(fingerprint)); + } } } - for (String fingerprint : removeRelays) { - this.filteredRelays.remove(fingerprint); - } } + this.filteredRelays = matchingRelays; this.filteredBridges.clear(); } diff --git a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java index cf480d3..57c8f83 100644 --- a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java +++ b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java @@ -238,7 +238,7 @@ public class ResourceServlet extends HttpServlet { rh.setCountry(countryCodeParameter); } if (parameterMap.containsKey("as")) { - String asNumberParameter = this.parseAsNumberParameter( + String[] asNumberParameter = this.parseAsNumberParameter( parameterMap.get("as")); if (asNumberParameter == null) { response.sendError(HttpServletResponse.SC_BAD_REQUEST); @@ -502,14 +502,20 @@ public class ResourceServlet extends HttpServlet { } private static Pattern asNumberParameterPattern = - Pattern.compile("^[asAS]{0,2}[0-9]{1,10}$"); + Pattern.compile("((^|,)([aA][sS])?[1-9][0-9]{0,9})+$"); - private String parseAsNumberParameter(String parameter) { + private String[] parseAsNumberParameter(String parameter) { if (!asNumberParameterPattern.matcher(parameter).matches()) { /* AS number contains illegal character(s). */ return null; } - return parameter; + String[] parameterParts = parameter.toUpperCase().split(","); + String[] parsedParameter = new String[parameterParts.length]; + for (int i = 0; i < parameterParts.length; i++) { + parsedParameter[i] = (!parameterParts[i].startsWith("AS") ? "AS" : "") + + parameterParts[i]; + } + return parsedParameter; } private String[] parseAsNameParameter(String parameter) { diff --git a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java index 37f7923..e176d9b 100644 --- a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java +++ b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java @@ -1174,6 +1174,12 @@ public class ResourceServletTest { } @Test(timeout = 100) + public void testAs8767Or7922() { + this.assertSummaryDocument("/summary?as=8767,7922", 2, + new String[] { "TorkaZ", "Ferrari458" }, 0, null); + } + + @Test(timeout = 100) public void testAsNameComcast() { this.assertSummaryDocument("/summary?as_name=Comcast", 1, null, 0, null); }

1 0

[metrics-web/master] Clarify that we're rounding down user numbers.
by karsten＠torproject.org 29 Jul '18

29 Jul '18

commit 2669b4d50985a25a51c17c63e2f4a7ce01e4078f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Jul 29 21:56:39 2018 +0200 Clarify that we're rounding down user numbers. Technically, we're using integer truncation, but we're only using non-negative numbers as input, so we can as well pretend we're using the floor() function. Sort of resolves #26868 which is where this question came up. --- src/main/resources/web/jsps/reproducible-metrics.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/web/jsps/reproducible-metrics.jsp b/src/main/resources/web/jsps/reproducible-metrics.jsp index f1b97f6..dc00751 100644 --- a/src/main/resources/web/jsps/reproducible-metrics.jsp +++ b/src/main/resources/web/jsps/reproducible-metrics.jsp @@ -136,7 +136,7 @@ This approach also works with <var>r(R)</var> being the sum of requests from <em <p>Estimate the number of clients per country and day using the following formula:</p> -<pre>r(N) = r(R) / frac / 10</pre> +<pre>r(N) = floor(r(R) / frac / 10)</pre> <p>A client that is connected 24/7 makes about 15 requests per day, but not all clients are connected 24/7, so we picked the number 10 for the average client. We simply divide directory requests by 10 and consider the result as the number of users. Another way of looking at it, is that we assume that each request represents a client that stays online for one tenth of a day, so 2 hours and 24 minutes.</p> <p>Skip dates where <var>frac</var> is smaller than 10% and hence too low for a robust estimate, or where <var>frac</var> is greater than 100%, which would indicate an issue in the previous step.</p>

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 29 Jul '18

29 Jul '18

commit ccda04d0a89c7e40fc64effa5920957cb7ac30fe Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 29 13:49:45 2018 +0000 Update translations for support-portal --- contents+ru.po | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/contents+ru.po b/contents+ru.po index db232abb7..9c7441e32 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -1112,6 +1112,8 @@ msgid "" "<img class=\"card-img-top\" src=\"/static/images/image5.png\" alt=\"New " "release alert\">" msgstr "" +"<img class=\"card-img-top\" src=\"/static/images/image5.png\" alt=\"New " +"release alert\">" #: http//localhost/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.description) @@ -1136,6 +1138,8 @@ msgid "" "<img class=\"card-img-top\" src=\"/static/images/image3.png\" alt=\"New " "release alert\">" msgstr "" +"<img class=\"card-img-top\" src=\"/static/images/image3.png\" alt=\"New " +"release alert\">" #: http//localhost/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.seo_slug) @@ -1279,6 +1283,8 @@ msgid "" "<img class=\"card-img-top\" src=\"/static/images/image1.png\" alt=\"New " "release alert\"><div class=\"card-body\">" msgstr "" +"<img class=\"card-img-top\" src=\"/static/images/image1.png\" alt=\"New " +"release alert\"><div class=\"card-body\">" #: http//localhost/tbb/tbb-29/ #: (content/tbb/tbb-29/contents+en.lrquestion.description) @@ -1301,6 +1307,8 @@ msgid "" "A website (bank, email provider, etc..) locks me out whenever I use Tor, " "what can I do?" msgstr "" +"Веб-сайт (банк, почтовый сервис и т.д.) блокирует меня, когда я использую " +"Tor. Что делать?" #: http//localhost/tbb/tbb-30/ #: (content/tbb/tbb-30/contents+en.lrquestion.description) @@ -1308,6 +1316,8 @@ msgid "" "Tor Browser often makes your connection appear as though it is coming from " "an entirely different part of the world." msgstr "" +"При использовании Tor Browser чаще всего ваше соединение выглядит так, " +"словно вы находитесь совсем в другой части света." #: http//localhost/tbb/tbb-30/ #: (content/tbb/tbb-30/contents+en.lrquestion.description) @@ -1315,6 +1325,9 @@ msgid "" "Some websites, such as banks or email providers, might interpret this as a " "sign that your account has been compromised, and lock you out." msgstr "" +"Некоторые сайты, например, банки и сервисы электронной почты, могут " +"посчитать это признаком попытки несанкционированного доступа к аккаунту. Вас" +" заблокируют." #: http//localhost/tbb/tbb-30/ #: (content/tbb/tbb-30/contents+en.lrquestion.description) @@ -1323,6 +1336,9 @@ msgid "" "procedure for account recovery, or contacting the operators and explaining " "the situation." msgstr "" +"Единственный способ решить проблему — следовать рекомендациям сайта для " +"восстановления доступа к аккаунту. Вы также можете связаться со службой " +"поддержки сайта и объяснить ситуацию." #: http//localhost/tbb/tbb-30/ #: (content/tbb/tbb-30/contents+en.lrquestion.description) @@ -1331,11 +1347,16 @@ msgid "" "authentication, which is a much better security option than IP-based " "reputations." msgstr "" +"В принципе, проблемы можно избежать, если сайт использует двухфакторную " +"аутентификацию. Это гораздо лучший способ обеспечения безопасности, чем " +"проверка по IP-адресу." #: http//localhost/tbb/tbb-30/ #: (content/tbb/tbb-30/contents+en.lrquestion.description) msgid "Contact your provider and ask them if they provide 2FA." msgstr "" +"Свяжитесь с владельцами сайта и спросите, предлагают ли они двухфакторную " +"аутентификацию." #: http//localhost/tbb/tbb-30/ #: (content/tbb/tbb-30/contents+en.lrquestion.seo_slug) @@ -1345,7 +1366,7 @@ msgstr "" #: http//localhost/tbb/tbb-31/ #: (content/tbb/tbb-31/contents+en.lrquestion.description) msgid "Tor Browser is currently available on Windows, Linux and OSX." -msgstr "" +msgstr "В настоящее время Tor Browser доступен для Windows, Linux и OSX." #: http//localhost/tbb/tbb-31/ #: (content/tbb/tbb-31/contents+en.lrquestion.seo_slug) @@ -1355,7 +1376,7 @@ msgstr "" #: http//localhost/tbb/tbb-32/ #: (content/tbb/tbb-32/contents+en.lrquestion.title) msgid "Can I set Tor Browser as my default browser?" -msgstr "" +msgstr "Можно ли сделать Tor Browser браузером по умолчанию?" #: http//localhost/tbb/tbb-32/ #: (content/tbb/tbb-32/contents+en.lrquestion.description) @@ -1363,6 +1384,8 @@ msgid "" "There is currently no supported method for setting Tor Browser as your " "default browser." msgstr "" +"В настоящее время нет возможности установить Tor Browser как браузер по " +"умолчанию." #: http//localhost/tbb/tbb-32/ #: (content/tbb/tbb-32/contents+en.lrquestion.description)

1 0

[translation/support-tbb] Update translations for support-tbb
by translation＠torproject.org 29 Jul '18

29 Jul '18

commit 1bce825b6fd7a0277625f6bdebada6e0181f3ad6 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 29 13:49:34 2018 +0000 Update translations for support-tbb --- ru.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ru.json b/ru.json index 1663f506e..db6ce3e46 100644 --- a/ru.json +++ b/ru.json @@ -182,7 +182,7 @@ "tbb-30": { "id": "#tbb-30", "control": "tbb-30", - "title": "A website (bank, email provider, etc..) locks me out whenever I use Tor, what can I do?", + "title": "Веб-сайт (банк, почтовый сервис и т.д.) блокирует меня, когда я использую Tor. Что делать?", "description": "<p class=\"mb-3\">Tor Browser often makes your connection appear as though it is coming from an entirely different part of the world. Some websites, such as banks or email providers, might interpret this as a sign that your account has been compromised, and lock you out. The only way to resolve this is by following the site’s recommended procedure for account recovery, or contacting the operators and explaining the situation. You may be able to avoid this scenario if your provider offers 2-factor authentication, which is a much better security option than IP-based reputations. Contact your provider and ask them if they provide 2FA.</p>" }, "tbb-31": { @@ -194,7 +194,7 @@ "tbb-32": { "id": "#tbb-32", "control": "tbb-32", - "title": "Can I set Tor Browser as my default browser?", + "title": "Можно ли сделать Tor Browser браузером по умолчанию?", "description": "<p class=\"mb-3\">There is currently no supported method for setting Tor Browser as your default browser. The Tor Browser works hard to isolate itself from the rest of your system, and the steps for making it the default browser are unreliable. This means sometimes a website would load in the Tor Browser, and sometimes it would load in another browser, this type of behavior can be dangerous and anonymity-breaking.</p>" }, "tbb-33": {

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 29 Jul '18

29 Jul '18

commit 383acb99dac3690ef7b460ed155291688a221137 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 29 12:19:42 2018 +0000 Update translations for support-portal --- contents+ru.po | 121 +++++++++++++++++++++++++++------------------------------ 1 file changed, 58 insertions(+), 63 deletions(-) diff --git a/contents+ru.po b/contents+ru.po index e23683249..db232abb7 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -3,7 +3,6 @@ # Sergey Smirnov <cj75300(a)gmail.com>, 2018 # Timofey Lisunov <solokot(a)gmail.com>, 2018 # Evgeny Malyshev <evgeny.malyshev.sss(a)gmail.com>, 2018 -# Dina Solveig Jalkanen, 2018 # Czar, 2018 # Andrey, 2018 # Anton Bershanskiy <bershan2(a)illinois.edu>, 2018 @@ -48,12 +47,12 @@ msgstr "" #: http//localhost/tormessenger/ #: (content/tormessenger/contents+en.lrtopic.title) msgid "Tor Messenger" -msgstr "Tor мессенджер" +msgstr "Tor Messenger" #: http//localhost/tormessenger/ #: (content/tormessenger/contents+en.lrtopic.seo_slug) msgid "tor-messenger" -msgstr "Tor мессенджер" +msgstr "tor-messenger" #: http//localhost/tormobile/ (content/tormobile/contents+en.lrtopic.title) msgid "Tor Mobile" @@ -275,7 +274,7 @@ msgid "" "For Android, The Guardian Project maintains the Tor-powered apps Orbot and " "Orfox." msgstr "" -"Для Android'a The Guardian Project поддерживает приложения Orbot и Orfox, " +"Команда Guardian Project поддерживает Android-приложения Orbot и Orfox, " "которые работают через Tor." #: http//localhost/faq/faq-4/ @@ -286,14 +285,14 @@ msgid "" "There is no official version of Tor for iOS yet, though we recommend Onion " "Browser." msgstr "" -"В природе пока что не существует официальной версии Tor для iOS, но в " -"принципе мы рекомендуем использовать Onion Browser для iOS." +"Официальной версии Tor для iOS пока нет. Мы советуем использовать Onion " +"Browser для iOS." #: http//localhost/faq/faq-5/ (content/faq/faq-5/contents+en.lrquestion.title) #: http//localhost/misc/misc-13/ #: (content/misc/misc-13/contents+en.lrquestion.title) msgid "Can I use a VPN with Tor?" -msgstr "Могу ли я использовать Tor и VPN совместно?" +msgstr "Можно ли использовать Tor вместе с VPN?" #: http//localhost/faq/faq-5/ #: (content/faq/faq-5/contents+en.lrquestion.description) @@ -304,10 +303,9 @@ msgid "" " advanced user who knows how to configure both in a way that doesn't " "compromise your privacy." msgstr "" -"В принципе мы не рекомендуем использовать VPN совместно с Tor, только если " -"вы не продвинутый компьютерный пользователь, который точно знает как " -"сконфигурировать(настроить) VPN совместно с Tor таким образом, чтобы не " -"скомпрометировать вашу анонимность." +"В принципе, мы не рекомендуем использовать VPN вместе с Tor. Исключение — " +"если вы продвинутый пользователь, который точно знает, как настроить VPN " +"вместе с Tor так, чтобы не нарушить вашу анонимность." #: http//localhost/faq/faq-5/ #: (content/faq/faq-5/contents+en.lrquestion.description) @@ -331,8 +329,8 @@ msgid "" "What are the most common issues with the latest stable version of Tor " "Browser?" msgstr "" -"Какие основные проблемы могут возникнуть при использовании стабильной версии" -" Tor браузера?" +"Какие проблемы чаще всего могут возникать при использовании свежей " +"стабильной версии Tor Browser?" #: http//localhost/tbb/tbb-1/ #: (content/tbb/tbb-1/contents+en.lrquestion.description) @@ -340,8 +338,8 @@ msgid "" "Whenever we release a new stable version of Tor Browser, we write a blog " "post that details its new features and known issues." msgstr "" -"Каждый раз, когда мы выпускаем новую стабильную версию Tor браузера, мы " -"пишем в блоге пост, в котором расписаны новые возможности и проблемы." +"При выпуске очередной стабильной версии Tor Browser мы публикуем в блоге " +"описание новых возможностей и особенностей." #: http//localhost/tbb/tbb-1/ #: (content/tbb/tbb-1/contents+en.lrquestion.description) @@ -370,7 +368,7 @@ msgstr "" msgid "" "My antivirus or malware protection is blocking me from accessing Tor " "Browser." -msgstr "Мой антивирус блокирует попытки доступа к Tor браузеру." +msgstr "Мой антивирус блокирует доступ к Tor Browser." #: http//localhost/tbb/tbb-10/ #: (content/tbb/tbb-10/contents+en.lrquestion.description) @@ -378,8 +376,8 @@ msgid "" "Most antivirus or malware protection allows the user to \"whitelist\" " "certain processes that would otherwise be blocked." msgstr "" -"Большинство антивирусов позволяют пользователю поместить в \"белый список\" " -"конкретный процесс, которые в противном случае будут заблокированы." +"Большинство антивирусов позволяет занести тот или иной процесс в \"белый " +"список\", и тогда этот процесс не будет блокироваться." #: http//localhost/tbb/tbb-10/ #: (content/tbb/tbb-10/contents+en.lrquestion.description) @@ -387,13 +385,13 @@ msgid "" "Please open your antivirus or malware protection software and look in the " "settings for a \"whitelist\" or something similar." msgstr "" -"Пожалуйста откройте вашу антивирусную программу и поищите в настройках " +"Пожалуйста, откройте вашу антивирусную программу и поищите в настройках " "\"белый список\" или что-то подобное." #: http//localhost/tbb/tbb-10/ #: (content/tbb/tbb-10/contents+en.lrquestion.description) msgid "Next, exclude the following processes:" -msgstr "Далее, исключите следующие процессы:" +msgstr "Теперь исключите следующие процессы:" #: http//localhost/tbb/tbb-10/ #: (content/tbb/tbb-10/contents+en.lrquestion.description) @@ -438,12 +436,12 @@ msgstr "* obfs4proxy (если вы используете мосты)" #: http//localhost/tbb/tbb-10/ #: (content/tbb/tbb-10/contents+en.lrquestion.description) msgid "Finally, restart Tor Browser." -msgstr "По итогу, перезапустите Tor браузер." +msgstr "Наконец перезапустите Tor Browser." #: http//localhost/tbb/tbb-10/ #: (content/tbb/tbb-10/contents+en.lrquestion.description) msgid "This should fix the issues you're experiencing." -msgstr "Это должно исправить проблемы, с которыми вы столкнулись." +msgstr "Это должно исправить обнаруженные проблемы." #: http//localhost/tbb/tbb-10/ #: (content/tbb/tbb-10/contents+en.lrquestion.description) @@ -451,8 +449,8 @@ msgid "" "Please note that some antivirus clients, like Kaspersky, may also be " "blocking Tor at the firewall level." msgstr "" -"Пожалуйста учтите, что некоторые антивирусные программы, например " -"Касперский, также могут блокировать Tor на уровне файрволла." +"Пожалуйста, учтите, что некоторые антивирусные программы, например, " +"антивирус Касперского, могут блокировать Tor на уровне межсетевого экрана." #: http//localhost/tbb/tbb-10/ #: (content/tbb/tbb-10/contents+en.lrquestion.seo_slug) @@ -464,14 +462,13 @@ msgstr "" msgid "" "I downloaded and installed Tor Browser for Windows, but now I can't find it." msgstr "" -"Я скачал и установил Tor браузер для Windows, но теперь не могу найти его." +"Я скачал и установил Tor Browser для Windows, но теперь не могу найти его." #: http//localhost/tbb/tbb-11/ #: (content/tbb/tbb-11/contents+en.lrquestion.description) msgid "The file you download and run prompts you for a destination." msgstr "" -"Файл который вы скачали и запустили попросить у вас папку назначения " -"установки." +"После скачивания и запуска файла вам задавали вопрос о папке установки." #: http//localhost/tbb/tbb-11/ #: (content/tbb/tbb-11/contents+en.lrquestion.description) @@ -479,8 +476,8 @@ msgid "" "If you don't remember what this destination was, it's most likely your " "Downloads or Desktop folder." msgstr "" -"Если вы не помните какую вы указали папку назначения установки, скорее всего" -" она в папке Загрузки или на Рабочем столе." +"Если вы не помните, какую папку выбрали, попробуйте поискать в папке " +"Загрузки или на рабочем столе." #: http//localhost/tbb/tbb-11/ #: (content/tbb/tbb-11/contents+en.lrquestion.description) @@ -489,9 +486,9 @@ msgid "" " on your Desktop, though be aware that you may have accidentally unticked " "the option to create a shortcut." msgstr "" -"При установке на Windows по умолчанию также создаётся ярлык на Рабочем " -"столе, так что при установке вы могли случайно снять галочку для создания " -"такого ярлыка." +"По умолчанию при установке в Windows на рабочий стол добавляется ярлык " +"программы. (Впрочем, при установке вы могли случайно снять галочку для " +"создания ярлыка)." #: http//localhost/tbb/tbb-11/ #: (content/tbb/tbb-11/contents+en.lrquestion.description) @@ -499,8 +496,8 @@ msgid "" "If you can't find it in either of those folders, download it again and look " "for the prompt that asks you to choose a directory to download it in." msgstr "" -"Если вы не можете найти ни в каких папках, скачайте файл заново и посмотрите" -" и запомните на указанную папку(местоположение) для скачивания файла." +"Если файл не получается найти ни в каких папках, скачайте его заново. " +"Обратите внимание на папку, куда сохраняете файл." #: http//localhost/tbb/tbb-11/ #: (content/tbb/tbb-11/contents+en.lrquestion.description) @@ -508,8 +505,8 @@ msgid "" "Choose a directory location that you'll remember easily, and once the " "download finishes you should see a Tor Browser folder there." msgstr "" -"Выберете папку назначения, которую вы сможете легко запомнить, и после того " -"как скачивание закончится вы сможете найти Tor браузер в этой папке." +"Выберите папку, которую сможете легко запомнить. После скачивания вы сможете" +" найти Tor Browser в этой папке." #: http//localhost/tbb/tbb-11/ #: (content/tbb/tbb-11/contents+en.lrquestion.seo_slug) @@ -519,15 +516,13 @@ msgstr "" #: http//localhost/tbb/tbb-12/ #: (content/tbb/tbb-12/contents+en.lrquestion.title) msgid "Can I use Flash in Tor Browser?" -msgstr "Могу ли я использовать технологию Flash в Tor браузере?" +msgstr "Можно ли использовать Flash в Tor Browser?" #: http//localhost/tbb/tbb-12/ #: (content/tbb/tbb-12/contents+en.lrquestion.description) msgid "" "Flash is disabled in Tor Browser, and we recommend you do not enable it." -msgstr "" -"Технология Flash недоступна в Tor браузере и мы рекомендуем вам не пытаться " -"её включать в Tor браузере." +msgstr "Поддержка Flash в Tor Browser отключена. Мы советуем не включать ее." #: http//localhost/tbb/tbb-12/ #: (content/tbb/tbb-12/contents+en.lrquestion.description) @@ -536,10 +531,9 @@ msgid "" "piece of software that can easily compromise your privacy or serve you " "malware." msgstr "" -"Мы считаем что технология Flash не безопасна в использовании в ЛЮБОМ " -"браузере — это очень небезопасная технология, которая может запросто " -"скомпрометировать вашу приватность или вообще распространять вредоносное " -"программное обеспечение." +"Мы не считаем технологию Flash безопасной в каком бы то ни было браузере. " +"Это очень небезопасная технология, которая может запросто нарушить вашу " +"приватность или внедрить вредоносный программный код." #: http//localhost/tbb/tbb-12/ #: (content/tbb/tbb-12/contents+en.lrquestion.description) @@ -547,8 +541,7 @@ msgid "" "Fortunately, most websites, devices, and other browsers are moving away from" " the use of Flash." msgstr "" -"К счастью, большинство сайтов, устройств и других браузеров отказались от " -"использования технологии Flash." +"К счастью, большинство сайтов, устройств и браузеров отказалось от Flash." #: http//localhost/tbb/tbb-12/ #: (content/tbb/tbb-12/contents+en.lrquestion.seo_slug) @@ -558,13 +551,12 @@ msgstr "" #: http//localhost/tbb/tbb-13/ #: (content/tbb/tbb-13/contents+en.lrquestion.title) msgid "Does using Tor Browser protect other applications on my computer?" -msgstr "" -"Защищает ли использование Tor браузера другие программы на моём компьютере?" +msgstr "Защищает ли Tor Browser другие мои программы?" #: http//localhost/tbb/tbb-13/ #: (content/tbb/tbb-13/contents+en.lrquestion.description) msgid "Only Tor Browser's traffic will be routed over the Tor network." -msgstr "Только трафик в Tor браузере будет пущен через сеть Tor." +msgstr "Через сеть Tor проходит только трафик Tor Browser." #: http//localhost/tbb/tbb-13/ #: (content/tbb/tbb-13/contents+en.lrquestion.description) @@ -573,13 +565,13 @@ msgid "" "have their connections routed over the Tor network, and will not be " "protected." msgstr "" -"Любый другие программы на вашей системе (включая другие браузеры) не имеют " -"возможности подключиться к сети Tor и соответственно не будут защищены." +"Любый другие ваши программы (включая браузеры) не подключаются к сети Tor и " +"не будут защищены." #: http//localhost/tbb/tbb-13/ #: (content/tbb/tbb-13/contents+en.lrquestion.description) msgid "They need to be configured separately to use Tor." -msgstr "Чтобы они смогли использовать сеть Tor, их надо настраивать отдельно." +msgstr "Чтобы они смогли использовать Tor, их надо настраивать отдельно." #: http//localhost/tbb/tbb-13/ #: (content/tbb/tbb-13/contents+en.lrquestion.description) @@ -589,10 +581,10 @@ msgid "" "operating system</a></mark> which you can start on almost any computer from " "a USB stick or a DVD." msgstr "" -"Если вы хотите быть уверены что весь траффик будет пущен через сеть Tor, " -"взгляните на<mark><a href=\"https://tails.boum.org/\">операционную live " -"систему Tails</a></mark> которую вы сможете запустить практически на любом " -"компютере используя USB флешку или DVD диск." +"Хотите пропускать все данные через сеть Tor? Обратите внимание на<mark><a " +"href=\"https://tails.boum.org/\">операционную live систему Tails</a></mark>." +" Ее можно запустить практически на любом компьютере с USB-флешки или диска " +"DVD." #: http//localhost/tbb/tbb-13/ #: (content/tbb/tbb-13/contents+en.lrquestion.seo_slug) @@ -691,10 +683,9 @@ msgid "" "private, and you may forget and accidentally use that non-private browser to" " do something that you intended to do in Tor Browser." msgstr "" -"Но, будте осторожны с тем, что другие браузеры не поддерживают приватность " -"ваших действий, и вы можете об этом забыть и по запарке случайно " -"использовать какой нибудь не приватный браузер, полагая что вы используете " -"Tor браузер." +"Помните, что другие браузеры не обеспечивают приватность ваших действий. " +"Можно забыть об этом и случайно использовать обычный браузер, рассчитывая на" +" защиту Tor Browser." #: http//localhost/tbb/tbb-17/ #: (content/tbb/tbb-17/contents+en.lrquestion.seo_slug) @@ -984,6 +975,8 @@ msgid "" "Please see the <mark><a href=\"https://duck.co/help\">DuckDuckGo support " "portal</a></mark>." msgstr "" +"Пожалуйста, обратитесь к <mark><a href=\"https://duck.co/help\">сайту " +"поддержки DuckDuckGo</a></mark>." #: http//localhost/tbb/tbb-24/ #: (content/tbb/tbb-24/contents+en.lrquestion.description) @@ -1056,7 +1049,7 @@ msgstr "Вы можете обновить Tor Browser сразу после в #: http//localhost/https/https-1/ #: (content/https/https-1/contents+en.lrquestion.description) msgid "<div class=\"col-md-6\">" -msgstr "" +msgstr "<div class=\"col-md-6\">" #: http//localhost/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.description) @@ -1065,7 +1058,7 @@ msgstr "" #: http//localhost/https/https-1/ #: (content/https/https-1/contents+en.lrquestion.description) msgid "<div class=\"card\">" -msgstr "" +msgstr "<div class=\"card\">" #: http//localhost/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.description) @@ -1073,13 +1066,15 @@ msgid "" "<img class=\"card-img-top\" src=\"/static/images/image4.png\" alt=\"New " "release alert\">" msgstr "" +"<img class=\"card-img-top\" src=\"/static/images/image4.png\" alt=\"New " +"release alert\">" #: http//localhost/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.description) #: http//localhost/https/https-1/ #: (content/https/https-1/contents+en.lrquestion.description) msgid "<div class=\"card-body\">" -msgstr "" +msgstr "<div class=\"card-body\">" #: http//localhost/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.description)

1 0