May 2020 - tor-commits - lists.torproject.org

[metrics-web/master] Include partials in download performance graphs.
by karsten＠torproject.org 25 May '20

25 May '20

commit 110cb010bd29b24902b62273b96566bf086da270 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun May 24 08:43:10 2020 +0200 Include partials in download performance graphs. As part of #34023, we're going to give up on making 50 KiB and 1 MiB downloads in the near future. In order to continue plotting time to download these file sizes we're including partial downloads of larger file sizes. Implements #30611. --- src/main/R/rserver/rserve-init.R | 8 ++- .../torproject/metrics/stats/onionperf/Main.java | 47 +++++++++++++++++- src/main/resources/web/json/metrics.json | 3 +- .../resources/web/jsps/reproducible-metrics.jsp | 5 +- src/main/resources/web/jsps/stats.jsp | 9 ++-- src/main/sql/onionperf/init-onionperf.sql | 57 ++++++++++++++++++++++ 6 files changed, 115 insertions(+), 14 deletions(-) diff --git a/src/main/R/rserver/rserve-init.R b/src/main/R/rserver/rserve-init.R index e1074ee..3ad89ce 100644 --- a/src/main/R/rserver/rserve-init.R +++ b/src/main/R/rserver/rserve-init.R @@ -567,7 +567,8 @@ plot_relayflags <- function(start_p, end_p, flag_p, path_p) { prepare_torperf <- function(start_p = NULL, end_p = NULL, server_p = NULL, filesize_p = NULL) { - read_csv(file = paste(stats_dir, "torperf-1.1.csv", sep = ""), + read_csv(file = paste(stats_dir, "onionperf-including-partials.csv", + sep = ""), col_types = cols( date = col_date(format = ""), filesize = col_double(), @@ -575,10 +576,7 @@ prepare_torperf <- function(start_p = NULL, end_p = NULL, server_p = NULL, server = col_character(), q1 = col_double(), md = col_double(), - q3 = col_double(), - timeouts = col_skip(), - failures = col_skip(), - requests = col_skip())) %>% + q3 = col_double())) %>% filter(if (!is.null(start_p)) date >= as.Date(start_p) else TRUE) %>% filter(if (!is.null(end_p)) date <= as.Date(end_p) else TRUE) %>% filter(if (!is.null(server_p)) server == server_p else TRUE) %>% diff --git a/src/main/java/org/torproject/metrics/stats/onionperf/Main.java b/src/main/java/org/torproject/metrics/stats/onionperf/Main.java index 56a689b..02fa08b 100644 --- a/src/main/java/org/torproject/metrics/stats/onionperf/Main.java +++ b/src/main/java/org/torproject/metrics/stats/onionperf/Main.java @@ -46,6 +46,9 @@ public class Main { logger.info("Starting onionperf module."); Connection connection = connectToDatabase(); importOnionPerfFiles(connection); + writeStatistics( + new File(baseDir, "stats/onionperf-including-partials.csv").toPath(), + queryOnionperfIncludingPartials(connection)); writeStatistics(new File(baseDir, "stats/torperf-1.1.csv").toPath(), queryOnionPerf(connection)); writeStatistics(new File(baseDir, "stats/buildtimes.csv").toPath(), @@ -83,7 +86,10 @@ public class Main { + "dataperc60, dataperc70, dataperc80, dataperc90, dataperc100, " + "launch, used_at, timeout, quantile, circ_id, used_by, " + "endpointlocal, endpointproxy, endpointremote, hostnamelocal, " - + "hostnameremote, sourceaddress) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, " + + "hostnameremote, sourceaddress, partial10240, partial20480, " + + "partial51200, partial102400, partial204800, partial512000, " + + "partial1048576, partial2097152, partial5242880) " + + "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, " + "?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, " + "?, ?, ?, ?, ?, ?)", Statement.RETURN_GENERATED_KEYS); @@ -195,6 +201,18 @@ public class Main { truncateString(onionPerfStrings[j], 64)); } } + int[] partialBytes = new int[] { 10240, 20480, 51200, 102400, 204800, + 512000, 1048576, 2097152, 5242880 }; + for (int i = 38, j = 0; j < partialBytes.length; i++, j++) { + if (null == tr.getPartials() + || !tr.getPartials().containsKey(partialBytes[j])) { + psMeasurementsInsert.setNull(i, Types.INTEGER); + } else { + psMeasurementsInsert.setInt(i, + (int) (tr.getPartials().get(partialBytes[j]) + - tr.getStartMillis())); + } + } psMeasurementsInsert.execute(); try (ResultSet rs = psMeasurementsInsert.getGeneratedKeys()) { if (rs.next()) { @@ -238,9 +256,34 @@ public class Main { return originalString; } + static List<String> queryOnionperfIncludingPartials(Connection connection) + throws SQLException { + logger.info("Querying statistics including partials from database."); + List<String> statistics = new ArrayList<>(); + statistics + .add("date,filesize,source,server,q1,md,q3"); + Statement st = connection.createStatement(); + String queryString = "SELECT date, filesize, source, server, q1, md, q3 " + + " FROM onionperf_including_partials"; + DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + try (ResultSet rs = st.executeQuery(queryString)) { + while (rs.next()) { + statistics.add(String.format("%s,%d,%s,%s,%.0f,%.0f,%.0f", + dateFormat.format(rs.getDate("date")), + rs.getInt("filesize"), + getStringFromResultSet(rs, "source"), + getStringFromResultSet(rs, "server"), + getDoubleFromResultSet(rs, "q1"), + getDoubleFromResultSet(rs, "md"), + getDoubleFromResultSet(rs, "q3"))); + } + } + return statistics; + } + static List<String> queryOnionPerf(Connection connection) throws SQLException { - logger.info("Querying statistics from database."); + logger.info("Querying timeout and failure statistics from database."); List<String> statistics = new ArrayList<>(); statistics .add("date,filesize,source,server,q1,md,q3,timeouts,failures,requests"); diff --git a/src/main/resources/web/json/metrics.json b/src/main/resources/web/json/metrics.json index 5d4a6c7..f2b36a5 100644 --- a/src/main/resources/web/json/metrics.json +++ b/src/main/resources/web/json/metrics.json @@ -274,8 +274,7 @@ "id": "torperf", "title": "Time to download files over Tor", "type": "Graph", - "description": "This graph shows overall performance when downloading static files of different sizes over Tor, either from a server on the public internet or from an onion server. The graph shows the range of measurements from first to third quartile, and highlights the median. The slowest and fastest quarter of measurements are omitted from the graph.", - "function": "torperf", + "description": "This graph shows overall performance when downloading static files of different sizes over Tor, either from a server on the public internet or from an onion server. Download times include complete downloads of the shown file size as well as partial downloads of larger file sizes. The graph shows the range of measurements from first to third quartile, and highlights the median. The slowest and fastest quarter of measurements are omitted from the graph.", "function": "torperf", "parameters": [ "start", "end", diff --git a/src/main/resources/web/jsps/reproducible-metrics.jsp b/src/main/resources/web/jsps/reproducible-metrics.jsp index 922e458..0cdd873 100644 --- a/src/main/resources/web/jsps/reproducible-metrics.jsp +++ b/src/main/resources/web/jsps/reproducible-metrics.jsp @@ -694,6 +694,7 @@ Here we explain how we evaluate Torperf/OnionPerf measurement to obtain the same <li><code>DATACOMPLETE</code>: Download end time that is only set if the request succeeded.</li> <li><code>READBYTES</code>: Total number of bytes read, which indicates whether this request succeeded (if ≥ <code>FILESIZE</code>) or failed.</li> <li><code>DIDTIMEOUT</code>: 1 if the request timed out, 0 otherwise.</li> +<li><code>PARTIAL51200</code> and <code>PARTIAL1048576</code>: Time when 51200 or 1048576 bytes were read.</li> <li><code>DATAPERCx</code>: Time when x% of expected bytes were read for x = { 10, 20, 50, 100 }.</li> <li><code>BUILDTIMES</code>: Comma-separated list of times when circuit hops were built, which includes all circuits used for making measurement requests, successful or not.</li> <li><code>ENDPOINTREMOTE</code>: Hostname, IP address, and port that was used to connect to the remote server; we use this to distinguish a request to a public server (if <code>ENDPOINTREMOTE</code> is not present or does not contain <code>".onion"</code> as substring) or to an onion server.</li> @@ -703,7 +704,9 @@ Here we explain how we evaluate Torperf/OnionPerf measurement to obtain the same Each of the measurement results parsed in the previous step constitutes a single measurement. We're first interested in statistics on download times for the <a href="/torperf.html">Time to download files over Tor</a> graph. -Therefore we consider only measurements with <code>DATACOMPLETE > START</code>, for which we calculate the download time as: <code>DATACOMPLETE - START</code>. +Therefore we consider complete downloads as well as partial downloads. +For complete downloads we calculate the download time as <code>DATACOMPLETE - START</code> for measurements with <code>DATACOMPLETE > START</code>. +For partial downloads of larger file sizes we calculate the download time as <code>PARTIAL51200 - START</code> for measurements with <code>PARTIAL51200 > START</code> and <code>FILESIZE > 51200</code>; and <code>PARTIAL1048576 - START</code> for measurements with <code>PARTIAL1048576 > START</code> and <code>FILESIZE > 1048576</code>. We then compute the 25th, 50th, and 75th percentile of download times by sorting download times, determining the percentile rank, and using linear interpolation between adjacent ranks. Next we're interested in the average throughput of measurements for the <a href="/onionperf-throughput.html">Throughput</a> graph. diff --git a/src/main/resources/web/jsps/stats.jsp b/src/main/resources/web/jsps/stats.jsp index 5abbee0..ad6c566 100644 --- a/src/main/resources/web/jsps/stats.jsp +++ b/src/main/resources/web/jsps/stats.jsp @@ -56,6 +56,7 @@ https://metrics.torproject.org/identifier.csv <li>October 2, 2019: Added <a href="#webstats-tb-channel">Tor Browser updates by release channel</a> graph.</li> <li>December 18, 2019: Added <a href="#bridgedb-transport">BridgeDB requests by requested transport</a> and <a href="#bridgedb-distributor">BridgeDB requests by distributor</a> graphs.</li> <li>May 24, 2020: Included version 3 onion service measurements in <a href="#torperf">Time to download files over Tor</a>, <a href="#torperf-failures">Timeouts and failures of downloading files over Tor</a>, <a href="#onionperf-buildtimes">Circuit build times</a>, <a href="#onionperf-latencies">Circuit round-trip latencies</a> graphs.</li> +<li>May 24, 2020: Included partial downloads of larger file sizes in <a href="#torperf">Time to download files over Tor</a> graph.</li> </ul> </div> @@ -549,7 +550,7 @@ Performance <a href="#performance" name="performance" class="anchor">#</a></h2> <li>start: First UTC date (YYYY-MM-DD) to include in the file.</li> <li>end: Last UTC date (YYYY-MM-DD) to include in the file.</li> <li>server: Either "public" for requests to a server on the public internet, or "onion" for requests to an onion server.</li> -<li>filesize: Size of the downloaded file in bytes, with pre-defined possible values: "50kb", "1mb", or "5mb".</li> +<li>filesize: Size of the completely or partially downloaded file in bytes, with pre-defined possible values: "50kb", "1mb", or "5mb".</li> </ul> <h4>Columns</h4> @@ -559,9 +560,9 @@ Performance <a href="#performance" name="performance" class="anchor">#</a></h2> <li>filesize: Size of the downloaded file in bytes.</li> <li>source: Name of the OnionPerf or Torperf service performing measurements.</li> <li>server: Either "public" if the request was made to a server on the public internet, or "onion" if the request was made to an onion server.</li> -<li>q1: First quartile of time in milliseconds until receiving the last byte.</li> -<li>md: Median of time in milliseconds until receiving the last byte.</li> -<li>q3: Third quartile of time in milliseconds until receiving the last byte.</li> +<li>q1: First quartile of time in milliseconds until receiving the number of bytes in filesize.</li> +<li>md: Median of time in milliseconds until receiving the number of bytes in filesize.</li> +<li>q3: Third quartile of time in milliseconds until receiving the number of bytes in filesize.</li> </ul> <h3>Timeouts and failures of downloading files over Tor diff --git a/src/main/sql/onionperf/init-onionperf.sql b/src/main/sql/onionperf/init-onionperf.sql index b6b226b..ebe9f77 100644 --- a/src/main/sql/onionperf/init-onionperf.sql +++ b/src/main/sql/onionperf/init-onionperf.sql @@ -17,6 +17,15 @@ CREATE TABLE IF NOT EXISTS measurements ( writebytes INTEGER, readbytes INTEGER, didtimeout BOOLEAN, + partial10240 INTEGER, + partial20480 INTEGER, + partial51200 INTEGER, + partial102400 INTEGER, + partial204800 INTEGER, + partial512000 INTEGER, + partial1048576 INTEGER, + partial2097152 INTEGER, + partial5242880 INTEGER, dataperc0 INTEGER, dataperc10 INTEGER, dataperc20 INTEGER, @@ -53,6 +62,54 @@ CREATE TABLE IF NOT EXISTS buildtimes ( CREATE TYPE server AS ENUM ('public', 'onion'); +CREATE OR REPLACE VIEW onionperf_including_partials AS +WITH measurements_including_partials AS ( + SELECT start, + filesize, + source, + endpointremote, + datacomplete + FROM measurements + UNION + SELECT start, + 51200 AS filesize, + source, + endpointremote, + partial51200 AS datacomplete + FROM measurements + WHERE filesize > 51200 + AND partial51200 IS NOT NULL + UNION + SELECT start, + 1048576 AS filesize, + source, + endpointremote, + partial1048576 AS datacomplete + FROM measurements + WHERE filesize > 1048576 + AND partial1048576 IS NOT NULL +), grouped AS ( + SELECT DATE(start) AS date, + filesize, + source, + CASE WHEN endpointremote LIKE '%.onion:%' THEN 'onion' + ELSE 'public' END AS server, + CASE WHEN COUNT(*) > 0 THEN + PERCENTILE_CONT(ARRAY[0.25,0.5,0.75]) WITHIN GROUP(ORDER BY datacomplete) + ELSE NULL END AS q + FROM measurements_including_partials + GROUP BY date, filesize, source, server +) +SELECT date, + filesize, + source, + server, + CASE WHEN q IS NULL THEN NULL ELSE TRUNC(q[1]) END AS q1, + CASE WHEN q IS NULL THEN NULL ELSE TRUNC(q[2]) END AS md, + CASE WHEN q IS NULL THEN NULL ELSE TRUNC(q[3]) END AS q3 +FROM grouped +ORDER BY date, filesize, source, server; + CREATE OR REPLACE VIEW onionperf AS SELECT date, filesize,

