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

[tor/master] hs-v3: Don't crash after SIGHUP in Onionbalance backend mode.
by dgoulet＠torproject.org 01 Apr '20

01 Apr '20

commit 0667a5af8df8f372f6482254ca24c66268ed02f8 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Mar 30 23:17:39 2020 +0300 hs-v3: Don't crash after SIGHUP in Onionbalance backend mode. The ob_subcreds array was not copied after SIGHUP, and that left the post-SIGHUP service with a NULL ob_subcreds pointer (until the next descriptor gets build where we regenerate ob_subcreds in hs_ob_refresh_keys()). Fixes bug #33762; not in any released tor … [View More]

1 0

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

01 Apr '20

commit 02a52e2670207e6f73cbccc010cc8a643783bc25 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 1 11:15:30 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+es.po | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/contents+es.po b/contents+es.po index 6521f9bc72..4d9de0d790 100644 --- a/contents+es.po +++ b/contents+es.po @@ -7,6 +7,7 @@ # erinm, 2019 # Emma Peel, … [View More]2020 # David Figuera <dfb(a)fastmail.com>, 2020 +# vareli <ehespinosa(a)ya.com>, 2020 # msgid "" msgstr "" @@ -14,7 +15,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-12-11 12:15+CET\n" "PO-Revision-Date: 2019-12-11 10:50+0000\n" -"Last-Translator: David Figuera <dfb(a)fastmail.com>, 2020\n" +"Last-Translator: vareli <ehespinosa(a)ya.com>, 2020\n" "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1374,6 +1375,10 @@ msgid "" "Tor relay community, and can help you connect with dedicated relay operators" " around the world for solidarity and support." msgstr "" +"Convertirte en asociado de Torservers es una buena forma de estar más " +"involucrado con la comunidad de repetidores Tor y puede serte útil para " +"contactar con administradores entregados de repetidores de todo el mundo " +"para apoyo y solidaridad." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1382,6 +1387,9 @@ msgid "" "of people (3-5 suggested to start) interested in helping with the various " "activities required for running relays." msgstr "" +"Para iniciar un socio Torservers, lo mas importantes es tener un grupo de " +"personas (se sugieren 3-5 para empezar) interesadas en ayudar con las " +"diversas actividades que se requieren para ejecutar retransmisiones." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1389,6 +1397,8 @@ msgid "" "There should be mutual trust between the people in the group, and members " "should commit to running relays for the long term." msgstr "" +"Debería haber mutua confianza entre las personas del grupo y los miembros " +"deben comprometerse a ejecutar retransmisiones por mucho tiempo." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1397,6 +1407,9 @@ msgid "" "relays, one place to meet people is [your local " "hackerspace](https://wiki.hackerspaces.org/Hackerspaces)." msgstr "" +"Si usted no sabe de nadie en su red social interesado en ejecutar " +"retransmisiones, un sitio donde encontrar gente es [su hackerspace " +"local](https://wiki.hackerspaces.org/Hackerspaces)." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1404,6 +1417,8 @@ msgid "" "Once you have a trusted group of people, depending on your region, it is " "often advised to create some type of non-profit corporation." msgstr "" +"Una vez que tiene un grupo de gente de confianza, dependiendo de su región, " +"a menudo se recomienda crear algún tipo de corporación sin ánimo de lucro." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) [View Less]

1 0

[metrics-web/master] Set default locale US and default time zone UTC.
by karsten＠torproject.org 01 Apr '20

01 Apr '20

