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

[tor-browser-build/master] Bug 26697: Add Android toolchain
by gk＠torproject.org 25 Oct '18

25 Oct '18

commit 10c58d9a2f9fc37f7ba3e1b7028d2b5a730b1e6f Author: sisbell <shane.isbell(a)gmail.com> Date: Thu Sep 27 20:44:56 2018 -0700 Bug 26697: Add Android toolchain --- projects/android-toolchain/build | 43 +++++++++++++++++++++++++++++++++++++++ projects/android-toolchain/config | 36 ++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+) diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build new file mode 100644 index 0000000..325a543 --- /dev/null +++ b/projects/android-toolchain/build @@ -0,0 +1,43 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +export PROJECT_PATH=/var/tmp/dist/[% project %] +export SDK_HOME=$PROJECT_PATH/android-sdk-linux +export NDK_HOME=$PROJECT_PATH/android-ndk +export GRADLE_HOME=$PROJECT_PATH/gradle + +#Make directories +mkdir -p $NDK_HOME $SDK_HOME $GRADLE_HOME + +# Compiler Archives +unzip -qq [% c("input_files_by_name/android_sdk_tools") %] -d $SDK_HOME +unzip -qq [% c("input_files_by_name/android_ndk_compiler")%] -d $NDK_HOME +unzip -qq [% c("input_files_by_name/gradle_bin") %] -d $GRADLE_HOME + +# NDK Archive +cd $NDK_HOME +mv android-ndk-r15c/* . +rm -fR android-ndk-r15c +./build/tools/make_standalone_toolchain.py --api 26 --arch arm --install-dir=./arm + +# Tool Archives +cd $SDK_HOME +unzip -qq $HOME/[% c("input_files_by_name/build_tools_26") %] -d $SDK_HOME +mkdir -p build-tools/26.0.2 +mv android-8.1.0/* build-tools/26.0.2 + +unzip -qq $HOME/[% c("input_files_by_name/platform_26") %] -d $SDK_HOME +mkdir -p platforms/android-26 +mv android-8.0.0/* platforms/android-26 + +unzip -qq $HOME/[% c("input_files_by_name/platform_tools_26") %] -d $SDK_HOME + +# Cleanup +rm -fR android-8.1.0 +rm -fR android-8.0.0 + +# Archive dist directory +cd /var/tmp/dist +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config new file mode 100644 index 0000000..122ae5f --- /dev/null +++ b/projects/android-toolchain/config @@ -0,0 +1,36 @@ +# vim: filetype=yaml sw=2 +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +version: 26.0.2 +var: + container: + use_container: 1 + deps: + - unzip + - python + setup: | + mkdir -p /var/tmp/dist + tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %] + export ANDROID_SDK_HOME=/var/tmp/dist/[% project %]/android-sdk-linux + export ANDROID_NDK_HOME=/var/tmp/dist/[% project %]/android-ndk + export GRADLE_HOME=/var/tmp/dist/[% project %]/gradle + google_repo: https://dl.google.com/android/repository +input_files: + - project: container-image + - URL: '[% c("var/google_repo") %]/build-tools_r26.0.2-linux.zip' + name: build_tools_26 + sha256sum: a752849fac85c4a7f9ea165ec8f367b0ebe8bbf6a1f33fc8605342be004231ce + - URL: '[% c("var/google_repo") %]/platform-26_r02.zip' + name: platform_26 + sha256sum: 2aafa7d19c5e9c4b643ee6ade3d85ef89dc2f79e8383efdb9baf7fddad74b52a + - URL: '[% c("var/google_repo") %]/platform-tools_r26.0.2-linux.zip' + name: platform_tools_26 + sha256sum: 63b15a38c2b64e6ec8b54febe9f69fce5fe6c898c554c73b826b49daf7b52519 + - URL: '[% c("var/google_repo") %]/sdk-tools-linux-4333796.zip' + name: android_sdk_tools + sha256sum: 92ffee5a1d98d856634e8b71132e8a95d96c83a63fde1099be3d86df3106def9 + - URL: '[% c("var/google_repo") %]/android-ndk-r15c-linux-x86_64.zip' + name: android_ndk_compiler + sha256sum: f01788946733bf6294a36727b99366a18369904eb068a599dde8cca2c1d2ba3c + - URL: http://services.gradle.org/distributions/gradle-4.1-bin.zip + name: gradle_bin + sha256sum: d55dfa9cfb5a3da86a1c9e75bb0b9507f9a8c8c100793ccec7beb6e259f9ed43

1 0

[metrics-web/master] Resolve a few checkstyle issues.
by karsten＠torproject.org 25 Oct '18

25 Oct '18