1 0

[metrics-web/master] Include v3 onion OnionPerf measurements.
by karsten＠torproject.org 25 May '20

25 May '20

commit 575741e33edcdd6085628b1c56140c84f49cc196 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri May 22 15:30:45 2020 +0200 Include v3 onion OnionPerf measurements. In commit 7af8f10 we started ignoring v3 onion OnionPerf measurements, because including a third option in addition to "public" and "onion" would have required writing more code. However, an analysis in #33434 revealed that v3 onion measurements are basically no different than v2 onion measurements. As a result we're turning off v2 onion measurements and combining v2 and v3 onion measurements in existing graphs. Implements #34032. --- src/main/resources/web/json/metrics.json | 8 ++++---- src/main/resources/web/jsps/stats.jsp | 17 +++++++++-------- src/main/sql/onionperf/init-onionperf.sql | 4 ---- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/src/main/resources/web/json/metrics.json b/src/main/resources/web/json/metrics.json index 6dd7e94..5d4a6c7 100644 --- a/src/main/resources/web/json/metrics.json +++ b/src/main/resources/web/json/metrics.json @@ -274,7 +274,7 @@ "id": "torperf", "title": "Time to download files over Tor", "type": "Graph", - "description": "This graph shows overall performance when downloading static files of different sizes over Tor, either from a server on the public internet or from a version 2 onion server. The graph shows the range of measurements from first to third quartile, and highlights the median. The slowest and fastest quarter of measurements are omitted from the graph.", + "description": "This graph shows overall performance when downloading static files of different sizes over Tor, either from a server on the public internet or from an onion server. The graph shows the range of measurements from first to third quartile, and highlights the median. The slowest and fastest quarter of measurements are omitted from the graph.", "function": "torperf", "parameters": [ "start", @@ -287,7 +287,7 @@ "id": "torperf-failures", "title": "Timeouts and failures of downloading files over Tor", "type": "Graph", - "description": "This graph shows the fraction of timeouts and failures when downloading static files of different sizes over Tor, either from a server on the public internet or from a version 2 onion server. A timeout occurs when a download does not complete within the scheduled time, in which case it is aborted in order not to overlap with the next scheduled download. A failure occurs when the download completes, but the response is smaller than expected.", + "description": "This graph shows the fraction of timeouts and failures when downloading static files of different sizes over Tor, either from a server on the public internet or from an onion server. A timeout occurs when a download does not complete within the scheduled time, in which case it is aborted in order not to overlap with the next scheduled download. A failure occurs when the download completes, but the response is smaller than expected.", "function": "torperf_failures", "parameters": [ "start", @@ -311,7 +311,7 @@ "id": "onionperf-latencies", "title": "Circuit round-trip latencies", "type": "Graph", - "description": "This graph shows round-trip latencies of circuits used for downloading static files of different sizes over Tor, either from a server on the public internet or from a version 2 onion server. Round-trip latencies are measured as the time between sending the HTTP request and receiving the HTTP response header. The graph shows the median of measurements as thick line, the range of measurements from first to third quartile as ribbon, and the highest and lowest non-outlier measurements as thin lines.", + "description": "This graph shows round-trip latencies of circuits used for downloading static files of different sizes over Tor, either from a server on the public internet or from an onion server. Round-trip latencies are measured as the time between sending the HTTP request and receiving the HTTP response header. The graph shows the median of measurements as thick line, the range of measurements from first to third quartile as ribbon, and the highest and lowest non-outlier measurements as thin lines.", "function": "onionperf_latencies", "parameters": [ "start", @@ -323,7 +323,7 @@ "id": "onionperf-throughput", "title": "Throughput", "type": "Graph", - "description": "This graph shows throughput when downloading static files of different sizes over Tor, either from a server on the public internet or from a version 2 onion server. Throughput is calculated from the time between receiving 0.5 and 1 MiB of the response. The graph shows the median of measurements as thick line, the range of measurements from first to third quartile as ribbon, and the highest and lowest non-outlier measurements as thin lines.", + "description": "This graph shows throughput when downloading static files of different sizes over Tor, either from a server on the public internet or from an onion server. Throughput is calculated from the time between receiving 0.5 and 1 MiB of the response. The graph shows the median of measurements as thick line, the range of measurements from first to third quartile as ribbon, and the highest and lowest non-outlier measurements as thin lines.", "function": "onionperf_throughput", "parameters": [ "start", diff --git a/src/main/resources/web/jsps/stats.jsp b/src/main/resources/web/jsps/stats.jsp index 886ec89..5abbee0 100644 --- a/src/main/resources/web/jsps/stats.jsp +++ b/src/main/resources/web/jsps/stats.jsp @@ -55,6 +55,7 @@ https://metrics.torproject.org/identifier.csv <li>August 5, 2019: Re-added the <a href="#bandwidth">Total relay bandwidth</a> graph due to popular demand.</li> <li>October 2, 2019: Added <a href="#webstats-tb-channel">Tor Browser updates by release channel</a> graph.</li> <li>December 18, 2019: Added <a href="#bridgedb-transport">BridgeDB requests by requested transport</a> and <a href="#bridgedb-distributor">BridgeDB requests by distributor</a> graphs.</li> +<li>May 24, 2020: Included version 3 onion service measurements in <a href="#torperf">Time to download files over Tor</a>, <a href="#torperf-failures">Timeouts and failures of downloading files over Tor</a>, <a href="#onionperf-buildtimes">Circuit build times</a>, <a href="#onionperf-latencies">Circuit round-trip latencies</a> graphs.</li> </ul> </div> @@ -547,7 +548,7 @@ Performance <a href="#performance" name="performance" class="anchor">#</a></h2> <ul> <li>start: First UTC date (YYYY-MM-DD) to include in the file.</li> <li>end: Last UTC date (YYYY-MM-DD) to include in the file.</li> -<li>server: Either "public" for requests to a server on the public internet, or "onion" for requests to a version 2 onion server.</li> +<li>server: Either "public" for requests to a server on the public internet, or "onion" for requests to an onion server.</li> <li>filesize: Size of the downloaded file in bytes, with pre-defined possible values: "50kb", "1mb", or "5mb".</li> </ul> @@ -557,7 +558,7 @@ Performance <a href="#performance" name="performance" class="anchor">#</a></h2> <li>date: UTC date (YYYY-MM-DD) when download performance was measured.</li> <li>filesize: Size of the downloaded file in bytes.</li> <li>source: Name of the OnionPerf or Torperf service performing measurements.</li> -<li>server: Either "public" if the request was made to a server on the public internet, or "onion" if the request was made to a version 2 onion server.</li> +<li>server: Either "public" if the request was made to a server on the public internet, or "onion" if the request was made to an onion server.</li> <li>q1: First quartile of time in milliseconds until receiving the last byte.</li> <li>md: Median of time in milliseconds until receiving the last byte.</li> <li>q3: Third quartile of time in milliseconds until receiving the last byte.</li> @@ -573,7 +574,7 @@ Performance <a href="#performance" name="performance" class="anchor">#</a></h2> <ul> <li>start: First UTC date (YYYY-MM-DD) to include in the file.</li> <li>end: Last UTC date (YYYY-MM-DD) to include in the file.</li> -<li>server: Either "public" for requests to a server on the public internet, or "onion" for requests to a version 2 onion server.</li> +<li>server: Either "public" for requests to a server on the public internet, or "onion" for requests to an onion server.</li> <li>filesize: Size of the downloaded file in bytes, with pre-defined possible values: "50kb", "1mb", or "5mb".</li> </ul> @@ -583,7 +584,7 @@ Performance <a href="#performance" name="performance" class="anchor">#</a></h2> <li>date: UTC date (YYYY-MM-DD) when download performance was measured.</li> <li>filesize: Size of the downloaded file in bytes.</li> <li>source: Name of the OnionPerf or Torperf service performing measurements.</li> -<li>server: Either "public" if the request was made to a server on the public internet, or "onion" if the request was made to a version 2 onion server.</li> +<li>server: Either "public" if the request was made to a server on the public internet, or "onion" if the request was made to an onion server.</li> <li>timeouts: Fraction of requests that timed out when attempting to download the static file over Tor.</li> <li>failures: Fraction of requests that failed when attempting to download the static file over Tor.</li> </ul> @@ -621,7 +622,7 @@ Performance <a href="#performance" name="performance" class="anchor">#</a></h2> <ul> <li>start: First UTC date (YYYY-MM-DD) to include in the file.</li> <li>end: Last UTC date (YYYY-MM-DD) to include in the file.</li> -<li>server: Either "public" for requests to a server on the public internet, or "onion" for requests to a version 2 onion server.</li> +<li>server: Either "public" for requests to a server on the public internet, or "onion" for requests to an onion server.</li> </ul> <h4>Columns</h4> @@ -629,7 +630,7 @@ Performance <a href="#performance" name="performance" class="anchor">#</a></h2> <ul> <li>date: UTC date (YYYY-MM-DD) when download performance was measured.</li> <li>source: Name of the OnionPerf or Torperf service performing measurements.</li> -<li>server: Either "public" if the request was made to a server on the public internet, or "onion" if the request was made to a version 2 onion server.</li> +<li>server: Either "public" if the request was made to a server on the public internet, or "onion" if the request was made to an onion server.</li> <li>low: Lowest time in milliseconds between sending the HTTP request and receiving the HTTP response header within 1.5 IQR of lower quartile (lower whisker in a boxplot).</li> <li>q1: First quartile of time in milliseconds between sending the HTTP request and receiving the HTTP response header.</li> <li>md: Median of time in milliseconds between sending the HTTP request and receiving the HTTP response header.</li> @@ -647,7 +648,7 @@ Performance <a href="#performance" name="performance" class="anchor">#</a></h2> <ul> <li>start: First UTC date (YYYY-MM-DD) to include in the file.</li> <li>end: Last UTC date (YYYY-MM-DD) to include in the file.</li> -<li>server: Either "public" for requests to a server on the public internet, or "onion" for requests to a version 2 onion server.</li> +<li>server: Either "public" for requests to a server on the public internet, or "onion" for requests to an onion server.</li> </ul> <h4>Columns</h4> @@ -655,7 +656,7 @@ Performance <a href="#performance" name="performance" class="anchor">#</a></h2> <ul> <li>date: UTC date (YYYY-MM-DD) when download performance was measured.</li> <li>source: Name of the OnionPerf or Torperf service performing measurements.</li> -<li>server: Either "public" if the request was made to a server on the public internet, or "onion" if the request was made to a version 2 onion server.</li> +<li>server: Either "public" if the request was made to a server on the public internet, or "onion" if the request was made to an onion server.</li> <li>low: Lowest measured throughput in kilobits per second within 1.5 IQR of lower quartile (lower whisker in a boxplot).</li> <li>q1: First quartile of measured throughput in kilobits per second.</li> <li>md: Median of measured throughput in kilobits per second.</li> diff --git a/src/main/sql/onionperf/init-onionperf.sql b/src/main/sql/onionperf/init-onionperf.sql index 42fc4a2..b6b226b 100644 --- a/src/main/sql/onionperf/init-onionperf.sql +++ b/src/main/sql/onionperf/init-onionperf.sql @@ -80,7 +80,6 @@ SELECT DATE(start) AS date, COUNT(*) AS requests FROM measurements WHERE DATE(start) < current_date - 1 -AND (endpointremote IS NULL OR endpointremote NOT SIMILAR TO '_{56}.onion%') GROUP BY date, filesize, source, server UNION SELECT DATE(start) AS date, @@ -98,7 +97,6 @@ SELECT DATE(start) AS date, COUNT(*) AS requests FROM measurements WHERE DATE(start) < current_date - 1 -AND (endpointremote IS NULL OR endpointremote NOT SIMILAR TO '_{56}.onion%') GROUP BY date, filesize, 3, server) sub ORDER BY date, filesize, source, server; @@ -140,7 +138,6 @@ WITH filtered_measurements AS ( WHERE DATE(start) < current_date - 1 AND datarequest > 0 AND dataresponse > 0 - AND (endpointremote IS NULL OR endpointremote NOT SIMILAR TO '_{56}.onion%') ), quartiles AS ( SELECT date, source, @@ -185,7 +182,6 @@ WITH filtered_measurements AS ( ELSE NULL END AS kbps FROM measurements WHERE DATE(start) < current_date - 1 - AND (endpointremote IS NULL OR endpointremote NOT SIMILAR TO '_{56}.onion%') ), quartiles AS ( SELECT date, source,

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 24 May '20