commit 9844bc523c98965f1d626dd8f7f892fef09aabe3 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Apr 1 12:45:37 2020 +0200 Set default locale US and default time zone UTC. Part of these changes have already been made in earlier commits as part of #24532. This commit makes remaining changes as part of #33655. --- src/build | 2 +- src/main/java/org/torproject/metrics/stats/advbwdist/Main.java … [View More] | 3 --- src/main/java/org/torproject/metrics/stats/connbidirect/Main.java | 3 --- src/main/java/org/torproject/metrics/stats/hidserv/DateTimeHelper.java | 2 -- src/main/java/org/torproject/metrics/web/GraphParameterChecker.java | 2 -- src/main/java/org/torproject/metrics/web/GraphServlet.java | 2 -- src/main/java/org/torproject/metrics/web/NewsServlet.java | 3 +-- src/main/java/org/torproject/metrics/web/ServerMain.java | 2 ++ src/main/java/org/torproject/metrics/web/TableParameterChecker.java | 2 -- src/main/java/org/torproject/metrics/web/TableServlet.java | 2 -- src/main/java/org/torproject/metrics/web/UpdateNews.java | 2 ++ 11 files changed, 6 insertions(+), 19 deletions(-) diff --git a/src/build b/src/build index fd85646..b5e1a2d 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit fd856466bcb260f53ef69a24c102d0e49d171cc3 +Subproject commit b5e1a2d7b29e58cc0645f068a1ebf4377bf9d8b8 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 1e6bd0e..cda9da1 100644 --- a/src/main/java/org/torproject/metrics/stats/advbwdist/Main.java +++ b/src/main/java/org/torproject/metrics/stats/advbwdist/Main.java @@ -27,7 +27,6 @@ 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 { @@ -72,7 +71,6 @@ public class Main { } SimpleDateFormat dateTimeFormat = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss"); - dateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); for (Descriptor descriptor : descriptorReader.readDescriptors(new File( org.torproject.metrics.stats.main.Main.descriptorsDir, "recent/relay-descriptors/consensuses"))) { @@ -150,7 +148,6 @@ public class Main { /* Aggregate statistics. */ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); - dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); String today = dateFormat.format(new Date()); SortedMap<String, List<Long>> preAggregatedValues = new TreeMap<>(); try (BufferedReader br = new BufferedReader(new FileReader(resultsFile))) { 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 2abf202..be10239 100644 --- a/src/main/java/org/torproject/metrics/stats/connbidirect/Main.java +++ b/src/main/java/org/torproject/metrics/stats/connbidirect/Main.java @@ -28,7 +28,6 @@ import java.util.List; import java.util.Map; import java.util.SortedMap; import java.util.SortedSet; -import java.util.TimeZone; import java.util.TreeMap; import java.util.TreeSet; @@ -184,7 +183,6 @@ public class Main { + "proceeding. To fix this, you'll have to re-import " + "statistics for the following dates:"); DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); - dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); for (long conflictingDate : conflictingDates) { sb.append("\n ") .append(dateFormat.format(conflictingDate * ONE_DAY_IN_MILLIS)); @@ -436,7 +434,6 @@ public class Main { SortedMap<String, Short> aggregateStats, SortedSet<RawStat> rawStats) { DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); - dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); String yesterday = dateFormat.format(System.currentTimeMillis() - ONE_DAY_IN_MILLIS); SortedMap<String, List<Short>> fractionsByDateAndDirection diff --git a/src/main/java/org/torproject/metrics/stats/hidserv/DateTimeHelper.java b/src/main/java/org/torproject/metrics/stats/hidserv/DateTimeHelper.java index 2fa866f..064d732 100644 --- a/src/main/java/org/torproject/metrics/stats/hidserv/DateTimeHelper.java +++ b/src/main/java/org/torproject/metrics/stats/hidserv/DateTimeHelper.java @@ -8,7 +8,6 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.Map; -import java.util.TimeZone; /** Utility class to format and parse dates and timestamps. */ public class DateTimeHelper { @@ -49,7 +48,6 @@ public class DateTimeHelper { if (!threadDateFormats.containsKey(format)) { DateFormat dateFormat = new SimpleDateFormat(format); dateFormat.setLenient(false); - dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); threadDateFormats.put(format, dateFormat); } return threadDateFormats.get(format); diff --git a/src/main/java/org/torproject/metrics/web/GraphParameterChecker.java b/src/main/java/org/torproject/metrics/web/GraphParameterChecker.java index 236a190..0534684 100644 --- a/src/main/java/org/torproject/metrics/web/GraphParameterChecker.java +++ b/src/main/java/org/torproject/metrics/web/GraphParameterChecker.java @@ -11,7 +11,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.TimeZone; /** * Checks request parameters passed to graph-generating servlets. @@ -45,7 +44,6 @@ public class GraphParameterChecker { */ public GraphParameterChecker() { this.dateFormat = new SimpleDateFormat("yyyy-MM-dd"); - this.dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); this.availableGraphs = new HashMap<>(); for (Metric metric : ContentProvider.getInstance().getMetricsList()) { if ("Graph".equals(metric.getType())) { diff --git a/src/main/java/org/torproject/metrics/web/GraphServlet.java b/src/main/java/org/torproject/metrics/web/GraphServlet.java index 507ae3b..d080f9e 100644 --- a/src/main/java/org/torproject/metrics/web/GraphServlet.java +++ b/src/main/java/org/torproject/metrics/web/GraphServlet.java @@ -13,7 +13,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.TimeZone; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; @@ -145,7 +144,6 @@ public class GraphServlet extends MetricServlet { request.setAttribute("description", this.descriptions.get(requestedId)); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); - dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); Date defaultEndDate = new Date(); Date defaultStartDate = new Date(defaultEndDate.getTime() - 90L * 24L * 60L * 60L * 1000L); diff --git a/src/main/java/org/torproject/metrics/web/NewsServlet.java b/src/main/java/org/torproject/metrics/web/NewsServlet.java index b5dddc1..4a9d313 100644 --- a/src/main/java/org/torproject/metrics/web/NewsServlet.java +++ b/src/main/java/org/torproject/metrics/web/NewsServlet.java @@ -9,7 +9,6 @@ import java.util.Calendar; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.TimeZone; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; @@ -48,7 +47,7 @@ public class NewsServlet extends AnyServlet { HttpServletResponse response) throws IOException, ServletException { /* Create categories based on current system time. */ Map<String, String[]> cutOffDates = new LinkedHashMap<>(); - Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC")); + Calendar cal = Calendar.getInstance(); cal.set(Calendar.DAY_OF_WEEK, 1); cutOffDates.put(String.format("%tF", cal), new String[] { "This week", "week" }); diff --git a/src/main/java/org/torproject/metrics/web/ServerMain.java b/src/main/java/org/torproject/metrics/web/ServerMain.java index 21f8529..263c687 100644 --- a/src/main/java/org/torproject/metrics/web/ServerMain.java +++ b/src/main/java/org/torproject/metrics/web/ServerMain.java @@ -10,6 +10,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.Locale; +import java.util.TimeZone; public class ServerMain { @@ -19,6 +20,7 @@ public class ServerMain { /** Starts the web server listening for incoming client connections. */ public static void main(String[] args) { Locale.setDefault(Locale.US); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); try { Resource jettyXml = Resource.newSystemResource("jetty.xml"); logger.info("Reading configuration from '{}'.", jettyXml); diff --git a/src/main/java/org/torproject/metrics/web/TableParameterChecker.java b/src/main/java/org/torproject/metrics/web/TableParameterChecker.java index 8c3b4fa..4143a2a 100644 --- a/src/main/java/org/torproject/metrics/web/TableParameterChecker.java +++ b/src/main/java/org/torproject/metrics/web/TableParameterChecker.java @@ -10,7 +10,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import java.util.TimeZone; /** * Checks request parameters passed to generate tables. @@ -41,7 +40,6 @@ public class TableParameterChecker { */ public TableParameterChecker() { this.dateFormat = new SimpleDateFormat("yyyy-MM-dd"); - this.dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); this.availableTables = new HashMap<>(); for (Metric metric : ContentProvider.getInstance().getMetricsList()) { diff --git a/src/main/java/org/torproject/metrics/web/TableServlet.java b/src/main/java/org/torproject/metrics/web/TableServlet.java index c3d8d6e..891e803 100644 --- a/src/main/java/org/torproject/metrics/web/TableServlet.java +++ b/src/main/java/org/torproject/metrics/web/TableServlet.java @@ -11,7 +11,6 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; -import java.util.TimeZone; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; @@ -63,7 +62,6 @@ public class TableServlet extends MetricServlet { request.setAttribute("tableheader", this.tableHeaders.get(requestedId)); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); - dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); Date defaultEndDate = new Date(); Date defaultStartDate = new Date(defaultEndDate.getTime() - 90L * 24L * 60L * 60L * 1000L); diff --git a/src/main/java/org/torproject/metrics/web/UpdateNews.java b/src/main/java/org/torproject/metrics/web/UpdateNews.java index 07b1d75..bddb32d 100644 --- a/src/main/java/org/torproject/metrics/web/UpdateNews.java +++ b/src/main/java/org/torproject/metrics/web/UpdateNews.java @@ -15,6 +15,7 @@ import java.net.URL; import java.util.ArrayList; import java.util.List; import java.util.Locale; +import java.util.TimeZone; public class UpdateNews { @@ -24,6 +25,7 @@ public class UpdateNews { /** Update news. */ public static void main(String[] args) throws Exception { Locale.setDefault(Locale.US); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); URL textFile = new URL( "https://trac.torproject.org/projects/tor/wiki/doc/" + "MetricsTimeline?format=txt"); [View Less]