commit a0e9033ed36024d90b0971afa2e5e197939c7876 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Oct 25 11:30:38 2018 +0200 Resolve a few checkstyle issues. --- src/main/java/org/torproject/metrics/stats/totalcw/Parser.java | 3 ++- .../metrics/stats/totalcw/TotalcwRelayNetworkStatusVoteTest.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/metrics/stats/totalcw/Parser.java b/src/main/java/org/torproject/metrics/stats/totalcw/Parser.java index 155b6b0..4367200 100644 --- a/src/main/java/org/torproject/metrics/stats/totalcw/Parser.java +++ b/src/main/java/org/torproject/metrics/stats/totalcw/Parser.java @@ -3,10 +3,11 @@ package org.torproject.metrics.stats.totalcw; -import org.apache.commons.math3.stat.descriptive.rank.Percentile; import org.torproject.descriptor.NetworkStatusEntry; import org.torproject.descriptor.RelayNetworkStatusVote; +import org.apache.commons.math3.stat.descriptive.rank.Percentile; + import java.time.Instant; import java.time.ZoneId; import java.util.ArrayList; diff --git a/src/test/java/org/torproject/metrics/stats/totalcw/TotalcwRelayNetworkStatusVoteTest.java b/src/test/java/org/torproject/metrics/stats/totalcw/TotalcwRelayNetworkStatusVoteTest.java index 085a976..dc9df7f 100644 --- a/src/test/java/org/torproject/metrics/stats/totalcw/TotalcwRelayNetworkStatusVoteTest.java +++ b/src/test/java/org/torproject/metrics/stats/totalcw/TotalcwRelayNetworkStatusVoteTest.java @@ -28,6 +28,7 @@ import java.util.Collection; @RunWith(Parameterized.class) public class TotalcwRelayNetworkStatusVoteTest { + /** Provide test data. */ @Parameters public static Collection<Object[]> data() { return Arrays.asList(new Object[][] {

1 0

[metrics-web/master] Compute percentiles in connbidirect module using linear interpolation.
by karsten＠torproject.org 25 Oct '18

25 Oct '18

commit cda16c857e942a822df6b28f23518fc087bbc0f4 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat May 19 21:11:49 2018 +0200 Compute percentiles in connbidirect module using linear interpolation. So far we computed percentiles in the connbidirect module using our own formula that picked existing values for median and quartiles. Now we're using Apache Commons Math with method R_7 which uses linear interpolation when a percentile lies between two data points. Implements the last part of #26035. --- .../metrics/stats/connbidirect/Main.java | 31 ++++++++-- .../metrics/stats/connbidirect/MainTest.java | 71 +++++++++++++++++++--- 2 files changed, 88 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/torproject/metrics/stats/connbidirect/Main.java b/src/main/java/org/torproject/metrics/stats/connbidirect/Main.java index b2dc1b6..468ffba 100644 --- a/src/main/java/org/torproject/metrics/stats/connbidirect/Main.java +++ b/src/main/java/org/torproject/metrics/stats/connbidirect/Main.java @@ -8,6 +8,8 @@ import org.torproject.descriptor.DescriptorReader; import org.torproject.descriptor.DescriptorSourceFactory; import org.torproject.descriptor.ExtraInfoDescriptor; +import org.apache.commons.math3.stat.descriptive.rank.Percentile; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -22,7 +24,6 @@ import java.io.StringReader; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Map; import java.util.SortedMap; @@ -455,19 +456,39 @@ public class Main { } } final String[] quantiles = new String[] { "0.25", "0.5", "0.75" }; - final int[] centiles = new int[] { 25, 50, 75 }; + final double[] centiles = new double[] { 25.0, 50.0, 75.0 }; for (Map.Entry<String, List<Short>> e : fractionsByDateAndDirection.entrySet()) { String dateAndDirection = e.getKey(); List<Short> fractions = e.getValue(); - Collections.sort(fractions); + SortedMap<Double, Short> computedPercentiles + = computePercentiles(fractions, centiles); for (int i = 0; i < quantiles.length; i++) { String dateDirectionAndQuantile = dateAndDirection + "," + quantiles[i]; - short fraction = fractions.get((centiles[i] * fractions.size()) - / 100); + short fraction = computedPercentiles.get(centiles[i]); aggregateStats.put(dateDirectionAndQuantile, fraction); } } } + + /** Compute percentiles (greater than 0.0 and smaller than or equal 100.0) for + * the given list of values, and return a map with percentiles as keys and + * computed values as values. If the list of values is empty, the returned map + * contains all zeros. */ + static SortedMap<Double, Short> computePercentiles(List<Short> valueList, + double ... percentiles) { + SortedMap<Double, Short> computedPercentiles = new TreeMap<>(); + double[] valueArray = new double[valueList.size()]; + for (int i = 0; i < valueList.size(); i++) { + valueArray[i] = valueList.get(i).doubleValue(); + } + Percentile percentile = new Percentile() + .withEstimationType(Percentile.EstimationType.R_7); + percentile.setData(valueArray); + for (double p : percentiles) { + computedPercentiles.put(p, (short) Math.floor(percentile.evaluate(p))); + } + return computedPercentiles; + } } diff --git a/src/test/java/org/torproject/metrics/stats/connbidirect/MainTest.java b/src/test/java/org/torproject/metrics/stats/connbidirect/MainTest.java index 255cccf..69001da 100644 --- a/src/test/java/org/torproject/metrics/stats/connbidirect/MainTest.java +++ b/src/test/java/org/torproject/metrics/stats/connbidirect/MainTest.java @@ -11,6 +11,8 @@ import org.junit.Test; import java.io.ByteArrayOutputStream; import java.io.PrintStream; +import java.util.ArrayList; +import java.util.List; import java.util.SortedMap; import java.util.SortedSet; import java.util.TreeMap; @@ -242,15 +244,15 @@ public class MainTest { @Test public void testUpdateAggregateStatsTwoRawStat() { SortedMap<String, Short> expectedAggregateStats = new TreeMap<>(); - expectedAggregateStats.put("2015-08-18,read,0.25", (short) 32); - expectedAggregateStats.put("2015-08-18,read,0.5", (short) 42); - expectedAggregateStats.put("2015-08-18,read,0.75", (short) 42); - expectedAggregateStats.put("2015-08-18,write,0.25", (short) 22); - expectedAggregateStats.put("2015-08-18,write,0.5", (short) 32); - expectedAggregateStats.put("2015-08-18,write,0.75", (short) 32); - expectedAggregateStats.put("2015-08-18,both,0.25", (short) 12); - expectedAggregateStats.put("2015-08-18,both,0.5", (short) 22); - expectedAggregateStats.put("2015-08-18,both,0.75", (short) 22); + expectedAggregateStats.put("2015-08-18,read,0.25", (short) 34); + expectedAggregateStats.put("2015-08-18,read,0.5", (short) 37); + expectedAggregateStats.put("2015-08-18,read,0.75", (short) 39); + expectedAggregateStats.put("2015-08-18,write,0.25", (short) 24); + expectedAggregateStats.put("2015-08-18,write,0.5", (short) 27); + expectedAggregateStats.put("2015-08-18,write,0.75", (short) 29); + expectedAggregateStats.put("2015-08-18,both,0.25", (short) 14); + expectedAggregateStats.put("2015-08-18,both,0.5", (short) 17); + expectedAggregateStats.put("2015-08-18,both,0.75", (short) 19); SortedSet<Main.RawStat> rawStats = new TreeSet<>(); rawStats.add(new Main.RawStat(DATE_A, FPR_A, (short) 32, (short) 22, (short) 12)); @@ -258,4 +260,55 @@ public class MainTest { (short) 22)); assertStatsCanBeAggregated(expectedAggregateStats, rawStats); } + + @Test + public void testComputePercentilesZeroValues() { + List<Short> valueList = new ArrayList<>(); + SortedMap<Double, Short> computedPercentiles = Main.computePercentiles( + valueList, 25.0, 50.0, 75.0); + assertEquals(0, computedPercentiles.get(25.0).shortValue()); + assertEquals(0, computedPercentiles.get(50.0).shortValue()); + assertEquals(0, computedPercentiles.get(75.0).shortValue()); + } + + @Test + public void testComputePercentilesTenValues() { + List<Short> valueList = new ArrayList<>(); + valueList.add((short) 3); + valueList.add((short) 6); + valueList.add((short) 7); + valueList.add((short) 8); + valueList.add((short) 8); + valueList.add((short) 10); + valueList.add((short) 13); + valueList.add((short) 15); + valueList.add((short) 16); + valueList.add((short) 20); + SortedMap<Double, Short> computedPercentiles = Main.computePercentiles( + valueList, 25.0, 50.0, 75.0); + assertEquals(7, computedPercentiles.get(25.0).shortValue()); + assertEquals(9, computedPercentiles.get(50.0).shortValue()); + assertEquals(14, computedPercentiles.get(75.0).shortValue()); + } + + @Test + public void testComputePercentilesElevenValues() { + List<Short> valueList = new ArrayList<>(); + valueList.add((short) 3); + valueList.add((short) 6); + valueList.add((short) 7); + valueList.add((short) 8); + valueList.add((short) 8); + valueList.add((short) 9); + valueList.add((short) 10); + valueList.add((short) 13); + valueList.add((short) 15); + valueList.add((short) 16); + valueList.add((short) 20); + SortedMap<Double, Short> computedPercentiles = Main.computePercentiles( + valueList, 25.0, 50.0, 75.0); + assertEquals(7, computedPercentiles.get(25.0).shortValue()); + assertEquals(9, computedPercentiles.get(50.0).shortValue()); + assertEquals(14, computedPercentiles.get(75.0).shortValue()); + } }

1 0

[metrics-web/master] Compute percentiles in advbwdist module using linear interpolation.
by karsten＠torproject.org 25 Oct '18

25 Oct '18

commit dda2b51eaa6efdd871d5190f4b86fad008beee42 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat May 19 21:08:42 2018 +0200 Compute percentiles in advbwdist module using linear interpolation. So far we computed percentiles in the advbwdist module using our own formula that picked existing values for the various percentiles we provided. Now we're using Apache Commons Math with method R_7 which uses linear interpolation when a percentile lies between two data points. Implements another part of #26035. --- build.xml | 1 + .../torproject/metrics/stats/advbwdist/Main.java | 49 ++++++++++++--- .../metrics/stats/advbwdist/MainTest.java | 72 ++++++++++++++++++++++ 3 files changed, 112 insertions(+), 10 deletions(-) diff --git a/build.xml b/build.xml index 3614d78..b498ea8 100644 --- a/build.xml +++ b/build.xml @@ -60,6 +60,7 @@ <patternset refid="common" /> <include name="metrics-lib-${metricslibversion}.jar"/> <include name="commons-compress-1.13.jar"/> + <include name="commons-math3-3.6.1.jar"/> <include name="postgresql-9.4.1212.jar"/> <include name="servlet-api-3.1.jar"/> <include name="xz-1.6.jar"/> diff --git a/src/main/java/org/torproject/metrics/stats/advbwdist/Main.java b/src/main/java/org/torproject/metrics/stats/advbwdist/Main.java index a16e7b0..7216581 100644 --- a/src/main/java/org/torproject/metrics/stats/advbwdist/Main.java +++ b/src/main/java/org/torproject/metrics/stats/advbwdist/Main.java @@ -10,6 +10,8 @@ import org.torproject.descriptor.NetworkStatusEntry; import org.torproject.descriptor.RelayNetworkStatusConsensus; import org.torproject.descriptor.ServerDescriptor; +import org.apache.commons.math3.stat.descriptive.rank.Percentile; + import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; @@ -20,7 +22,9 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.SortedMap; import java.util.TimeZone; +import java.util.TreeMap; public class Main { @@ -115,29 +119,54 @@ public class Main { } /* Write advertised bandwidth percentiles of relays/exits. */ - Collections.sort(advertisedBandwidthsAllRelays); - Collections.sort(advertisedBandwidthsExitsOnly); int[] percentiles = new int[] { 0, 1, 2, 3, 5, 9, 10, 20, 25, 30, 40, 50, 60, 70, 75, 80, 90, 91, 95, 97, 98, 99, 100 }; if (!advertisedBandwidthsAllRelays.isEmpty()) { - for (int percentile : percentiles) { + for (Map.Entry<Integer, Long> e : computePercentiles( + advertisedBandwidthsAllRelays, percentiles).entrySet()) { bw.write(String.format("%s,,,%d,%d%n", validAfter, - percentile, advertisedBandwidthsAllRelays.get( - ((advertisedBandwidthsAllRelays.size() - 1) - * percentile) / 100))); + e.getKey(), e.getValue())); } } if (!advertisedBandwidthsExitsOnly.isEmpty()) { - for (int percentile : percentiles) { + for (Map.Entry<Integer, Long> e : computePercentiles( + advertisedBandwidthsExitsOnly, percentiles).entrySet()) { bw.write(String.format("%s,TRUE,,%d,%d%n", validAfter, - percentile, advertisedBandwidthsExitsOnly.get( - ((advertisedBandwidthsExitsOnly.size() - 1) - * percentile) / 100))); + e.getKey(), e.getValue())); } } } descriptorReader.saveHistoryFile(historyFile); bw.close(); } + + /** Compute percentiles (between 0 and 100) for the given list of values, and + * return a map with percentiles as keys and computed values as values. If the + * list of values is empty, the returned map contains all zeros. */ + static SortedMap<Integer, Long> computePercentiles( + List<Long> valueList, int ... percentiles) { + SortedMap<Integer, Long> computedPercentiles = new TreeMap<>(); + double[] valueArray = new double[valueList.size()]; + long minValue = Long.MAX_VALUE; + for (int i = 0; i < valueList.size(); i++) { + valueArray[i] = valueList.get(i).doubleValue(); + minValue = Math.min(minValue, valueList.get(i)); + } + if (valueList.isEmpty()) { + minValue = 0L; + } + Percentile percentile = new Percentile() + .withEstimationType(Percentile.EstimationType.R_7); + percentile.setData(valueArray); + for (int p : percentiles) { + if (0 == p) { + computedPercentiles.put(p, minValue); + } else { + computedPercentiles.put(p, + (long) Math.floor(percentile.evaluate((double) p))); + } + } + return computedPercentiles; + } } diff --git a/src/test/java/org/torproject/metrics/stats/advbwdist/MainTest.java b/src/test/java/org/torproject/metrics/stats/advbwdist/MainTest.java new file mode 100644 index 0000000..92752ef --- /dev/null +++ b/src/test/java/org/torproject/metrics/stats/advbwdist/MainTest.java @@ -0,0 +1,72 @@ +/* Copyright 2018 The Tor Project + * See LICENSE for licensing information */ + +package org.torproject.metrics.stats.advbwdist; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; + +import java.util.ArrayList; +import java.util.List; +import java.util.SortedMap; + +public class MainTest { + + @Test + public void testComputePercentilesZeroValues() { + List<Long> valueList = new ArrayList<>(); + SortedMap<Integer, Long> computedPercentiles = Main.computePercentiles( + valueList, 0, 25, 50, 75, 100); + assertEquals(0L, (long) computedPercentiles.get(0)); + assertEquals(0L, (long) computedPercentiles.get(25)); + assertEquals(0L, (long) computedPercentiles.get(50)); + assertEquals(0L, (long) computedPercentiles.get(75)); + assertEquals(0L, (long) computedPercentiles.get(100)); + } + + @Test + public void testComputePercentilesTenValues() { + List<Long> valueList = new ArrayList<>(); + valueList.add(3L); + valueList.add(6L); + valueList.add(7L); + valueList.add(8L); + valueList.add(8L); + valueList.add(10L); + valueList.add(13L); + valueList.add(15L); + valueList.add(16L); + valueList.add(20L); + SortedMap<Integer, Long> computedPercentiles = Main.computePercentiles( + valueList, 0, 25, 50, 75, 100); + assertEquals(3L, (long) computedPercentiles.get(0)); + assertEquals(7L, (long) computedPercentiles.get(25)); + assertEquals(9L, (long) computedPercentiles.get(50)); + assertEquals(14L, (long) computedPercentiles.get(75)); + assertEquals(20L, (long) computedPercentiles.get(100)); + } + + @Test + public void testComputePercentilesElevenValues() { + List<Long> valueList = new ArrayList<>(); + valueList.add(3L); + valueList.add(6L); + valueList.add(7L); + valueList.add(8L); + valueList.add(8L); + valueList.add(9L); + valueList.add(10L); + valueList.add(13L); + valueList.add(15L); + valueList.add(16L); + valueList.add(20L); + SortedMap<Integer, Long> computedPercentiles = Main.computePercentiles( + valueList, 0, 25, 50, 75, 100); + assertEquals(3L, (long) computedPercentiles.get(0)); + assertEquals(7L, (long) computedPercentiles.get(25)); + assertEquals(9L, (long) computedPercentiles.get(50)); + assertEquals(14L, (long) computedPercentiles.get(75)); + assertEquals(20L, (long) computedPercentiles.get(100)); + } +}

1 0

[metrics-web/master] Compute percentiles in clients module using linear interpolation.
by karsten＠torproject.org 25 Oct '18

25 Oct '18

commit 95d091a87c3ebff8a35a57967b4e144898e2e1a5 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat May 19 21:02:28 2018 +0200 Compute percentiles in clients module using linear interpolation. So far we computed percentiles in the censorship detector of the clients module using our own formula that picked existing values as median or quartiles. Now we're using numpy.percentile which, by default, uses linear interpolation when the desired quantile lies between two data points. We're also removing unused imports of pylab and matplotlib in this commit, which is not directly related. Implements part of #26035. --- src/main/python/clients/detector.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/main/python/clients/detector.py b/src/main/python/clients/detector.py index 9944710..b0a98af 100644 --- a/src/main/python/clients/detector.py +++ b/src/main/python/clients/detector.py @@ -37,13 +37,9 @@ ## This script reads a .csv file of the number of Tor users and finds ## anomalies that might be indicative of censorship. -# Dep: matplotlib -from pylab import * -import matplotlib - # Dep: numpy import numpy -from numpy import mean, std +from numpy import mean, std, percentile # Dep: scipy import scipy.stats @@ -190,9 +186,9 @@ def make_tendencies_minmax(l, INTERVAL = 1): maxx += [None] else: vals.sort() - median = vals[len(vals)/2] - q1 = vals[len(vals)/4] - q2 = vals[(3*len(vals))/4] + median = percentile(vals, 50) + q1 = percentile(vals, 25) + q2 = percentile(vals, 75) qd = q2 - q1 vals = [v for v in vals if median - qd*4 < v and v < median + qd*4] if len(vals) < 8:

1 0

[onionoo/master] renamed all getter methods that return [Bb]oolean to follow isXY() pattern
by karsten＠torproject.org 25 Oct '18

25 Oct '18

commit e4b1c696d61c0026054a1595a6fc19b917019eda Author: tordinge <tordinge(a)aprivatesub.net> Date: Fri Oct 12 19:45:12 2018 -0400 renamed all getter methods that return [Bb]oolean to follow isXY() pattern --- CHANGELOG.md | 2 ++ .../java/org/torproject/metrics/onionoo/docs/DetailsDocument.java | 8 ++++---- .../java/org/torproject/metrics/onionoo/docs/DetailsStatus.java | 6 +++--- src/main/java/org/torproject/metrics/onionoo/docs/NodeStatus.java | 2 +- .../java/org/torproject/metrics/onionoo/docs/SummaryDocument.java | 2 +- .../java/org/torproject/metrics/onionoo/server/NodeIndexer.java | 4 ++-- .../org/torproject/metrics/onionoo/server/ResponseBuilder.java | 8 ++++---- .../metrics/onionoo/updater/NodeDetailsStatusUpdater.java | 4 ++-- .../torproject/metrics/onionoo/writer/DetailsDocumentWriter.java | 8 ++++---- .../torproject/metrics/onionoo/writer/SummaryDocumentWriter.java | 2 +- 10 files changed, 24 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b013d9e..c7fc775 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ * Minor changes - Rename root package org.torproject.onionoo to org.torproject.metrics.onionoo. + - Rename all [Bb]oolean field getter methods to follow isXY() + pattern. # Changes in version 7.0-1.18.1 - 2018-09-11 diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/DetailsDocument.java b/src/main/java/org/torproject/metrics/onionoo/docs/DetailsDocument.java index 003ba07..3e2b8a6 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/DetailsDocument.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/DetailsDocument.java @@ -128,7 +128,7 @@ public class DetailsDocument extends Document { this.running = running; } - public Boolean getRunning() { + public Boolean isRunning() { return this.running; } @@ -527,7 +527,7 @@ public class DetailsDocument extends Document { this.recommendedVersion = recommendedVersion; } - public Boolean getRecommendedVersion() { + public Boolean isRecommendedVersion() { return this.recommendedVersion; } @@ -537,7 +537,7 @@ public class DetailsDocument extends Document { this.hibernating = hibernating; } - public Boolean getHibernating() { + public Boolean isHibernating() { return this.hibernating; } @@ -558,7 +558,7 @@ public class DetailsDocument extends Document { this.measured = measured; } - public Boolean getMeasured() { + public Boolean isMeasured() { return this.measured; } diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/DetailsStatus.java b/src/main/java/org/torproject/metrics/onionoo/docs/DetailsStatus.java index 6b93db9..b6dd8be 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/DetailsStatus.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/DetailsStatus.java @@ -171,7 +171,7 @@ public class DetailsStatus extends Document { this.hibernating = hibernating; } - public Boolean getHibernating() { + public Boolean isHibernating() { return this.hibernating; } @@ -369,7 +369,7 @@ public class DetailsStatus extends Document { this.recommendedVersion = recommendedVersion; } - public Boolean getRecommendedVersion() { + public Boolean isRecommendedVersion() { return this.recommendedVersion; } @@ -379,7 +379,7 @@ public class DetailsStatus extends Document { this.measured = measured; } - public Boolean getMeasured() { + public Boolean isMeasured() { return this.measured; } diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/NodeStatus.java b/src/main/java/org/torproject/metrics/onionoo/docs/NodeStatus.java index 4c8dc68..826db9e 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/NodeStatus.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/NodeStatus.java @@ -367,7 +367,7 @@ public class NodeStatus extends Document { this.recommendedVersion = recommendedVersion; } - public Boolean getRecommendedVersion() { + public Boolean isRecommendedVersion() { return this.recommendedVersion; } diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/SummaryDocument.java b/src/main/java/org/torproject/metrics/onionoo/docs/SummaryDocument.java index d5dba7c..dc7230b 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/SummaryDocument.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/SummaryDocument.java @@ -360,7 +360,7 @@ public class SummaryDocument extends Document { this.recommendedVersion = recommendedVersion; } - public Boolean getRecommendedVersion() { + public Boolean isRecommendedVersion() { return this.recommendedVersion; } diff --git a/src/main/java/org/torproject/metrics/onionoo/server/NodeIndexer.java b/src/main/java/org/torproject/metrics/onionoo/server/NodeIndexer.java index a5128e1..33cabb6 100644 --- a/src/main/java/org/torproject/metrics/onionoo/server/NodeIndexer.java +++ b/src/main/java/org/torproject/metrics/onionoo/server/NodeIndexer.java @@ -293,7 +293,7 @@ public class NodeIndexer implements ServletContextListener, Runnable { newRelaysByHostName.get(hostNameLowerCase).add(fingerprint); newRelaysByHostName.get(hostNameLowerCase).add(hashedFingerprint); } - Boolean recommendedVersion = entry.getRecommendedVersion(); + Boolean recommendedVersion = entry.isRecommendedVersion(); if (null != recommendedVersion) { newRelaysByRecommendedVersion.get(recommendedVersion).add(fingerprint); newRelaysByRecommendedVersion.get(recommendedVersion).add( @@ -362,7 +362,7 @@ public class NodeIndexer implements ServletContextListener, Runnable { newBridgesByOperatingSystem.get(operatingSystem) .add(hashedHashedFingerprint); } - Boolean recommendedVersion = entry.getRecommendedVersion(); + Boolean recommendedVersion = entry.isRecommendedVersion(); if (null != recommendedVersion) { newBridgesByRecommendedVersion.get(recommendedVersion).add( hashedFingerprint); diff --git a/src/main/java/org/torproject/metrics/onionoo/server/ResponseBuilder.java b/src/main/java/org/torproject/metrics/onionoo/server/ResponseBuilder.java index fafa20b..7d4dcde 100644 --- a/src/main/java/org/torproject/metrics/onionoo/server/ResponseBuilder.java +++ b/src/main/java/org/torproject/metrics/onionoo/server/ResponseBuilder.java @@ -273,7 +273,7 @@ public class ResponseBuilder { dd.setFirstSeen(detailsDocument.getFirstSeen()); break; case "running": - dd.setRunning(detailsDocument.getRunning()); + dd.setRunning(detailsDocument.isRunning()); break; case "flags": dd.setFlags(detailsDocument.getFlags()); @@ -362,10 +362,10 @@ public class ResponseBuilder { break; case "recommended_version": dd.setRecommendedVersion( - detailsDocument.getRecommendedVersion()); + detailsDocument.isRecommendedVersion()); break; case "hibernating": - dd.setHibernating(detailsDocument.getHibernating()); + dd.setHibernating(detailsDocument.isHibernating()); break; case "transports": dd.setTransports(detailsDocument.getTransports()); @@ -374,7 +374,7 @@ public class ResponseBuilder { dd.setEffectiveFamily(detailsDocument.getEffectiveFamily()); break; case "measured": - dd.setMeasured(detailsDocument.getMeasured()); + dd.setMeasured(detailsDocument.isMeasured()); break; case "alleged_family": dd.setAllegedFamily(detailsDocument.getAllegedFamily()); diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java b/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java index e5a3f48..2bdf03f 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java @@ -489,7 +489,7 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, updatedNodeStatus.setAsNumber(nodeStatus.getAsNumber()); updatedNodeStatus.setAsName(nodeStatus.getAsName()); updatedNodeStatus.setRecommendedVersion( - nodeStatus.getRecommendedVersion()); + nodeStatus.isRecommendedVersion()); updatedNodeStatus.setVersion(nodeStatus.getVersion()); } if (nodeStatus.getFirstSeenMillis() @@ -935,7 +935,7 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, detailsStatus.setDefaultPolicy(nodeStatus.getDefaultPolicy()); detailsStatus.setPortList(nodeStatus.getPortList()); detailsStatus.setRecommendedVersion( - nodeStatus.getRecommendedVersion()); + nodeStatus.isRecommendedVersion()); detailsStatus.setLastChangedOrAddressOrPort( nodeStatus.getLastChangedOrAddressOrPort()); detailsStatus.setVersion(nodeStatus.getVersion()); diff --git a/src/main/java/org/torproject/metrics/onionoo/writer/DetailsDocumentWriter.java b/src/main/java/org/torproject/metrics/onionoo/writer/DetailsDocumentWriter.java index 0be2b21..a497cfd 100644 --- a/src/main/java/org/torproject/metrics/onionoo/writer/DetailsDocumentWriter.java +++ b/src/main/java/org/torproject/metrics/onionoo/writer/DetailsDocumentWriter.java @@ -89,7 +89,7 @@ public class DetailsDocumentWriter implements DocumentWriter { detailsDocument.setExitPolicySummary(exitPolicySummary); } detailsDocument.setRecommendedVersion( - detailsStatus.getRecommendedVersion()); + detailsStatus.isRecommendedVersion()); detailsDocument.setCountry(detailsStatus.getCountryCode()); detailsDocument.setLatitude(detailsStatus.getLatitude()); detailsDocument.setLongitude(detailsStatus.getLongitude()); @@ -135,13 +135,13 @@ public class DetailsDocumentWriter implements DocumentWriter { } detailsDocument.setExitPolicyV6Summary( detailsStatus.getExitPolicyV6Summary()); - detailsDocument.setHibernating(detailsStatus.getHibernating()); + detailsDocument.setHibernating(detailsStatus.isHibernating()); if (detailsStatus.getExitAddresses() != null) { List<String> exitAddresses = new ArrayList<>(new TreeSet<>( detailsStatus.getExitAddresses().keySet())); detailsDocument.setExitAddresses(exitAddresses); } - detailsDocument.setMeasured(detailsStatus.getMeasured()); + detailsDocument.setMeasured(detailsStatus.isMeasured()); List<String> unreachableOrAddresses = new ArrayList<>(); if (null != detailsStatus.getAdvertisedOrAddresses()) { unreachableOrAddresses.addAll(detailsStatus.getAdvertisedOrAddresses()); @@ -178,7 +178,7 @@ public class DetailsDocumentWriter implements DocumentWriter { detailsDocument.setRunning(detailsStatus.isRunning()); detailsDocument.setFlags(detailsStatus.getRelayFlags()); detailsDocument.setRecommendedVersion( - detailsStatus.getRecommendedVersion()); + detailsStatus.isRecommendedVersion()); detailsDocument.setLastRestarted(detailsStatus.getLastRestarted()); detailsDocument.setAdvertisedBandwidth( detailsStatus.getAdvertisedBandwidth()); diff --git a/src/main/java/org/torproject/metrics/onionoo/writer/SummaryDocumentWriter.java b/src/main/java/org/torproject/metrics/onionoo/writer/SummaryDocumentWriter.java index 4b20ba8..0103c31 100644 --- a/src/main/java/org/torproject/metrics/onionoo/writer/SummaryDocumentWriter.java +++ b/src/main/java/org/torproject/metrics/onionoo/writer/SummaryDocumentWriter.java @@ -97,7 +97,7 @@ public class SummaryDocumentWriter implements DocumentWriter { SortedSet<String> verifiedHostNames = nodeStatus.getVerifiedHostNames(); SortedSet<String> unverifiedHostNames = nodeStatus.getUnverifiedHostNames(); - Boolean recommendedVersion = nodeStatus.getRecommendedVersion(); + Boolean recommendedVersion = nodeStatus.isRecommendedVersion(); SummaryDocument summaryDocument = new SummaryDocument(isRelay, nickname, fingerprint, addresses, lastSeenMillis, running, relayFlags, consensusWeight, countryCode, firstSeenMillis,

1 0

[metrics-web/master] Handle days without any successful measurements.
by karsten＠torproject.org 25 Oct '18

25 Oct '18

commit 0408b73e647a0207f6b6db486d46f1c9993323b6 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Oct 22 09:42:41 2018 +0200 Handle days without any successful measurements. In the past, there have been days without a single OnionPerf successful measurement to onion services. Despite the fact that we seriously need better monitoring, we also need to treat these results correctly. So far, we'd have computed median and quartile values of 0.0 seconds for these cases, which is just wrong. We need to treat these days as missing values when it comes to medians or quartiles. That's what we're fixing here. Fixes #28136. --- src/main/sql/onionperf/init-onionperf.sql | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/sql/onionperf/init-onionperf.sql b/src/main/sql/onionperf/init-onionperf.sql index fad6bef..49eff4a 100644 --- a/src/main/sql/onionperf/init-onionperf.sql +++ b/src/main/sql/onionperf/init-onionperf.sql @@ -58,9 +58,9 @@ SELECT date, filesize, source, server, - q[1] AS q1, - q[2] AS md, - q[3] AS q3, + CASE WHEN q IS NULL THEN NULL ELSE q[1] END AS q1, + CASE WHEN q IS NULL THEN NULL ELSE q[2] END AS md, + CASE WHEN q IS NULL THEN NULL ELSE q[3] END AS q3, timeouts, failures, requests @@ -70,7 +70,9 @@ SELECT DATE(start) AS date, source, CASE WHEN endpointremote LIKE '%.onion%' THEN 'onion' ELSE 'public' END AS server, - PERCENTILE_CONT(ARRAY[0.25,0.5,0.75]) WITHIN GROUP(ORDER BY datacomplete) AS q, + CASE WHEN COUNT(*) > 0 THEN + PERCENTILE_CONT(ARRAY[0.25,0.5,0.75]) WITHIN GROUP(ORDER BY datacomplete) + ELSE NULL END AS q, COUNT(CASE WHEN didtimeout OR datacomplete < 1 THEN 1 ELSE NULL END) AS timeouts, COUNT(CASE WHEN NOT didtimeout AND datacomplete >= 1 @@ -85,7 +87,9 @@ SELECT DATE(start) AS date, '' AS source, CASE WHEN endpointremote LIKE '%.onion%' THEN 'onion' ELSE 'public' END AS server, - PERCENTILE_CONT(ARRAY[0.25,0.5,0.75]) WITHIN GROUP(ORDER BY datacomplete) AS q, + CASE WHEN COUNT(*) > 0 THEN + PERCENTILE_CONT(ARRAY[0.25,0.5,0.75]) WITHIN GROUP(ORDER BY datacomplete) + ELSE NULL END AS q, COUNT(CASE WHEN didtimeout OR datacomplete < 1 THEN 1 ELSE NULL END) AS timeouts, COUNT(CASE WHEN NOT didtimeout AND datacomplete >= 1

1 0

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 25 Oct '18

25 Oct '18

commit aeb85f2aa3973be278e8dee6484a6d6c60c21e48 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 25 01:45:25 2018 +0000 Update translations for donatepages-messagespot --- locale/zh_CN/LC_MESSAGES/messages.po | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po index b6d319e39..51090219f 100644 --- a/locale/zh_CN/LC_MESSAGES/messages.po +++ b/locale/zh_CN/LC_MESSAGES/messages.po @@ -822,10 +822,13 @@ msgid "" "href=\"https://www.torproject.org/docs/faq.html.en\">This Tor Project " "FAQ</a> has answers to all those questions, and more." msgstr "" +"<a class=\"hyperlinks links\" target=\"_blank\" " +"href=\"https://www.torproject.org/docs/faq.html.en\">这个 Tor Project 的FAQ</a>" +" 就回答了所有这些提问，还说了更多。" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:163 msgid "Does the Tor software work?" -msgstr "" +msgstr "Tor 能起作用吗？" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:167 msgid "" @@ -833,12 +836,14 @@ msgid "" "does a better job of keeping you safely anonymous than other options such as" " VPNs, proxychains, or browser \"private browsing\" modes." msgstr "" +"我们相信 Tor 是当今最好且可用的解决方案，我们也知道它比其它方法比如 VPNs, proxychains, " +"或浏览器的“隐私模式”都更好地让你匿名地上网。" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:169 msgid "" "We know that both the Russian government and the NSA have tried in the past " "to crack Tor, and failed." -msgstr "" +msgstr "我们知道俄罗斯政府和美国国家安全局都尝试过攻克 Tor，但都失败了。" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:171 msgid "" @@ -849,6 +854,9 @@ msgid "" "book Data and Goliath, security expert Bruce Schneier wrote \"The current " "best tool to protect your anonymity when browsing the web is Tor.\"" msgstr "" +"电子前哨基金会说 Tor 提供了 <a class=\"hyperlinks links\" target=\"_blank\" " +"href=\"https://www.eff.org/deeplinks/2014/07/7-things-you-should-know-about-" +"tor\">现今最强悍的匿名软件之一</a>。安全专家 Bruce Schneier也在他的书《数据和" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:177 msgid "Is what Tor does legal? Can I get in trouble for using it?"

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 25 Oct '18

25 Oct '18

commit dc3fcbb5dca94861e25fd7729a0ae9cfba60d33c Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 25 00:19:08 2018 +0000 Update translations for tor-launcher-network-settings --- hr/network-settings.dtd | 70 ++++++++++++++++++++++++------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/hr/network-settings.dtd b/hr/network-settings.dtd index 35f514483..6783163ae 100644 --- a/hr/network-settings.dtd +++ b/hr/network-settings.dtd @@ -1,60 +1,60 @@ <!ENTITY torsettings.dialog.title "Postavke Tor mreže"> <!ENTITY torsettings.wizard.title.default "Spoji se na Tor"> <!ENTITY torsettings.wizard.title.configure "Postavke Tor mreže"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.wizard.title.connecting "Uspostavljanje veze">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "Jezik Tor preglednika"> +<!ENTITY torlauncher.localePicker.prompt "Odaberite jezik">  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> -<!ENTITY torSettings.configure "Konfiguriraj"> +<!ENTITY torSettings.connectPrompt "Za povezivanje s Tor-om kliknite "Poveži se""> +<!ENTITY torSettings.configurePrompt "Ako ste u zemlji koja cenzurira Tor (kao Egipat, Kina, Turska) ili ste spojeni preko privatne mreže za koju je potrebno proxy, kliknite "Podesi" kako biste promijenili postavke mreže."> +<!ENTITY torSettings.configure "Podesi"> <!ENTITY torSettings.connect "Poveži se">  -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restartTor "Restart Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.startingTor "Čekanje na pokretanje Tor-a…"> +<!ENTITY torsettings.restartTor "Ponovno pokreni Tor"> +<!ENTITY torsettings.reconfigTor "Ponovno podesi"> <!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.proceed "Obriši postavke i poveži se"> -<!ENTITY torsettings.optional "Optional"> +<!ENTITY torsettings.optional "Neobavezno"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> +<!ENTITY torsettings.useProxy.checkbox "Koristim proxy za spajanje na internet"> +<!ENTITY torsettings.useProxy.type "Tip proxy-a:"> +<!ENTITY torsettings.useProxy.type.placeholder "odaberite tip proxy-a"> <!ENTITY torsettings.useProxy.address "Adresa:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Priključak:"> +<!ENTITY torsettings.useProxy.address.placeholder "IP adresa ili poslužitelj"> +<!ENTITY torsettings.useProxy.port "Port:"> <!ENTITY torsettings.useProxy.username "Korisničko ime:"> <!ENTITY torsettings.useProxy.password "Lozinka:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> -<!ENTITY torsettings.useBridges.captchaSubmit "Unesi"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> -<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> - -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> - -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> -<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings."> - -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> +<!ENTITY torsettings.firewall.checkbox "Ovo raučunalo ide kroz vatrozid koji dozvoljava veze samo preko pojedinih portova."> +<!ENTITY torsettings.firewall.allowedPorts "Dopušteni portovi:"> +<!ENTITY torsettings.useBridges.checkbox "Tor je cenzuriran u mojoj zemlji"> +<!ENTITY torsettings.useBridges.default "Odaberite ugrađeni most"> +<!ENTITY torsettings.useBridges.default.placeholder "odaberite most"> +<!ENTITY torsettings.useBridges.bridgeDB "Zatražite most od torproject.org"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Unesite znakove sa slike"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Dobijte novi izazov"> +<!ENTITY torsettings.useBridges.captchaSubmit "Pošalji"> +<!ENTITY torsettings.useBridges.custom "Pružaj mi most koji poznajem"> +<!ENTITY torsettings.useBridges.label "Unesite informacije o mostu sa pouzdanog izvora."> +<!ENTITY torsettings.useBridges.placeholder "tip adresa:port (jedna po retku)"> + +<!ENTITY torsettings.copyLog "Kopiraj Tor zapisnik u međuspremnik"> + +<!ENTITY torsettings.proxyHelpTitle "Pomoć s proxy-em"> +<!ENTITY torsettings.proxyHelp1 "Ako se povezujete kroz mrežu tvrtke, škole ili sveučilišta moguće je da će vam trebati lokalni proxy. Ako niste sigurni treba li vam proxy, pregledajte postavke interneta u drugom pregledniku ili provjerite postavke mreže Vašeg sistema."> + +<!ENTITY torsettings.bridgeHelpTitle "Pomoć s mostovima"> <!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> <!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">

1 0

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

25 Oct '18

commit 9f318843fae58ecde8a44d4b174e70c33edfee23 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 25 00:18:58 2018 +0000 Update translations for tor-launcher-properties --- hr/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hr/torlauncher.properties b/hr/torlauncher.properties index 835dd1ff2..142408358 100644 --- a/hr/torlauncher.properties +++ b/hr/torlauncher.properties @@ -42,7 +42,7 @@ torlauncher.no_meek=This browser is not configured for meek, which is needed to torlauncher.no_bridges_available=No bridges are available at this time. Sorry. torlauncher.connect=Poveži se -torlauncher.restart_tor=Restart Tor +torlauncher.restart_tor=Ponovno pokreni Tor torlauncher.quit=Izlaz torlauncher.quit_win=Izlaz torlauncher.done=Gotovo

1 0