24 May '20

commit c29b72755a0d00da68780d22e5f97cb82250f799 Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 24 19:45:21 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+nb-NO.po | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/contents+nb-NO.po b/contents+nb-NO.po index ce95756078..80093d385a 100644 --- a/contents+nb-NO.po +++ b/contents+nb-NO.po @@ -131,6 +131,8 @@ msgstr "Opplæring" msgid "" "Do you teach your community about using Tor? These resources are for you." msgstr "" +"Lærer du ditt samfunn om hvordan bruke Tor? Disse opplæringsressursene er " +"for deg." #: https//community.torproject.org/training/ #: (content/training/contents+en.lrpage.cta) @@ -140,7 +142,7 @@ msgstr "Sjekk våre ressurser" #: https//community.torproject.org/training/ #: (content/training/contents+en.lrpage.body) msgid "## We want to teach the world about Tor. Can you help?" -msgstr "" +msgstr "## Vi vil lære verden om Tor. Kan du hjelpe?" #: https//community.torproject.org/training/ #: (content/training/contents+en.lrpage.body) @@ -348,6 +350,7 @@ msgstr "" msgid "" "* What external TCP port do you want to use for incoming Tor connections?" msgstr "" +"* Hvilken ekstern TCP port ønsker du å bruke for innkommende Tor-koblinger? " #: https//community.torproject.org/relay/setup/ #: (content/relay-operations/technical-setup/contents+en.lrpage.body) @@ -366,7 +369,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/ #: (content/relay-operations/technical-setup/contents+en.lrpage.body) msgid "Port 9001 is another commonly used ORPort.)" -msgstr "" +msgstr "Port 9001 er en annen ofte brukt ORPort.)" #: https//community.torproject.org/relay/setup/ #: (content/relay-operations/technical-setup/contents+en.lrpage.body)

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 24 May '20