1 0

[onionoo/master] Set default locale US and default time zone UTC.
by karsten＠torproject.org 01 Apr '20

01 Apr '20

commit e18b1cd7bb0cc6a6c6cb29dc00b37daa6a4c3aa2 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Apr 1 12:45:31 2020 +0200 Set default locale US and default time zone UTC. Part of #33655. --- CHANGELOG.md | 2 ++ src/build | 2 +- src/main/java/org/torproject/metrics/onionoo/cron/Main.java | 4 ++++ .../java/org/torproject/metrics/… [View More]onionoo/docs/DateTimeHelper.java | 2 -- src/main/java/org/torproject/metrics/onionoo/docs/WeightsStatus.java | 3 +-- src/main/java/org/torproject/metrics/onionoo/server/NodeIndex.java | 3 --- .../org/torproject/metrics/onionoo/server/PerformanceMetrics.java | 2 -- src/main/java/org/torproject/metrics/onionoo/server/ServerMain.java | 5 +++++ 8 files changed, 13 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f8666fd..4637ad5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ * Minor changes - Simplify logging configuration. + - Set default locale `US` and default time zone `UTC` at the + beginning of the execution. # Changes in version 8.0-1.25.0 - 2020-02-20 diff --git a/src/build b/src/build index fd85646..b5e1a2d 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit fd856466bcb260f53ef69a24c102d0e49d171cc3 +Subproject commit b5e1a2d7b29e58cc0645f068a1ebf4377bf9d8b8 diff --git a/src/main/java/org/torproject/metrics/onionoo/cron/Main.java b/src/main/java/org/torproject/metrics/onionoo/cron/Main.java index 9f3c3c6..9470ca9 100644 --- a/src/main/java/org/torproject/metrics/onionoo/cron/Main.java +++ b/src/main/java/org/torproject/metrics/onionoo/cron/Main.java @@ -15,6 +15,8 @@ import org.slf4j.LoggerFactory; import java.io.File; import java.util.Calendar; +import java.util.Locale; +import java.util.TimeZone; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; @@ -29,6 +31,8 @@ public class Main implements Runnable { /** Executes a single update run or partial update run, or initiates * hourly executions, depending on the given command-line arguments. */ public static void main(String[] args) { + Locale.setDefault(Locale.US); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); Main main = new Main(); main.parseArgsOrExit(args); main.runOrScheduleExecutions(); diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/DateTimeHelper.java b/src/main/java/org/torproject/metrics/onionoo/docs/DateTimeHelper.java index b0bda36..9a8745e 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/DateTimeHelper.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/DateTimeHelper.java @@ -11,7 +11,6 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.Map; -import java.util.TimeZone; public class DateTimeHelper { @@ -80,7 +79,6 @@ public class DateTimeHelper { if (!threadDateFormats.containsKey(format)) { DateFormat dateFormat = new SimpleDateFormat(format); dateFormat.setLenient(false); - dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); threadDateFormats.put(format, dateFormat); } return threadDateFormats.get(format); diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/WeightsStatus.java b/src/main/java/org/torproject/metrics/onionoo/docs/WeightsStatus.java index b9a8265..c61551c 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/WeightsStatus.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/WeightsStatus.java @@ -7,7 +7,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.Comparator; -import java.util.Locale; import java.util.Map; import java.util.Scanner; import java.util.SortedMap; @@ -207,7 +206,7 @@ public class WeightsStatus extends Document { for (int i = 0; i < weights.length; i++) { sb.append(" "); if (i != 0 && i != 5 && !Double.valueOf(weights[i]).isNaN()) { - sb.append(String.format(Locale.US, "%.12f", weights[i])); + sb.append(String.format("%.12f", weights[i])); } } sb.append("\n"); diff --git a/src/main/java/org/torproject/metrics/onionoo/server/NodeIndex.java b/src/main/java/org/torproject/metrics/onionoo/server/NodeIndex.java index dc101a1..30b366c 100644 --- a/src/main/java/org/torproject/metrics/onionoo/server/NodeIndex.java +++ b/src/main/java/org/torproject/metrics/onionoo/server/NodeIndex.java @@ -10,7 +10,6 @@ import java.text.SimpleDateFormat; import java.util.Map; import java.util.Set; import java.util.SortedMap; -import java.util.TimeZone; class NodeIndex { @@ -19,7 +18,6 @@ class NodeIndex { public void setRelaysPublishedMillis(long relaysPublishedMillis) { SimpleDateFormat dateTimeFormat = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss"); - dateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); this.relaysPublishedString = dateTimeFormat.format(relaysPublishedMillis); } @@ -33,7 +31,6 @@ class NodeIndex { public void setBridgesPublishedMillis(long bridgesPublishedMillis) { SimpleDateFormat dateTimeFormat = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss"); - dateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); this.bridgesPublishedString = dateTimeFormat.format(bridgesPublishedMillis); } diff --git a/src/main/java/org/torproject/metrics/onionoo/server/PerformanceMetrics.java b/src/main/java/org/torproject/metrics/onionoo/server/PerformanceMetrics.java index 22a5573..0e0673f 100644 --- a/src/main/java/org/torproject/metrics/onionoo/server/PerformanceMetrics.java +++ b/src/main/java/org/torproject/metrics/onionoo/server/PerformanceMetrics.java @@ -10,7 +10,6 @@ import org.slf4j.LoggerFactory; import java.text.SimpleDateFormat; import java.util.Collection; -import java.util.TimeZone; public class PerformanceMetrics { @@ -64,7 +63,6 @@ public class PerformanceMetrics { > LOG_INTERVAL_MILLIS) { SimpleDateFormat dateTimeFormat = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss"); - dateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); logger.info("Request statistics ({}, {} s):", dateTimeFormat.format(lastLoggedMillis + LOG_INTERVAL_MILLIS), LOG_INTERVAL_SECONDS); diff --git a/src/main/java/org/torproject/metrics/onionoo/server/ServerMain.java b/src/main/java/org/torproject/metrics/onionoo/server/ServerMain.java index 0cab37a..a8c1ba0 100644 --- a/src/main/java/org/torproject/metrics/onionoo/server/ServerMain.java +++ b/src/main/java/org/torproject/metrics/onionoo/server/ServerMain.java @@ -9,6 +9,9 @@ import org.eclipse.jetty.xml.XmlConfiguration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.Locale; +import java.util.TimeZone; + public class ServerMain { private static final Logger logger = LoggerFactory.getLogger( @@ -16,6 +19,8 @@ public class ServerMain { /** Starts the web server listening for incoming client connections. */ public static void main(String[] args) { + Locale.setDefault(Locale.US); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); try { Resource onionooXml = Resource.newSystemResource("jetty.xml"); logger.info("Reading configuration from '{}'.", onionooXml); [View Less]