24 May '20

commit 826f0d51b580f195eb10bc5b25de3a9c8bb62b77 Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 24 13:45:23 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+de.po | 56 +++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 49 insertions(+), 7 deletions(-) diff --git a/contents+de.po b/contents+de.po index 9b32455c1f..ad835c3d5a 100644 --- a/contents+de.po +++ b/contents+de.po @@ -10695,11 +10695,16 @@ msgid "" "files ending in the \".sample\" extension are ignored; pkg(8) only reads " "files that end in \".conf\" and it will read as many as it finds." msgstr "" +"Bei Neuinstallationen wird die Datei `/usr/local/etc/pkg/repos/df-" +"latest.conf.sample` nach `/usr/local/etc/pkg/repos/df-latest` kopiert. Die " +"Dateien, die mit der Endung \".sample\" enden, werden ignoriert; pkg(8) " +"liest nur Dateien, die mit \".conf\" enden, und es liest so viele, wie es " +"findet." #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) msgid "**DragonflyBSD** has 2 packages repositories:" -msgstr "" +msgstr "**DragonflyBSD** hat 2 Paket-Repositories:" #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) @@ -10722,6 +10727,9 @@ msgid "" "`/usr/local/etc/pkg/repos/df-latest` and that's it! Remember to use " "**pkg+https://** for Avalon." msgstr "" +"Wir können einfach die **URL**, die verwendet wird, um auf die Repositories " +"auf `/usr/local/etc/pkg/repos/df-latest` zu verweisen, bearbeiten, und das " +"war's! Denk dran, **pkg+https://** für Avalon zu verwenden." #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) @@ -10733,6 +10741,9 @@ msgid "" "After applying all these changes, we update the packages list again and try " "to check if there's already a new update to apply:" msgstr "" +"Nach Anwendung all dieser Änderungen aktualisieren wir die Paketliste erneut" +" und versuchen zu prüfen, ob bereits eine neue Aktualisierung anzuwenden " +"ist:" #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) @@ -10765,6 +10776,8 @@ msgstr "### 2. Installiere `tor` und `obfs4proxy` DragonflyBSD's Paket" #: (content/relay-operations/technical-setup/guard/freebsd/contents+en.lrpage.body) msgid "Here we can choose to install the latest stable version, like:" msgstr "" +"Hier können wir wählen, ob wir die neueste stabile Version installieren " +"wollen, wie z.B:" #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) @@ -10778,7 +10791,7 @@ msgstr "pkg install tor obfs4proxy-tor" #: https//community.torproject.org/relay/setup/guard/freebsd/ #: (content/relay-operations/technical-setup/guard/freebsd/contents+en.lrpage.body) msgid "... or install an alpha release:" -msgstr "" +msgstr "... oder installiere eine Alpha-Version:" #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) @@ -10789,6 +10802,8 @@ msgstr "pkg install tor-devel obfs4proxy-tor" #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) msgid "### 3. Configure `/usr/local/etc/tor/torrc` to run **Tor** as a Bridge" msgstr "" +"### 3. Konfiguriere `/usr/local/etc/tor/torrc` zur Ausführung von **Tor** " +"als Brücke" #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) @@ -10819,6 +10834,9 @@ msgid "" "can talk to `tor` over the loopback interface - do not forget to whitelist " "the **ExtORPort**." msgstr "" +"* Setzt du eine Firewall für dein DragonflyBSD ein? Wenn ja, stelle sicher, " +"dass `obfs4proxy` über die Loopback-Schnittstelle mit `tor` sprechen kann - " +"vergiss nicht, den **ExtORPort** auf die Whitelist zu setzen." #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) @@ -10836,6 +10854,9 @@ msgid "" " to bind to lower ports like 443 (the daemon itself will still run as a " "regular non-privileged user)." msgstr "" +"Hier stellen wir `tor` so ein, dass es beim Booten startet und die setuid-" +"Funktion nutzt, um sich an niedrigere Anschlüsse wie 443 zu binden (der " +"Dienst selbst läuft weiterhin als normaler, nicht privilegierter Benutzer)." #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) @@ -10872,6 +10893,8 @@ msgid "" "To confirm your bridge is running with no issues, you should see something " "like this in `/var/log/tor/notices.log`:" msgstr "" +"Um zu bestätigen, dass deine Brücke ohne Probleme läuft, solltest du in " +"`/var/log/tor/notices.log` etwas wie das hier sehen:" #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) @@ -10881,7 +10904,7 @@ msgstr "tail /var/log/tor/notices.log" #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) msgid "### 6. Final Notes" -msgstr "" +msgstr "### 6. Schlussbemerkungen" #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.title) @@ -10891,17 +10914,17 @@ msgstr "Docker" #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.subtitle) msgid "How to deploy an obfs4 bridge using a docker container" -msgstr "" +msgstr "Wie wird eine obfs4-Brücke mit einem Docker-Container eingesetzt?" #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) msgid "### 1. Pull the image" -msgstr "" +msgstr "### 1. Zieh dir das Image runter" #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) msgid "We are maintaining a docker image that runs an obfs4 bridge." -msgstr "" +msgstr "Wir pflegen das Image eines Dockers, der eine obfs4-Brücke betreibt." #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) @@ -10922,6 +10945,8 @@ msgstr "### 2. Stelle den Container bereit" #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) msgid "We provide a Makefile that helps you deploy the container." msgstr "" +"Wir stellen ein Makefile zur Verfügung, das dir bei der Bereitstellung des " +"Containers hilft." #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) @@ -10930,6 +10955,9 @@ msgid "" "censorship/docker-obfs4-bridge/raw/master/Makefile), and then write your " "bridge configuration to a new file, bridge.sh." msgstr "" +"Zuerst [lade das Makefile herunter] (https://dip.torproject.org/torproject" +"/anti-censorship/docker-obfs4-bridge/raw/master/Makefile), und schreibe dann" +" deine Brücken-Konfiguration in eine neue Datei, bridge.sh." #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) @@ -10974,12 +11002,19 @@ msgid "" " address, which allows us to get in touch with you if there are problems " "with your bridge." msgstr "" +"Ersetze `X` durch deinen gewünschten OR-Anschluss, `Y` durch deinen " +"obfs4-Anschluss (stelle sicher, dass **beide** Anschlüsse in deiner Firewall" +" weitergeleitet werden), und `Z` durch deine E-Mail Adresse, die es uns " +"erlaubt, mit dir in Kontakt zu treten, falls es Probleme mit deiner Bridge " +"gibt." #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) msgid "" "With your bridge configuration in place, you can now deploy the container:" msgstr "" +"Wenn deine Brücken-Konfiguration eingerichtet ist, kannst du den Container " +"jetzt bereitstellen:" #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) @@ -10989,7 +11024,7 @@ msgstr "source bridge.sh && make deploy" #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) msgid "You should now see output similar to the following:" -msgstr "" +msgstr "Du solltest nun eine Ausgabe ähnlich der folgenden sehen:" #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) @@ -11000,6 +11035,8 @@ msgstr "201fbd2b4d28e6f226978f27547edd79272871c5949bf8aab3872c983156a108" #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) msgid "Make sure that port X and Y are forwarded in your firewall." msgstr "" +"Stelle sicher, dass Anschluss X und Y in deiner Firewall weitergeleitet " +"werden." #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) @@ -11007,6 +11044,8 @@ msgid "" "That's it! Your container (identified by the first line of output) is now " "bootstrapping your new obfs4 bridge." msgstr "" +"Das war's! Dein Container (identifiziert durch die erste Ausgabe-Zeile) " +"bootet jetzt deine neue obfs4-Brücke." #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) @@ -11015,6 +11054,9 @@ msgid "" " bridge configuration files with different sets of ports, and run `make " "deploy` again, like so:" msgstr "" +"Wenn du mehrere Brücken auf deiner Maschine laufen lassen möchtest, musst du" +" mehr Brücken-Konfigurations-Dateien mit unterschiedlichen Anschluss-Gruppen" +" erstellen und erneut `make deploy` ausführen, so wie hier beschrieben:" #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 24 May '20