1 0

[collector/master] Set default locale US and default time zone UTC.
by karsten＠torproject.org 01 Apr '20

01 Apr '20

commit 2b90d656d1b6c27f1e9f1d05a4cf747afec26353 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Apr 1 12:45:07 2020 +0200 Set default locale US and default time zone UTC. Part of #33655. --- CHANGELOG.md | 2 ++ src/build | 2 +- src/main/java/org/torproject/metrics/collector/Main.java | 4 ++++ .../collector/bridgedescs/SanitizedBridgesWriter.java | 4 --… [View More]-- .../metrics/collector/exitlists/ExitListDownloader.java | 7 ++----- .../metrics/collector/onionperf/OnionPerfDownloader.java | 2 -- .../metrics/collector/persist/PersistenceUtils.java | 3 --- .../metrics/collector/relaydescs/ArchiveReader.java | 2 -- .../metrics/collector/relaydescs/ArchiveWriter.java | 14 -------------- .../collector/relaydescs/CachedRelayDescriptorReader.java | 2 -- .../metrics/collector/relaydescs/ReferenceChecker.java | 6 +----- .../collector/relaydescs/RelayDescriptorDownloader.java | 3 --- .../collector/relaydescs/RelayDescriptorParser.java | 3 --- 13 files changed, 10 insertions(+), 44 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c284d47..fa9bb16 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ * Minor changes - Simplify logging configuration. + - Set default locale `US` and default time zone `UTC` at the + beginning of the execution. # Changes in version 1.14.1 - 2020-01-16 diff --git a/src/build b/src/build index fd85646..b5e1a2d 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit fd856466bcb260f53ef69a24c102d0e49d171cc3 +Subproject commit b5e1a2d7b29e58cc0645f068a1ebf4377bf9d8b8 diff --git a/src/main/java/org/torproject/metrics/collector/Main.java b/src/main/java/org/torproject/metrics/collector/Main.java index 3e8ec33..9a04c6e 100644 --- a/src/main/java/org/torproject/metrics/collector/Main.java +++ b/src/main/java/org/torproject/metrics/collector/Main.java @@ -28,7 +28,9 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.nio.file.StandardCopyOption; import java.util.HashMap; +import java.util.Locale; import java.util.Map; +import java.util.TimeZone; /** * Main class for starting a CollecTor instance. @@ -71,6 +73,8 @@ public class Main { * See class description {@link Main}. */ public static void main(String[] args) { + Locale.setDefault(Locale.US); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); try { Path confPath; if (args == null || args.length == 0) { diff --git a/src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java b/src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java index 6aee057..c4f783a 100644 --- a/src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java +++ b/src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java @@ -43,7 +43,6 @@ import java.util.List; import java.util.Map; import java.util.SortedMap; import java.util.Stack; -import java.util.TimeZone; import java.util.TreeMap; /** @@ -139,7 +138,6 @@ public class SanitizedBridgesWriter extends CollecTorMain { config.getBool(Key.ReplaceIpAddressesWithHashes); SimpleDateFormat rsyncCatFormat = new SimpleDateFormat( "yyyy-MM-dd-HH-mm-ss"); - rsyncCatFormat.setTimeZone(TimeZone.getTimeZone("UTC")); this.rsyncCatString = rsyncCatFormat.format( System.currentTimeMillis()); @@ -604,7 +602,6 @@ public class SanitizedBridgesWriter extends CollecTorMain { * whether this status is possibly stale. */ SimpleDateFormat formatter = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss"); - formatter.setTimeZone(TimeZone.getTimeZone("UTC")); if (null == mostRecentDescPublished) { logger.warn("The bridge network status published at {}" + " does not contain a single entry. Please ask the bridge " @@ -1355,7 +1352,6 @@ public class SanitizedBridgesWriter extends CollecTorMain { private void checkStaleDescriptors() { SimpleDateFormat dateTimeFormat = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss"); - dateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); long tooOldMillis = System.currentTimeMillis() - 330L * 60L * 1000L; try { long maxNetworkStatusPublishedMillis = diff --git a/src/main/java/org/torproject/metrics/collector/exitlists/ExitListDownloader.java b/src/main/java/org/torproject/metrics/collector/exitlists/ExitListDownloader.java index 49e176b..c6b45da 100644 --- a/src/main/java/org/torproject/metrics/collector/exitlists/ExitListDownloader.java +++ b/src/main/java/org/torproject/metrics/collector/exitlists/ExitListDownloader.java @@ -28,7 +28,6 @@ import java.util.Arrays; import java.util.Date; import java.util.SortedSet; import java.util.Stack; -import java.util.TimeZone; import java.util.TreeSet; public class ExitListDownloader extends CollecTorMain { @@ -61,9 +60,6 @@ public class ExitListDownloader extends CollecTorMain { @Override protected void startProcessing() throws ConfigurationException { - SimpleDateFormat dateTimeFormat = - new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - dateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); outputPathName = Paths.get(config.getPath(Key.OutputPath).toString(), EXITLISTS).toString(); recentPathName = Paths.get(config.getPath(Key.RecentPath).toString(), @@ -73,6 +69,8 @@ public class ExitListDownloader extends CollecTorMain { logger.debug("Downloading exit list..."); StringBuilder sb = new StringBuilder(); sb.append(Annotation.ExitList.toString()); + SimpleDateFormat dateTimeFormat = + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); sb.append("Downloaded ").append(dateTimeFormat.format(downloadedDate)) .append("\n"); URL url = config.getUrl(Key.ExitlistUrl); @@ -94,7 +92,6 @@ public class ExitListDownloader extends CollecTorMain { SimpleDateFormat tarballFormat = new SimpleDateFormat("yyyy/MM/dd/yyyy-MM-dd-HH-mm-ss"); - tarballFormat.setTimeZone(TimeZone.getTimeZone("UTC")); File tarballFile = Paths.get(outputPathName, tarballFormat.format(downloadedDate)).toFile(); diff --git a/src/main/java/org/torproject/metrics/collector/onionperf/OnionPerfDownloader.java b/src/main/java/org/torproject/metrics/collector/onionperf/OnionPerfDownloader.java index dc1a675..b651620 100644 --- a/src/main/java/org/torproject/metrics/collector/onionperf/OnionPerfDownloader.java +++ b/src/main/java/org/torproject/metrics/collector/onionperf/OnionPerfDownloader.java @@ -35,7 +35,6 @@ import java.util.Arrays; import java.util.List; import java.util.SortedSet; import java.util.Stack; -import java.util.TimeZone; import java.util.TreeSet; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -156,7 +155,6 @@ public class OnionPerfDownloader extends CollecTorMain { static { DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd"); DATE_FORMAT.setLenient(false); - DATE_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC")); } private void downloadAndParseOnionPerfTpfFile(URL baseUrl, String source, diff --git a/src/main/java/org/torproject/metrics/collector/persist/PersistenceUtils.java b/src/main/java/org/torproject/metrics/collector/persist/PersistenceUtils.java index da1403c..c958aec 100644 --- a/src/main/java/org/torproject/metrics/collector/persist/PersistenceUtils.java +++ b/src/main/java/org/torproject/metrics/collector/persist/PersistenceUtils.java @@ -19,7 +19,6 @@ import java.nio.file.StandardOpenOption; import java.nio.file.attribute.BasicFileAttributes; import java.text.SimpleDateFormat; import java.util.Date; -import java.util.TimeZone; public class PersistenceUtils { @@ -118,7 +117,6 @@ public class PersistenceUtils { /** Return all date-time parts as array. */ public static String[] dateTimeParts(Date dateTime) { SimpleDateFormat printFormat = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss"); - printFormat.setTimeZone(TimeZone.getTimeZone("UTC")); return printFormat.format(dateTime).split("-"); } @@ -130,7 +128,6 @@ public class PersistenceUtils { /** Return all date-time as string. */ public static String dateTime(Date dateTime) { SimpleDateFormat printFormat = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss"); - printFormat.setTimeZone(TimeZone.getTimeZone("UTC")); return printFormat.format(dateTime); } diff --git a/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java index 5a80058..83ef2ea 100644 --- a/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java @@ -31,7 +31,6 @@ import java.util.Map; import java.util.Set; import java.util.SortedSet; import java.util.Stack; -import java.util.TimeZone; import java.util.TreeSet; /** @@ -201,7 +200,6 @@ public class ArchiveReader { } SimpleDateFormat parseFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - parseFormat.setTimeZone(TimeZone.getTimeZone("UTC")); String ascii = new String(allData, StandardCharsets.US_ASCII); int start; int end = -1; diff --git a/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java index e0e1623..8addd5e 100644 --- a/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java @@ -47,7 +47,6 @@ import java.util.Set; import java.util.SortedMap; import java.util.SortedSet; import java.util.Stack; -import java.util.TimeZone; import java.util.TreeMap; import java.util.TreeSet; @@ -146,7 +145,6 @@ public class ArchiveWriter extends CollecTorMain { RELAY_DESCRIPTORS).toString(); SimpleDateFormat rsyncCatFormat = new SimpleDateFormat( "yyyy-MM-dd-HH-mm-ss"); - rsyncCatFormat.setTimeZone(TimeZone.getTimeZone("UTC")); this.rsyncCatString = rsyncCatFormat.format( System.currentTimeMillis()); this.descriptorParser = @@ -225,7 +223,6 @@ public class ArchiveWriter extends CollecTorMain { private void loadDescriptorDigests() { SimpleDateFormat dateTimeFormat = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss"); - dateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); try { if (this.storedServerDescriptorsFile.exists()) { BufferedReader br = new BufferedReader(new FileReader( @@ -339,7 +336,6 @@ public class ArchiveWriter extends CollecTorMain { + "descriptors:"); SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - dateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); Map<String, String> knownServerDescriptors = new HashMap<>(); for (Map<String, String> descriptors : this.storedServerDescriptors.values()) { @@ -513,7 +509,6 @@ public class ArchiveWriter extends CollecTorMain { private void checkStaledescriptors() { SimpleDateFormat dateTimeFormat = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss"); - dateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); long tooOldMillis = this.now - 330L * 60L * 1000L; if (!this.storedConsensuses.isEmpty() && this.storedConsensuses.lastKey() < tooOldMillis) { @@ -604,7 +599,6 @@ public class ArchiveWriter extends CollecTorMain { private void saveDescriptorDigests() { SimpleDateFormat dateTimeFormat = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss"); - dateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); try { if (!this.storedServerDescriptorsFile.getParentFile().exists() && !this.storedServerDescriptorsFile.getParentFile().mkdirs()) { @@ -671,7 +665,6 @@ public class ArchiveWriter extends CollecTorMain { SortedSet<String> serverDescriptorDigests) { SimpleDateFormat printFormat = new SimpleDateFormat( "yyyy/MM/dd/yyyy-MM-dd-HH-mm-ss"); - printFormat.setTimeZone(TimeZone.getTimeZone("UTC")); File tarballFile = Paths.get(this.outputDirectory, "consensus", printFormat.format(new Date(validAfter)) + "-consensus").toFile(); boolean tarballFileExistedBefore = tarballFile.exists(); @@ -694,10 +687,8 @@ public class ArchiveWriter extends CollecTorMain { SortedSet<String> microdescriptorDigests) { SimpleDateFormat yearMonthDirectoryFormat = new SimpleDateFormat( "yyyy/MM"); - yearMonthDirectoryFormat.setTimeZone(TimeZone.getTimeZone("UTC")); SimpleDateFormat dayDirectoryFileFormat = new SimpleDateFormat( "dd/yyyy-MM-dd-HH-mm-ss"); - dayDirectoryFileFormat.setTimeZone(TimeZone.getTimeZone("UTC")); File tarballFile = Paths.get(this.outputDirectory, MICRODESC, yearMonthDirectoryFormat.format(validAfter), CONSENSUS_MICRODESC, dayDirectoryFileFormat.format(validAfter) @@ -724,7 +715,6 @@ public class ArchiveWriter extends CollecTorMain { SortedSet<String> serverDescriptorDigests) { SimpleDateFormat printFormat = new SimpleDateFormat( "yyyy/MM/dd/yyyy-MM-dd-HH-mm-ss"); - printFormat.setTimeZone(TimeZone.getTimeZone("UTC")); File tarballFile = Paths.get(this.outputDirectory, "vote", printFormat.format(new Date(validAfter)) + "-vote-" + fingerprint + "-" + digest).toFile(); @@ -778,7 +768,6 @@ public class ArchiveWriter extends CollecTorMain { long published) { SimpleDateFormat printFormat = new SimpleDateFormat( "yyyy-MM-dd-HH-mm-ss"); - printFormat.setTimeZone(TimeZone.getTimeZone("UTC")); File tarballFile = Paths.get(this.outputDirectory, "certs", fingerprint + "-" + printFormat.format(new Date(published))).toFile(); File[] outputFiles = new File[] { tarballFile }; @@ -792,7 +781,6 @@ public class ArchiveWriter extends CollecTorMain { public void storeServerDescriptor(byte[] data, String digest, long published, String extraInfoDigest) { SimpleDateFormat printFormat = new SimpleDateFormat("yyyy/MM/"); - printFormat.setTimeZone(TimeZone.getTimeZone("UTC")); File tarballFile = Paths.get(this.outputDirectory, "server-descriptor", printFormat.format(new Date(published)), digest.substring(0, 1), digest.substring(1, 2), digest).toFile(); @@ -818,7 +806,6 @@ public class ArchiveWriter extends CollecTorMain { public void storeExtraInfoDescriptor(byte[] data, String extraInfoDigest, long published) { SimpleDateFormat descriptorFormat = new SimpleDateFormat("yyyy/MM/"); - descriptorFormat.setTimeZone(TimeZone.getTimeZone("UTC")); File tarballFile = Paths.get(this.outputDirectory, "extra-info", descriptorFormat.format(new Date(published)), extraInfoDigest.substring(0, 1), @@ -850,7 +837,6 @@ public class ArchiveWriter extends CollecTorMain { * called twice to store the same microdescriptor in two different * valid-after months. */ SimpleDateFormat descriptorFormat = new SimpleDateFormat("yyyy/MM/"); - descriptorFormat.setTimeZone(TimeZone.getTimeZone("UTC")); File tarballFile = Paths.get(this.outputDirectory, MICRODESC, descriptorFormat.format(validAfter), MICRO, microdescriptorDigest.substring(0, 1), diff --git a/src/main/java/org/torproject/metrics/collector/relaydescs/CachedRelayDescriptorReader.java b/src/main/java/org/torproject/metrics/collector/relaydescs/CachedRelayDescriptorReader.java index 21a3041..0c0ccab 100644 --- a/src/main/java/org/torproject/metrics/collector/relaydescs/CachedRelayDescriptorReader.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/CachedRelayDescriptorReader.java @@ -26,7 +26,6 @@ import java.util.HashSet; import java.util.Set; import java.util.SortedSet; import java.util.Stack; -import java.util.TimeZone; import java.util.TreeSet; /** @@ -139,7 +138,6 @@ public class CachedRelayDescriptorReader { .append(line.substring("valid-after ".length())); SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - dateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); if (dateTimeFormat.parse(line.substring("valid-after " .length())).getTime() < System.currentTimeMillis() - 6L * 60L * 60L * 1000L) { diff --git a/src/main/java/org/torproject/metrics/collector/relaydescs/ReferenceChecker.java b/src/main/java/org/torproject/metrics/collector/relaydescs/ReferenceChecker.java index 5ff77e7..4cc03eb 100644 --- a/src/main/java/org/torproject/metrics/collector/relaydescs/ReferenceChecker.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/ReferenceChecker.java @@ -28,10 +28,8 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Arrays; import java.util.HashSet; -import java.util.Locale; import java.util.Set; import java.util.SortedSet; -import java.util.TimeZone; import java.util.TreeSet; public class ReferenceChecker { @@ -56,10 +54,8 @@ public class ReferenceChecker { private static DateFormat dateTimeFormat; static { - dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", - Locale.US); + dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'"); dateTimeFormat.setLenient(false); - dateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); } private static final long ONE_HOUR = 60L * 60L * 1000L; diff --git a/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorDownloader.java b/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorDownloader.java index b0fcebb..7155caa 100644 --- a/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorDownloader.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorDownloader.java @@ -29,7 +29,6 @@ import java.util.Map; import java.util.Set; import java.util.SortedMap; import java.util.SortedSet; -import java.util.TimeZone; import java.util.TreeMap; import java.util.TreeSet; @@ -327,7 +326,6 @@ public class RelayDescriptorDownloader { * list and the list of authorities to download all server and * extra-info descriptors from. */ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - format.setTimeZone(TimeZone.getTimeZone("UTC")); long now = System.currentTimeMillis(); this.currentValidAfter = format.format((now / (60L * 60L * 1000L)) * (60L * 60L * 1000L)); @@ -924,7 +922,6 @@ public class RelayDescriptorDownloader { * pretty badly. */ SimpleDateFormat parseFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - parseFormat.setTimeZone(TimeZone.getTimeZone("UTC")); String ascii = new String(allData, StandardCharsets.US_ASCII); int start; int end = -1; diff --git a/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorParser.java b/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorParser.java index 3905458..53f205a 100644 --- a/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorParser.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorParser.java @@ -21,7 +21,6 @@ import java.time.LocalDateTime; import java.time.ZoneOffset; import java.time.format.DateTimeParseException; import java.util.SortedSet; -import java.util.TimeZone; import java.util.TreeSet; /** @@ -61,7 +60,6 @@ public class RelayDescriptorParser { this.aw = aw; this.dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.dateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); } public void setRelayDescriptorDownloader( @@ -96,7 +94,6 @@ public class RelayDescriptorParser { } SimpleDateFormat parseFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - parseFormat.setTimeZone(TimeZone.getTimeZone("UTC")); if (line.startsWith("network-status-version 3")) { String statusType = "consensus"; if (line.equals("network-status-version 3 microdesc")) { [View Less]