24 May '20

commit cdb60bee8d12a52262d40139c34e820a3d81b913 Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 24 13:15:23 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+de.po | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/contents+de.po b/contents+de.po index aa945e938e..9b32455c1f 100644 --- a/contents+de.po +++ b/contents+de.po @@ -10653,7 +10653,7 @@ msgstr "pkg-static install -y pkg" #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) msgid "##### 1.1. Recommended Steps to Setup `pkg`" -msgstr "" +msgstr "##### 1.1. Empfohlene Schritte zur Einrichtung von `pkg`" #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) @@ -10662,6 +10662,10 @@ msgid "" " going to use HTTPS to fetch our packages, and updates - so here we also " "need an extra package to help us out (`ca_root_nss`)." msgstr "" +"Hier wird es ähnlich wie auf einem **FreeBSD**-System sein, und wir werden " +"HTTPS benutzen, um unsere Pakete und Aktualisierungen zu holen - also " +"brauchen wir auch hier ein zusätzliches Paket, das uns hilft " +"(`ca_root_nss`)." #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body) @@ -10670,7 +10674,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/guard/freebsd/ #: (content/relay-operations/technical-setup/guard/freebsd/contents+en.lrpage.body) msgid "Installing the `ca_root_nss` package:" -msgstr "" +msgstr "Installieren des Pakets `ca_root_nss`:" #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.body)