1 0

[metrics-base/master] Set default locale and default time zone for tests.
by karsten＠torproject.org 01 Apr '20

01 Apr '20

commit b5e1a2d7b29e58cc0645f068a1ebf4377bf9d8b8 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Apr 1 12:22:32 2020 +0200 Set default locale and default time zone for tests. Set default locale `US` and default time zone `UTC` using Java properties before when running unit tests. Part of #33655. --- java/base.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/java/base.xml b/java/base.xml index f28062a..9c47737 100644 --- a/java/base.xml ++… [View More]

1 0

[translation/orfox-stringsxml_completed] https://gitweb.torproject.org/translation.git/commit/?h=orfox-stringsxml_completed
by translation＠torproject.org 01 Apr '20

01 Apr '20

commit 8f92e2a6affed6a07c27777fccc1b923d5ca17cc Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 1 09:46:54 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=orfox-stringsxml_co… --- hi-IN/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hi-IN/strings.xml b/hi-IN/strings.xml new file mode 100644 index 0000000000..cb5acbb4f3 --- /dev/null +++ b/hi-IN/strings.xml @@ -0,0 +1,2 @@ +<resources> + </resources>

1 0

[translation/orfox-stringsxml] https://gitweb.torproject.org/translation.git/commit/?h=orfox-stringsxml
by translation＠torproject.org 01 Apr '20