1 0

[translation/bridgedb_completed] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed
by translation＠torproject.org 24 May '20

24 May '20

commit ebde4fe5ed94c0ace2ec7ea4fbd788369f779b3c Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 24 11:45:19 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed --- pt_PT/LC_MESSAGES/bridgedb.po | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/pt_PT/LC_MESSAGES/bridgedb.po b/pt_PT/LC_MESSAGES/bridgedb.po index 4771addbea..1fd0798c71 100644 --- a/pt_PT/LC_MESSAGES/bridgedb.po +++ b/pt_PT/LC_MESSAGES/bridgedb.po @@ -4,7 +4,8 @@ # # Translators: # A Russo <quisquiliarum2001-habitica(a)yahoo.co.uk>, 2019 -# Hugo9191 <hugoncosta(a)gmail.com>, 2019-2020 +# Hugo Costa <hugoncosta(a)gmail.com>, 2020 +# Hugo Costa <hugoncosta(a)gmail.com>, 2019-2020 # Manuela Silva <manuelarodsilva(a)gmail.com>, 2019-2020 # Manuela Silva <manuelarodsilva(a)gmail.com>, 2018 # Manuela Silva <manuelarodsilva(a)gmail.com>, 2019 @@ -14,14 +15,14 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" -"POT-Creation-Date: 2020-04-09 14:45-0700\n" -"PO-Revision-Date: 2020-05-01 10:56+0000\n" -"Last-Translator: Hugo9191 <hugoncosta(a)gmail.com>\n" +"POT-Creation-Date: 2020-05-14 14:21-0700\n" +"PO-Revision-Date: 2020-05-24 11:43+0000\n" +"Last-Translator: Hugo Costa <hugoncosta(a)gmail.com>\n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/otf/torproject/language/pt_PT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.7.0\n" +"Generated-By: Babel 2.8.0\n" "Language: pt_PT\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -85,31 +86,26 @@ msgstr "Mostrar Código QR" msgid "QRCode for your bridge lines" msgstr "Código QR para as suas linhas de ponte" -#. TRANSLATORS: Please translate this into some silly way to say -#. "There was a problem!" in your language. For example, -#. for Italian, you might translate this into "Mama mia!", -#. or for French: "Sacrebleu!". :) -#: bridgedb/distributors/https/templates/bridges.html:67 -#: bridgedb/distributors/https/templates/bridges.html:119 -msgid "Uh oh, spaghettios!" -msgstr "Ocorreu um erro!" - -#: bridgedb/distributors/https/templates/bridges.html:68 +#: bridgedb/distributors/https/templates/bridges.html:63 msgid "It seems there was an error getting your QRCode." msgstr "Parece que ocorreu um erro ao obter o seu Código QR." -#: bridgedb/distributors/https/templates/bridges.html:73 +#: bridgedb/distributors/https/templates/bridges.html:68 msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." msgstr "Este Código QR contém as suas linhas de ponte. Digitalize-as com um leitor de Código QR para copiar as suas linhas de ponte para os dispositivos móveis e outros dispositivos." -#: bridgedb/distributors/https/templates/bridges.html:125 +#: bridgedb/distributors/https/templates/bridges.html:110 +msgid "BridgeDB encountered an error." +msgstr "" + +#: bridgedb/distributors/https/templates/bridges.html:116 msgid "There currently aren't any bridges available..." msgstr "Atualmente, não existem pontes disponíveis..." -#: bridgedb/distributors/https/templates/bridges.html:127 -#: bridgedb/distributors/https/templates/bridges.html:131 +#: bridgedb/distributors/https/templates/bridges.html:118 +#: bridgedb/distributors/https/templates/bridges.html:122 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge "

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 24 May '20

24 May '20

commit f6cf1c4f035fe1c4b0c1e184147adebf5e0fff1c Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 24 11:45:12 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- pt_PT/LC_MESSAGES/bridgedb.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pt_PT/LC_MESSAGES/bridgedb.po b/pt_PT/LC_MESSAGES/bridgedb.po index b760cc5775..7490108d00 100644 --- a/pt_PT/LC_MESSAGES/bridgedb.po +++ b/pt_PT/LC_MESSAGES/bridgedb.po @@ -4,7 +4,8 @@ # # Translators: # A Russo <quisquiliarum2001-habitica(a)yahoo.co.uk>, 2019 -# Hugo9191 <hugoncosta(a)gmail.com>, 2019-2020 +# Hugo Costa <hugoncosta(a)gmail.com>, 2020 +# Hugo Costa <hugoncosta(a)gmail.com>, 2019-2020 # Manuela Silva <manuelarodsilva(a)gmail.com>, 2019-2020 # Manuela Silva <manuelarodsilva(a)gmail.com>, 2018 # Manuela Silva <manuelarodsilva(a)gmail.com>, 2019 @@ -15,8 +16,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-05-14 14:21-0700\n" -"PO-Revision-Date: 2020-05-15 08:24+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2020-05-24 11:43+0000\n" +"Last-Translator: Hugo Costa <hugoncosta(a)gmail.com>\n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/otf/torproject/language/pt_PT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -97,7 +98,7 @@ msgstr "Este Código QR contém as suas linhas de ponte. Digitalize-as com um le #: bridgedb/distributors/https/templates/bridges.html:110 msgid "BridgeDB encountered an error." -msgstr "" +msgstr "A BridgeDB encontrou um erro." #: bridgedb/distributors/https/templates/bridges.html:116 msgid "There currently aren't any bridges available..."