01 Apr '20

commit 5a5d8c1978a137f6e8d62bf7a693369bea30798f Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 1 09:46:48 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=orfox-stringsxml --- hi-IN/strings.xml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/hi-IN/strings.xml b/hi-IN/strings.xml index cb5acbb4f3..4d5d43404b 100644 --- a/hi-IN/strings.xml +++ b/hi-IN/strings.xml @@ -1,2 +1,10 @@ <resources> - … [View More]

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 01 Apr '20

01 Apr '20

commit f1c748cd99bf0f45e878f075d4b230e32db2b9cd Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 1 08:53:50 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+zh-CN.po | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 71f010caf3..dc77e07f08 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -1849,7 +1849,7 @@ msgstr "流量是被[客户端](../… [View More]client)和[服务器](../server)发送和接 #: https//support.torproject.org/glossary/web-browser/ #: (content/glossary/web-browser/contents+en.lrword.term) msgid "web browser" -msgstr "" +msgstr "网页浏览器" #: https//support.torproject.org/glossary/web-browser/ #: (content/glossary/web-browser/contents+en.lrword.definition) @@ -5723,7 +5723,7 @@ msgstr "很棒！这就是我们实施出口政策的原因。" msgid "" "Each Tor relay has an exit policy that specifies what sort of outbound " "connections are allowed or refused from that relay." -msgstr "" +msgstr "每个Tor中继拥有一条出口规则，用于指定允许或拒绝何种类型的出站连接通过该中继。" #: https//support.torproject.org/operators/exit-policies/ #: (content/operators/exit-policies/contents+en.lrquestion.description) @@ -5784,7 +5784,7 @@ msgstr "" msgid "" "If you do allow any exit connections, make sure name resolution works (that " "is, your computer can resolve Internet addresses correctly)." -msgstr "" +msgstr "如果您确实允许任何出口连接，确保域名解析正常（也就是，您的电脑能正确解析网络地址）。" #: https//support.torproject.org/operators/exit-policies/ #: (content/operators/exit-policies/contents+en.lrquestion.description) @@ -5928,7 +5928,7 @@ msgstr "" msgid "" "For the time being Tor will require IPv4 addresses on relays, you can not " "run a Tor relay on a host with IPv6 addresses only." -msgstr "" +msgstr "Tor目前需要中继的IPv4地址，您不能在仅有IPv6的主机上运行Tor中继。" #: https//support.torproject.org/operators/limit-total-bandwidth/ #: (content/operators/limit-total-bandwidth/contents+en.lrquestion.title) @@ -6444,6 +6444,8 @@ msgid "" "[BadExit](https://community.torproject.org/relay/community-resources/bad-" "relays/) flag once detected." msgstr "" +"被检测到过滤流量的出口节点会被打上[劣质出口](https://community.torproject.org/relay/community-" +"resources/bad-relays/) 的标签。" #: https//support.torproject.org/operators/packaged-tor/ #: (content/operators/packaged-tor/contents+en.lrquestion.title) @@ -6627,7 +6629,7 @@ msgstr "请查阅主页中的`MaxAdvertisedBandwidth`选项。" msgid "" "All of this said, fast Tor relays do use a lot of ram. It is not unusual for" " a fast exit relay to use 500-1000 MB of memory." -msgstr "" +msgstr "所有这些都说明，Tor高速中继确实需要大量内存。高速出口节点占用500-1000 MB内存是不正常的。" #: https//support.torproject.org/operators/relay-write-more-bytes/ #: (content/operators/relay-write-more-bytes/contents+en.lrquestion.title) [View Less]

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 01 Apr '20

01 Apr '20

commit 31fe98f099a3121af82cc05bdd8230ce665e9daf Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 1 08:24:08 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+zh-CN.po | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index aa3e0fd82d..71f010caf3 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -14,8 +14,8 @@ # MD Rights &… [View More]lt;psychi2009(a)gmail.com>, 2020 # ff98sha, 2020 # erinm, 2020 -# Scott Rhodes <starring169(a)gmail.com>, 2020 # Emma Peel, 2020 +# Scott Rhodes <starring169(a)gmail.com>, 2020 # msgid "" msgstr "" @@ -23,7 +23,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-03-31 14:00+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Emma Peel, 2020\n" +"Last-Translator: Scott Rhodes <starring169(a)gmail.com>, 2020\n" "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -147,7 +147,7 @@ msgstr "Tor 的rpm软件包管理器" #: https//support.torproject.org/misc/menu/ #: (content/misc/menu/contents+en.lrquestion.description) msgid "Abuse FAQs" -msgstr "" +msgstr "有关滥用的常见问题" #: https//support.torproject.org/glossary/add-on-extension-or-plugin/ #: (content/glossary/add-on-extension-or-plugin/contents+en.lrword.term) @@ -477,7 +477,7 @@ msgstr "" msgid "" "For more information, see [how you can verify signatures](/tbb/how-to-" "verify-signature/)." -msgstr "" +msgstr "更多信息。参见 [如何验证签名](/tbb/how-to-verify-signature/)。" #: https//support.torproject.org/glossary/daemon/ #: (content/glossary/daemon/contents+en.lrword.term) @@ -880,7 +880,7 @@ msgstr "" #: https//support.torproject.org/glossary/meek/ #: (content/glossary/meek/contents+en.lrword.definition) msgid "Meek-azure makes it look like you are using a Microsoft web site." -msgstr "" +msgstr "Meek-azure 使您看起来在访问微软的网页。" #: https//support.torproject.org/glossary/middle-relay/ #: (content/glossary/middle-relay/contents+en.lrword.term) @@ -990,7 +990,7 @@ msgstr "" msgid "" "NoScript allows you to control the [JavaScript](../javascript) that runs on " "individual web pages, or to block it entirely." -msgstr "" +msgstr "NoScript 允许您控制运行在个人网页上的 [JavaScript](../javascript)，或者完全屏蔽。" #: https//support.torproject.org/glossary/nyx/ #: (content/glossary/nyx/contents+en.lrword.term) @@ -1108,7 +1108,7 @@ msgstr "洋葱网提供的服务比非私有网络上的普通服务更有优势 #: https//support.torproject.org/glossary/onion-site/ #: (content/glossary/onion-site/contents+en.lrword.term) msgid "onion site" -msgstr "" +msgstr "洋葱站点" #: https//support.torproject.org/glossary/onion-site/ #: (content/glossary/onion-site/contents+en.lrword.definition) @@ -1381,7 +1381,7 @@ msgstr "脚本" #: https//support.torproject.org/glossary/script/ #: (content/glossary/script/contents+en.lrword.definition) msgid "Element used for offering dynamic/interactive content via websites." -msgstr "" +msgstr "用于通过网页提供动态/交互式内容的元素。" #: https//support.torproject.org/glossary/self-authenticating-address/ #: (content/glossary/self-authenticating-address/contents+en.lrword.term) @@ -1410,7 +1410,7 @@ msgstr "服务器" msgid "" "A device on a network that offers a service, such as file and web page " "storage, email or chat." -msgstr "" +msgstr "一个在网络上提供服务的设备，如文件和网页存储，电子邮件或聊天。" #: https//support.torproject.org/glossary/session/ #: (content/glossary/session/contents+en.lrword.term) @@ -1630,7 +1630,7 @@ msgstr "" msgid "" "In the second case, Tor Launcher will take you through a series of " "configuration options." -msgstr "" +msgstr "第二种情况下，Tor 启动器将引导您进行一系列相关配置。" #: https//support.torproject.org/glossary/tor-log/ #: (content/glossary/tor-log/contents+en.lrword.term) [View Less]

1 0