1 0

[translation/bridgedb_completed] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed
by translation＠torproject.org 24 May '20

24 May '20

commit ab455c4cad5399a3c83fe519d3dcb5c4d06a8479 Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 24 10:15:17 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed --- da/LC_MESSAGES/bridgedb.po | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/da/LC_MESSAGES/bridgedb.po b/da/LC_MESSAGES/bridgedb.po index 38ec7959dd..70169d82ce 100644 --- a/da/LC_MESSAGES/bridgedb.po +++ b/da/LC_MESSAGES/bridgedb.po @@ -15,14 +15,14 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" -"POT-Creation-Date: 2020-04-09 14:45-0700\n" -"PO-Revision-Date: 2020-05-01 18:32+0000\n" +"POT-Creation-Date: 2020-05-14 14:21-0700\n" +"PO-Revision-Date: 2020-05-24 10:00+0000\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.7.0\n" +"Generated-By: Babel 2.8.0\n" "Language: da\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -86,31 +86,26 @@ msgstr "Vis QR-kode" msgid "QRCode for your bridge lines" msgstr "QR-kode til dine brolinjer" -#. TRANSLATORS: Please translate this into some silly way to say -#. "There was a problem!" in your language. For example, -#. for Italian, you might translate this into "Mama mia!", -#. or for French: "Sacrebleu!". :) -#: bridgedb/distributors/https/templates/bridges.html:67 -#: bridgedb/distributors/https/templates/bridges.html:119 -msgid "Uh oh, spaghettios!" -msgstr "Åh nej, der er gået kludder i det!" - -#: bridgedb/distributors/https/templates/bridges.html:68 +#: bridgedb/distributors/https/templates/bridges.html:63 msgid "It seems there was an error getting your QRCode." msgstr "Der lader til at være opstået en fejl ved hentning af din QR-kode." -#: bridgedb/distributors/https/templates/bridges.html:73 +#: bridgedb/distributors/https/templates/bridges.html:68 msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." msgstr "QR-koden indeholder dine brolinjer. Skan den med en QR-kodelæser for at kopiere dine brolinjer til mobiltelefon og andre enheder." -#: bridgedb/distributors/https/templates/bridges.html:125 +#: bridgedb/distributors/https/templates/bridges.html:110 +msgid "BridgeDB encountered an error." +msgstr "BridgeDB stødte på en fejl." + +#: bridgedb/distributors/https/templates/bridges.html:116 msgid "There currently aren't any bridges available..." msgstr "Der er i øjeblikket ingen tilgængelige broer..." -#: bridgedb/distributors/https/templates/bridges.html:127 -#: bridgedb/distributors/https/templates/bridges.html:131 +#: bridgedb/distributors/https/templates/bridges.html:118 +#: bridgedb/distributors/https/templates/bridges.html:122 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge "

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 24 May '20

24 May '20

commit 03e73e2462434024738e97a28d8835f411185554 Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 24 10:15:12 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- da/LC_MESSAGES/bridgedb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/da/LC_MESSAGES/bridgedb.po b/da/LC_MESSAGES/bridgedb.po index 0f2df21adb..70169d82ce 100644 --- a/da/LC_MESSAGES/bridgedb.po +++ b/da/LC_MESSAGES/bridgedb.po @@ -16,8 +16,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-05-14 14:21-0700\n" -"PO-Revision-Date: 2020-05-15 08:24+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2020-05-24 10:00+0000\n" +"Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -98,7 +98,7 @@ msgstr "QR-koden indeholder dine brolinjer. Skan den med en QR-kodelæser for at #: bridgedb/distributors/https/templates/bridges.html:110 msgid "BridgeDB encountered an error." -msgstr "" +msgstr "BridgeDB stødte på en fejl." #: bridgedb/distributors/https/templates/bridges.html:116 msgid "There currently aren't any bridges available..."

1 0

[gettor/master] Ignore emails from Mail Delivery System
by cohosh＠torproject.org 23 May '20

23 May '20

commit b78bc3ff922ea53d972f994e670dd3c39f97e5d0 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Fri May 22 16:36:36 2020 -0400 Ignore emails from Mail Delivery System This ignores emails with the username "MAILER-DAEMON", a common email for mail delivery systems. The goal of this is to avoid getting into a loop with mail delivery system autoresponders after a bounced email. --- gettor/parse/email.py | 8 +++++++- tests/test_email_service.py | 7 +++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/gettor/parse/email.py b/gettor/parse/email.py index 5a3e45e..d37614d 100644 --- a/gettor/parse/email.py +++ b/gettor/parse/email.py @@ -84,6 +84,11 @@ class EmailParser(object): "Email address normalized and validated.", system="email parser" ) + + # Add a check for auto-generated mail-daemon emails + if "mailer-daemon@" in norm_addr.lower(): + raise AddressError("Received mail from Mail Delivery System {}" + .format(msg['From'])) return True else: @@ -206,7 +211,8 @@ class EmailParser(object): try: self.validate(norm_addr, msg) except AddressError as e: - log.message("Address error: {}".format(e.args)) + log.msg("Address error: {}".format(e.args)) + return {} hid = hashlib.sha256(norm_addr.encode('utf-8')) log.msg( diff --git a/tests/test_email_service.py b/tests/test_email_service.py index 3803e79..a41669f 100644 --- a/tests/test_email_service.py +++ b/tests/test_email_service.py @@ -289,6 +289,13 @@ class EmailServiceTests(unittest.TestCase): ">\n") self.assertEqual(request["command"], "help") + def test_bounce(self): + ep = conftests.EmailParser(self.settings, "gettor(a)torproject.org") + request = ep.parse("From: MAILER-DAEMON(a)mx1.riseup.net\n" + "Subject: Undelivered Mail Returned to Sender\r\n" + "To: gettor(a)torproject.org\n osx en\n") + + self.assertEqual(request, {}) if __name__ == "__main__": unittest.main()

1 0