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

[onionoo/master] Skip unrecognized descriptors when importing archives.
by karsten＠torproject.org 08 Nov '17

08 Nov '17

commit ffc949ea54ce294c87b48b3ee8d08198a9e5d9b7 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Nov 3 22:33:02 2017 +0100 Skip unrecognized descriptors when importing archives. --- CHANGELOG.md | 2 ++ src/main/java/org/torproject/onionoo/updater/DescriptorSource.java | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 74f29b7..12b0741 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ * Medium changes - Support quoted qualified search terms. + - Skip unrecognized descriptors when importing archives rather than + aborting the entire import. # Changes in version 4.2-1.6.1 - 2017-10-26 diff --git a/src/main/java/org/torproject/onionoo/updater/DescriptorSource.java b/src/main/java/org/torproject/onionoo/updater/DescriptorSource.java index d32727f..07ae4f8 100644 --- a/src/main/java/org/torproject/onionoo/updater/DescriptorSource.java +++ b/src/main/java/org/torproject/onionoo/updater/DescriptorSource.java @@ -170,9 +170,8 @@ public class DescriptorSource { if (descriptorType == null) { log.warn("Unrecognized descriptor in " + this.inArchiveDir.getAbsolutePath() + " with annotations " - + descriptor.getAnnotations() + ". Not reading any further" - + "archived descriptors."); - break; + + descriptor.getAnnotations() + ". Skipping descriptor."); + continue; } for (DescriptorListener descriptorListener : this.descriptorListeners.get(descriptorType)) {

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 08 Nov '17

08 Nov '17

commit 2f12e45e790ad4b85051e135b39b23e6101ef958 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 8 10:20:48 2017 +0000 Update translations for tor-browser-manual --- it/it.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/it/it.po b/it/it.po index 7bf4bcde8..951c761e0 100644 --- a/it/it.po +++ b/it/it.po @@ -366,7 +366,7 @@ msgid "" msgstr "" "Nel caso abbiate provato ad utilizzare tutti questi trasporti e nessuno di " "essi vi riesce a portare online dovrete inserire l'indirizzo del ponte " -"manualmente. Leggete la sezione <link xref=\"bridges\">nodi</link>per " +"manualmente. Leggete la sezione <link xref=\"bridges\">ponti</link>per " "imparare cosa sono i nodi e come ottenerli" #: downloading.page:7

1 0

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

08 Nov '17

commit 86f22ab6ead29d50dfaec1f76fc1dec1024bdf55 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 8 10:58:13 2017 +0100 Update news.json to version 185 of doc/MetricsTimeline. --- website/src/main/resources/etc/news.json | 35 ++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/website/src/main/resources/etc/news.json b/website/src/main/resources/etc/news.json index 403d70d..9f1d37a 100644 --- a/website/src/main/resources/etc/news.json +++ b/website/src/main/resources/etc/news.json @@ -1864,7 +1864,7 @@ "<OR>", "relay" ], - "description": "Increase of relay users in the Netherlands, from 50k to 100k.", + "description": "Increase of relay users in the Netherlands, from 50k to 100k. Stopped at the same time as increases in Romania, Lithuania, and the Seychelles.", "links": [ "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-07-0…">relay graph</a>", "<a href=\"https://lists.torproject.org/pipermail/tor-dev/2017-September/012446.html\">post suggesting link to 2× dirauth bandwidth</a>", @@ -1875,6 +1875,7 @@ }, { "start": "2017-07-31", + "end": "2017-10-07", "places": [ "ro" ], @@ -1882,9 +1883,9 @@ "<OR>", "relay" ], - "description": "Increase of relay users in Romania, from 10k to 40k. Bridge users not affected.", + "description": "Increase of relay users in Romania, from 10k to 40k. Bridge users not affected. Stopped at the same time as increases in the Netherlands, Lithuania, and the Seychelles. Another increase began immediately after.", "links": [ - "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-05-1…">relay graph</a>", + "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-05-1…">relay graph</a>", "<a href=\"https://lists.torproject.org/pipermail/tor-dev/2017-September/012446.html\">post suggesting link to 2× dirauth bandwidth</a>" ], "unknown": true @@ -1899,7 +1900,7 @@ "<OR>", "relay" ], - "description": "Increase of relay users in Lithuania, from 2k to 70k. Bridge users not affected.", + "description": "Increase of relay users in Lithuania, from 2k to 70k. Stopped at the same time as increases in the Nethernlands, Romania, and the Seychelles.", "links": [ "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-07-0…">relay graph</a>", "<a href=\"https://lists.torproject.org/pipermail/tor-dev/2017-September/012446.html\">post suggesting link to 2× dirauth bandwidth</a>", @@ -1918,7 +1919,7 @@ "<OR>", "relay" ], - "description": "Further increase of relay users in the Seychelles, from 5k to 100k. Bridge users not affected.", + "description": "Further increase of relay users in the Seychelles, from 5k to 100k. Stopped at the same time as increases in the Netherlands, Romania, and Lithuania.", "links": [ "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-07-0…">relay graph</a>", "<a href=\"https://lists.torproject.org/pipermail/tor-dev/2017-September/012446.html\">post suggesting link to 2× dirauth bandwidth</a>", @@ -1989,8 +1990,7 @@ "unknown": true }, { - "start": "2017-09-17", - "end": "2017-10-15", + "start": "2017-09-26", "places": [ "de" ], @@ -1998,9 +1998,26 @@ "<OR>", "relay" ], - "description": "Twofold increase in direct Tor users in Germany.", + "description": "Steady increase of users in Germany, from 180k to over 500k.", + "links": [ + "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-08-1…">de graph</a>", + "<a href=\"https://www.reddit.com/r/TOR/comments/7b53kq/direct_users_from_germany_go_f…">reddit thread</a>" + ], + "unknown": true + }, + { + "start": "2017-10-07", + "places": [ + "ro" + ], + "protocols": [ + "<OR>", + "relay" + ], + "description": "Steady increase of relay users in Romania.", "links": [ - "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-09-1…">de graph</a>" + "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-08-0…">graph</a>", + "<a href=\"https://lists.torproject.org/pipermail/metrics-team/2017-October/000502.htm…">metrics-team thread</a>" ], "unknown": true }

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 08 Nov '17

08 Nov '17

commit 4ef7a746ac5a8c6da593734ed21739c3e8371945 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 8 09:52:36 2017 +0000 Update translations for tor-browser-manual --- it/it.po | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/it/it.po b/it/it.po index 5a9293ae0..7bf4bcde8 100644 --- a/it/it.po +++ b/it/it.po @@ -135,11 +135,11 @@ msgstr "" #: bridges.page:6 msgid "Learn what bridges are and how to get them" -msgstr "Impara cosa sono i nodi e come ottenerli" +msgstr "Impara cosa sono i ponti e come ottenerli" #: bridges.page:10 msgid "Bridges" -msgstr "nodi" +msgstr "ponti" #: bridges.page:12 msgid "" @@ -165,8 +165,8 @@ msgid "" "addresses in order to use these transports." msgstr "" "Altri pluggable transport, come meek, usano differenti sistemi anti censura " -"che non fanno affidamento su nodi. Non avrete bisogno di utilizzare " -"indirizzi di nodi per utilizzare questi pluggable transports" +"che non fanno affidamento su ponti. Non avrete bisogno di utilizzare " +"indirizzi di ponti per utilizzare questi pluggable transports" #: bridges.page:28 msgid "Getting bridge addresses" @@ -217,8 +217,8 @@ msgid "" "address on a separate line." msgstr "" "Seleziona \"si\" quando ti verrà richiesto, se il tuo Provider di servizi " -"Internet blocca le connessioni alla rete Tor. Seleziona \"Usa nodi " -"personalizzati\" ed inserisci gli indirizzi dei bridges, uno per ogni riga." +"Internet blocca le connessioni alla rete Tor. Seleziona \"Usa ponti " +"personalizzati\" ed inserisci gli indirizzi dei ponti, uno per ogni riga." #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -240,10 +240,10 @@ msgid "" " may be down. Please use one of the above methods to obtain more bridge " "addresses, and try again." msgstr "" -"Clicca \"Connetti\". L'utilizzo dei nodi potrebbe rallentare la connessione," -" rispetto ai normali relays Tor. Se la connessione non va a buon fine, il " -"nodo che hai ricevuto potrebbe essere disattivo. Utilizza uno dei metodi qui" -" sopra per ottenere più bridges e riprova." +"Clicca \"Connetti\". L'utilizzo dei ponti potrebbe rallentare la " +"connessione, rispetto ai normali relays Tor. Se la connessione non va a buon" +" fine, il ponte che hai ricevuto potrebbe essere disattivo. Utilizza uno dei" +" metodi qui sopra per ottenere più ponti e riprova." #: circumvention.page:6 msgid "What to do if the Tor network is blocked" @@ -1364,7 +1364,7 @@ msgid "" "any other protocol. obfs3 bridges will work in most places." msgstr "" "obfs3 fa sembrare il traffico Tor casuale, questo non fa sembrare Tor o " -"altro protocollo. I nodi obfs3 funzionano nella maggior parte dei posti" +"altro protocollo. I ponti obfs3 funzionano nella maggior parte dei posti" #: transports.page:42 msgid "obfs4" @@ -1377,8 +1377,8 @@ msgid "" "be blocked than obfs3 bridges." msgstr "" "obfs4 rende casuale il traffico Tor come obfs3, inoltre riesce a prevenire " -"il ritrovamento dei nodi attraverso l'internet scanning. I nodi obfs4 sono " -"piu' difficili da bloccare rispetto ai nodi obfs3." +"il ritrovamento dei ponti attraverso l'internet scanning. I ponti obfs4 sono" +" piu' difficili da bloccare rispetto ai ponti obfs3." #: transports.page:56 msgid "Scramblesuit" @@ -1386,7 +1386,7 @@ msgstr "Scramblesuit" #: transports.page:61 msgid "ScrambleSuit is similar to obfs4 but has a different set of bridges." -msgstr "ScrambleSuit è simile a obfs4 ma utilizza un diverso tipo di nodi. " +msgstr "ScrambleSuit è simile a obfs4 ma utilizza un diverso tipo di ponti. " #: transports.page:69 msgid "FTE"

1 0

[metrics-web/master] Add first draft of sanitized webserver log spec.
by karsten＠torproject.org 08 Nov '17

08 Nov '17

commit 2954fa55d229f1e82f083c5fa7423d47e3da0e70 Author: iwakeh <iwakeh(a)torproject.org> Date: Tue Aug 22 08:02:55 2017 +0000 Add first draft of sanitized webserver log spec. --- .../torproject/metrics/web/DataSourceServlet.java | 2 + website/src/main/resources/etc/web.xml | 1 + website/src/main/resources/spec/convert.sh | 2 +- .../src/main/resources/spec/web-server-logs.xml | 205 +++++++++++++++ website/src/main/resources/web/WEB-INF/sources.jsp | 1 + .../main/resources/web/WEB-INF/web-server-logs.jsp | 292 +++++++++++++++++++++ 6 files changed, 502 insertions(+), 1 deletion(-) diff --git a/website/src/main/java/org/torproject/metrics/web/DataSourceServlet.java b/website/src/main/java/org/torproject/metrics/web/DataSourceServlet.java index f6605c1..eb86a1f 100644 --- a/website/src/main/java/org/torproject/metrics/web/DataSourceServlet.java +++ b/website/src/main/java/org/torproject/metrics/web/DataSourceServlet.java @@ -22,6 +22,8 @@ public class DataSourceServlet extends AnyServlet { super.init(); this.specFiles.put("/bridge-descriptors.html", new String[] { "/bridge-descriptors.jsp", "Tor Bridge Descriptors" }); + this.specFiles.put("/web-server-logs.html", + new String[] { "/web-server-logs.jsp", "Tor Web Server Logs" }); } @Override diff --git a/website/src/main/resources/etc/web.xml b/website/src/main/resources/etc/web.xml index fe7d286..a28a39e 100644 --- a/website/src/main/resources/etc/web.xml +++ b/website/src/main/resources/etc/web.xml @@ -303,6 +303,7 @@ <servlet-mapping> <servlet-name>DataSourceServlet</servlet-name> <url-pattern>/bridge-descriptors.html</url-pattern> + <url-pattern>/web-server-logs.html</url-pattern> </servlet-mapping> <servlet> diff --git a/website/src/main/resources/spec/convert.sh b/website/src/main/resources/spec/convert.sh index 5b32f9a..0287416 100755 --- a/website/src/main/resources/spec/convert.sh +++ b/website/src/main/resources/spec/convert.sh @@ -1,5 +1,5 @@ #!/bin/bash -for specfile in "bridge-descriptors"; do +for specfile in "bridge-descriptors" "web-server-logs"; do saxon-xslt $specfile.xml rfc2629.xslt xml2rfc-topblock=no | \ tidy -q | awk -f convert.awk > ../web/WEB-INF/$specfile.jsp done diff --git a/website/src/main/resources/spec/web-server-logs.xml b/website/src/main/resources/spec/web-server-logs.xml new file mode 100644 index 0000000..d8efe53 --- /dev/null +++ b/website/src/main/resources/spec/web-server-logs.xml @@ -0,0 +1,205 @@ +<?xml-stylesheet type='text/xsl' href='rfc2629.xslt' ?> + +<?rfc private="web-server-logs"?> + +<?rfc compact="yes"?> + +<?rfc authorship="no"?> + +<?rfc-ext include-index="no" ?> +<!DOCTYPE rfc SYSTEM "rfc2629.dtd" [ + <!ENTITY nbsp " "> + <!ENTITY thinsp " "> + <!ENTITY nbhy "‑"> + <!ENTITY ndash "–"> + <!ENTITY mdash "—"> +]> +<rfc xmlns:x="http://purl.org/net/xml2rfc/ext"> + <front> + <title>Tor web server logs</title> + </front> + <middle> + <section title="Purpose of this document"> + <t>BETA: As of November 8, 2017, this document is still under + discussion and subject to change without prior notice. Feel free + to <eref target="/about.html#contact">contact us</eref> for questions or + concerns regarding this document.</t> + <t>Tor's web servers, like most web servers, keep request logs for + maintenance and informational purposes.</t> + <t>However, unlike most other web servers, Tor's web servers use a + privacy-aware log format that avoids logging too sensitive data about + their users.</t> + <t>Also unlike most other web server logs, Tor's logs are neither archived + nor analyzed before performing a number of post-processing steps to further + reduce any privacy-sensitive parts.</t> + <t>This document describes 1) meta-data contained in log file names + written by Tor's web servers, 2) the privacy-aware log format used in + these files, and 3) subsequent sanitizing steps that are applied before + archiving and analyzing these log files.</t> + <t>As a basis for our current implementation this document also + describes the naming conventions for the input log files, which is + just a description of the current state and subject to change.</t> + <t>As a convention for this document, all format strings conform to the + format strings used by + <eref +target="http://httpd.apache.org/docs/current/mod/mod_log_config.html">Apache's +mod_log_config module</eref>.</t> + </section> + <section title="Log file metadata"> + <t>Log files have meta-data that is not part of the file's contents, + in particular, the names of the virtual and physical hosts.</t> + <t>All access log files written by Tor's web servers follow the naming + convention <virtual-host>-access.log-YYYYMMDD, where + "YYYYMMDD" is the date of the rotation and finalization of the log file, + which is not used in the further sanitizing process. + The "access.log" part serves as a marker for web server access + logs.</t> + <t>The virtual hostname can be inferred from the input log's name, + whereas the physical hostname needs to be provided by other means. + Currently, log files are made available to the santizer in a + separate directory per physical web server host. + Log files are typically gz-compressed, + which is indicated by appending ".gz" to log file names, but this is + subject to change. + Files with unknown compression type are discarded (currently ".xz", + ".gz", and ".bz2" are recognized). + Overall, the sanitizer expects log files to use the following path + format: + <list> + <t><physical-host>/<virtual-host>-access.log-YYYYMMDD[.gz]</t> + </list> + </t> + <t>As first safeguard against publishing log files that are too + sensitive, we discard all files not matching the naming convention for + access logs. This is to prevent, for example, error logs from slipping + through.</t> + </section> + <section title="Privacy-aware log format"> + <t>Tor's Apache web servers are configured to write log files that extend + Apache's Combined Log Format with a couple tweaks towards privacy. For + example, the following Apache configuration lines were in use at the time + of writing (subject to change): + <list> + <t>LogFormat "0.0.0.0 - %u %{[%d/%b/%Y:00:00:00 %z]}t \"%r\" %>s %b \"%{Referer}i\" \"-\" %{Age}o" privacy</t> + <t>LogFormat "0.0.0.1 - %u %{[%d/%b/%Y:00:00:00 %z]}t \"%r\" %>s %b \"%{Referer}i\" \"-\" %{Age}o" privacyssl</t> + <t>LogFormat "0.0.0.2 - %u %{[%d/%b/%Y:00:00:00 %z]}t \"%r\" %>s %b \"%{Referer}i\" \"-\" %{Age}o" privacyhs</t> + </list> + </t> + <t>The main difference to Apache's Common Log Format is that request IP + addresses are removed and the field is instead used to encode whether the + request came in via http:// (0.0.0.0), via https:// (0.0.0.1), or via the + site's onion service (0.0.0.2).</t> + <t>Tor's web servers are configured to use UTC as timezone, which is also + highly recommended when rewriting request times to "00:00:00" in order for + the subsequent sanitizing steps to work correctly. Alternatively, if the + system timezone is not set to UTC, web servers should keep request times + unchanged and let them be handled by the subsequent sanitizing steps.</t> + <t>Tor's web servers are configured to rotate logs at least once per day, + which does not necessarily happen at 00:00:00 UTC. As a result, log files + may contain requests from up to two UTC days and several log files may + contain requests that have been started on the same UTC day.</t> + </section> + <section title="Sanitizing steps"> + <t>The request logs written by Tor's web servers still contain too many + details that we are uncomfortable publishing. Therefore, we apply a couple + of sanitizing steps on these log files before making them public and + analyzing them ourselves. Some of these steps could as well be made + directly by Apache, but others can only be made with a delay.</t> + <section title="Discarding non-matching lines"> + <t>Log files are expected to contain exactly one request per line. We + process these files line by line and discard any lines not matching the + following criteria: + <list> + <t>Lines begin with Apache's Common Log Format ("%h %l %u %t \"%r\" + %>s %b") or a compatible format like one of Tor's privacy formats. + It is acceptable if lines start with a format that is compatible to + the Common Log Format and continue with additional fields. Those + additional fields will later be discarded, but the line will not be + discarded because of them.</t> + <t>The request protocol is HTTP.</t> + <t>The request method is either GET or HEAD.</t> + <t>The final status of the request is neither 400 ("Bad Request") nor + 404 ("Not Found").</t> + </list> + </t> + <t>Any lines not meeting all these criteria will be discarded, and + processing continues with the next line.</t> + <t>In addition, log lines are treated differently according to the + date they contain: + <list> + <t>During an import process the sanitizer takes all log line dates into + account and determines the reference interval as stretching from + the oldest date to the youngest date encountered. + Depending on the reference interval log lines are not yet processed, if + their date is on the edges of the reference interval, i.e., the date is + not at least a day younger than the older endpoint or the date is only + LIMIT days older than the younger endpoint, where LIMIT is initially set + to two, but this might change if necessary.</t> + <t>If the younger endpoint of the reference interval coincides with the + current system date, the day before is used as the new younger + reference interval endpoint, which ensures that the sanitizer won't + publish logs prematurely, i.e., before there is a chance that they are + complete. Thus, processing of log lines carrying such date is + postponed.</t> + <t>All log lines with dates for which the sanitizer already published + a log file are discarded in order to avoid altering published logs.</t> + </list> + </t> + </section> + <section title="Rewriting matching lines"> + <t>All matching lines, which are already checked to match Apache's + Common Log Format ("%h %l %u %t \"%r\" %>s %b"), are rewritten + following these rules: + <list> + <t>%h: If the remote hostname starts with "0.0.0.", it is kept + unchanged, otherwise it's rewritten to "0.0.0.0".</t> + <t>%l: The remote logname, if present, is rewritten to "-".</t> + <t>%u: The remote user, if present, is rewritten to "-".</t> + <t>%t: The time the request was received is converted to UTC, unless + the time is already given in UTC, and time and time zone components + are rewritten to "00:00:00 +0000". Date components are kept + unchanged.</t> + <t>%r: If the first line of request contains a query string, that + query string is removed from "?" to the end of the request string. + Otherwise the first line of request is kept unchanged.</t> + <t>%>s: The final status is kept unchanged.</t> + <t>%b: The size of response in bytes is kept unchanged.</t> + </list> + </t> + <t>Any columns exceeding Apache's Common Log Format are discarded.</t> + <t>The result is still supposed to be fully compatible with the Common + Log Format and can be processed by any tools being capable of processing + that format.</t> + </section> + <section title="Re-assembling log files"> + <t>Rewritten log lines are re-assembled into sanitized log files based + on physical host, virtual host, and request start date.</t> + <t>The naming convention for sanitized log files is: + <list> + <t><virtual-host>_<physical-host>_access.log_YYYYMMDD[.xz]</t> + </list> + The underscore is a separator symbol between the various parts of + the filename. + </t> + <t>Sanitized log files may additionally be sorted into directories by + virtual host and date as in: + <list> + <t><virtual-host>/YYYY/MM/<virtual-host>_<physical-host>_access.log_YYYYMMDD[.xz]</t> + </list> + The virtual hostnames, like 'metrics.torproject.org' or + 'dist.torproject.org', are more familiar to the public and were therefore + chosen to be the first naming component. + </t> + <t>As last and certainly not least important sanitizing step, all + rewritten log lines are sorted alphabetically, so that request order + cannot be inferred from sanitized log files.</t> + <t>Sanitized log files are typically compressed before publication. In + particular the sorting step allows for highly efficient compression + rates. We typically use XZ for compression, which is indicated by + appending ".xz" to log file names, but this is subject to change.</t> + </section> + </section> + </middle> + <back/> +</rfc> + diff --git a/website/src/main/resources/web/WEB-INF/sources.jsp b/website/src/main/resources/web/WEB-INF/sources.jsp index a0f5460..c956208 100644 --- a/website/src/main/resources/web/WEB-INF/sources.jsp +++ b/website/src/main/resources/web/WEB-INF/sources.jsp @@ -49,6 +49,7 @@ <li><a href="https://gitweb.torproject.org/torspec.git/tree/attic/dir-spec-v2.txt" target="_blank">Tor directory protocol, version 2</a></li> <li><a href="https://gitweb.torproject.org/torspec.git/tree/attic/dir-spec-v1.txt" target="_blank">Tor directory protocol, version 1</a></li> <li><a href="bridge-descriptors.html">Tor bridge descriptors</a></li> + <li><a href="web-server-logs.html">Tor web server logs</a></li> </ul> </div> diff --git a/website/src/main/resources/web/WEB-INF/web-server-logs.jsp b/website/src/main/resources/web/WEB-INF/web-server-logs.jsp new file mode 100644 index 0000000..b1505df --- /dev/null +++ b/website/src/main/resources/web/WEB-INF/web-server-logs.jsp @@ -0,0 +1,292 @@ +<jsp:include page="top.jsp"> +<jsp:param name="pageTitle" value="Sources – Tor Metrics"/> +<jsp:param name="navActive" value="Sources"/> +</jsp:include> +<div class="container"> +<ul class="breadcrumb"> +<li><a href="/">Home</a></li> +<li><a href="sources.html">Sources</a></li> +<li class="active">${breadcrumb}</li> +</ul> +</div> +<div class="container"> +<header> +<div id="rfc.title"> +<h1>Tor web server logs</h1> +</div> +</header> +</div>  +<div class="container"> +<section id="n-purpose-of-this-document"> +<h2 id="rfc.section.1" class="np"><a href= +"#rfc.section.1">1.</a> <a href= +"#n-purpose-of-this-document">Purpose of this document</a></h2> +<div id="rfc.section.1.p.1"> +<p>BETA: As of November 8, 2017, this document is still under +discussion and subject to change without prior notice. Feel free to +<a href="/about.html#contact">contact us</a> for questions or +concerns regarding this document.</p> +</div> +<div id="rfc.section.1.p.2"> +<p>Tor's web servers, like most web servers, keep request logs for +maintenance and informational purposes.</p> +</div> +<div id="rfc.section.1.p.3"> +<p>However, unlike most other web servers, Tor's web servers use a +privacy-aware log format that avoids logging too sensitive data +about their users.</p> +</div> +<div id="rfc.section.1.p.4"> +<p>Also unlike most other web server logs, Tor's logs are neither +archived nor analyzed before performing a number of post-processing +steps to further reduce any privacy-sensitive parts.</p> +</div> +<div id="rfc.section.1.p.5"> +<p>This document describes 1) meta-data contained in log file names +written by Tor's web servers, 2) the privacy-aware log format used +in these files, and 3) subsequent sanitizing steps that are applied +before archiving and analyzing these log files.</p> +</div> +<div id="rfc.section.1.p.6"> +<p>As a basis for our current implementation this document also +describes the naming conventions for the input log files, which is +just a description of the current state and subject to change.</p> +</div> +<div id="rfc.section.1.p.7"> +<p>As a convention for this document, all format strings conform to +the format strings used by <a href= +"http://httpd.apache.org/docs/current/mod/mod_log_config.html">Apache's +mod_log_config module</a>.</p> +</div> +</section> +</div>  +<div class="container"> +<section id="n-log-file-metadata"> +<h2 id="rfc.section.2"><a href= +"#rfc.section.2">2.</a> <a href="#n-log-file-metadata">Log +file metadata</a></h2> +<div id="rfc.section.2.p.1"> +<p>Log files have meta-data that is not part of the file's +contents, in particular, the names of the virtual and physical +hosts.</p> +</div> +<div id="rfc.section.2.p.2"> +<p>All access log files written by Tor's web servers follow the +naming convention <virtual-host>-access.log-YYYYMMDD, where +"YYYYMMDD" is the date of the rotation and finalization of the log +file, which is not used in the further sanitizing process. The +"access.log" part serves as a marker for web server access +logs.</p> +</div> +<div id="rfc.section.2.p.3"> +<p>The virtual hostname can be inferred from the input log's name, +whereas the physical hostname needs to be provided by other means. +Currently, log files are made available to the santizer in a +separate directory per physical web server host. Log files are +typically gz-compressed, which is indicated by appending ".gz" to +log file names, but this is subject to change. Files with unknown +compression type are discarded (currently ".xz", ".gz", and ".bz2" +are recognized). Overall, the sanitizer expects log files to use +the following path format:</p> +<ul class="empty"> +<li> +<physical-host>/<virtual-host>-access.log-YYYYMMDD[.gz]</li> +</ul> +</div> +<div id="rfc.section.2.p.4"> +<p>As first safeguard against publishing log files that are too +sensitive, we discard all files not matching the naming convention +for access logs. This is to prevent, for example, error logs from +slipping through.</p> +</div> +</section> +</div>  +<div class="container"> +<section id="n-privacy-aware-log-format"> +<h2 id="rfc.section.3"><a href= +"#rfc.section.3">3.</a> <a href="#n-privacy-aware-log-format">Privacy-aware +log format</a></h2> +<div id="rfc.section.3.p.1"> +<p>Tor's Apache web servers are configured to write log files that +extend Apache's Combined Log Format with a couple tweaks towards +privacy. For example, the following Apache configuration lines were +in use at the time of writing (subject to change):</p> +<ul class="empty"> +<li>LogFormat "0.0.0.0 - %u %{[%d/%b/%Y:00:00:00 %z]}t \"%r\" +%>s %b \"%{Referer}i\" \"-\" %{Age}o" privacy</li> +<li>LogFormat "0.0.0.1 - %u %{[%d/%b/%Y:00:00:00 %z]}t \"%r\" +%>s %b \"%{Referer}i\" \"-\" %{Age}o" privacyssl</li> +<li>LogFormat "0.0.0.2 - %u %{[%d/%b/%Y:00:00:00 %z]}t \"%r\" +%>s %b \"%{Referer}i\" \"-\" %{Age}o" privacyhs</li> +</ul> +</div> +<div id="rfc.section.3.p.2"> +<p>The main difference to Apache's Common Log Format is that +request IP addresses are removed and the field is instead used to +encode whether the request came in via http:// (0.0.0.0), via +https:// (0.0.0.1), or via the site's onion service (0.0.0.2).</p> +</div> +<div id="rfc.section.3.p.3"> +<p>Tor's web servers are configured to use UTC as timezone, which +is also highly recommended when rewriting request times to +"00:00:00" in order for the subsequent sanitizing steps to work +correctly. Alternatively, if the system timezone is not set to UTC, +web servers should keep request times unchanged and let them be +handled by the subsequent sanitizing steps.</p> +</div> +<div id="rfc.section.3.p.4"> +<p>Tor's web servers are configured to rotate logs at least once +per day, which does not necessarily happen at 00:00:00 UTC. As a +result, log files may contain requests from up to two UTC days and +several log files may contain requests that have been started on +the same UTC day.</p> +</div> +</section> +</div>  +<div class="container"> +<section id="n-sanitizing-steps"> +<h2 id="rfc.section.4"><a href= +"#rfc.section.4">4.</a> <a href="#n-sanitizing-steps">Sanitizing +steps</a></h2> +<div id="rfc.section.4.p.1"> +<p>The request logs written by Tor's web servers still contain too +many details that we are uncomfortable publishing. Therefore, we +apply a couple of sanitizing steps on these log files before making +them public and analyzing them ourselves. Some of these steps could +as well be made directly by Apache, but others can only be made +with a delay.</p> +</div> +<div class="container"> +<section id="n-discarding-non-matching-lines"> +<h3 id="rfc.section.4.1"><a href= +"#rfc.section.4.1">4.1.</a> <a href= +"#n-discarding-non-matching-lines">Discarding non-matching +lines</a></h3> +<div id="rfc.section.4.1.p.1"> +<p>Log files are expected to contain exactly one request per line. +We process these files line by line and discard any lines not +matching the following criteria:</p> +<ul class="empty"> +<li>Lines begin with Apache's Common Log Format ("%h %l %u %t +\"%r\" %>s %b") or a compatible format like one of Tor's privacy +formats. It is acceptable if lines start with a format that is +compatible to the Common Log Format and continue with additional +fields. Those additional fields will later be discarded, but the +line will not be discarded because of them.</li> +<li>The request protocol is HTTP.</li> +<li>The request method is either GET or HEAD.</li> +<li>The final status of the request is neither 400 ("Bad Request") +nor 404 ("Not Found").</li> +</ul> +</div> +<div id="rfc.section.4.1.p.2"> +<p>Any lines not meeting all these criteria will be discarded, and +processing continues with the next line.</p> +</div> +<div id="rfc.section.4.1.p.3"> +<p>In addition, log lines are treated differently according to the +date they contain:</p> +<ul class="empty"> +<li>During an import process the sanitizer takes all log line dates +into account and determines the reference interval as stretching +from the oldest date to the youngest date encountered. Depending on +the reference interval log lines are not yet processed, if their +date is on the edges of the reference interval, i.e., the date is +not at least a day younger than the older endpoint or the date is +only LIMIT days older than the younger endpoint, where LIMIT is +initially set to two, but this might change if necessary.</li> +<li>If the younger endpoint of the reference interval coincides +with the current system date, the day before is used as the new +younger reference interval endpoint, which ensures that the +sanitizer won't publish logs prematurely, i.e., before there is a +chance that they are complete. Thus, processing of log lines +carrying such date is postponed.</li> +<li>All log lines with dates for which the sanitizer already +published a log file are discarded in order to avoid altering +published logs.</li> +</ul> +</div> +</section> +</div>  +<div class="container"> +<section id="n-rewriting-matching-lines"> +<h3 id="rfc.section.4.2"><a href= +"#rfc.section.4.2">4.2.</a> <a href= +"#n-rewriting-matching-lines">Rewriting matching lines</a></h3> +<div id="rfc.section.4.2.p.1"> +<p>All matching lines, which are already checked to match Apache's +Common Log Format ("%h %l %u %t \"%r\" %>s %b"), are rewritten +following these rules:</p> +<ul class="empty"> +<li>%h: If the remote hostname starts with "0.0.0.", it is kept +unchanged, otherwise it's rewritten to "0.0.0.0".</li> +<li>%l: The remote logname, if present, is rewritten to "-".</li> +<li>%u: The remote user, if present, is rewritten to "-".</li> +<li>%t: The time the request was received is converted to UTC, +unless the time is already given in UTC, and time and time zone +components are rewritten to "00:00:00 +0000". Date components are +kept unchanged.</li> +<li>%r: If the first line of request contains a query string, that +query string is removed from "?" to the end of the request string. +Otherwise the first line of request is kept unchanged.</li> +<li>%>s: The final status is kept unchanged.</li> +<li>%b: The size of response in bytes is kept unchanged.</li> +</ul> +</div> +<div id="rfc.section.4.2.p.2"> +<p>Any columns exceeding Apache's Common Log Format are +discarded.</p> +</div> +<div id="rfc.section.4.2.p.3"> +<p>The result is still supposed to be fully compatible with the +Common Log Format and can be processed by any tools being capable +of processing that format.</p> +</div> +</section> +</div>  +<div class="container"> +<section id="n-re-assembling-log-files"> +<h3 id="rfc.section.4.3"><a href= +"#rfc.section.4.3">4.3.</a> <a href= +"#n-re-assembling-log-files">Re-assembling log files</a></h3> +<div id="rfc.section.4.3.p.1"> +<p>Rewritten log lines are re-assembled into sanitized log files +based on physical host, virtual host, and request start date.</p> +</div> +<div id="rfc.section.4.3.p.2"> +<p>The naming convention for sanitized log files is:</p> +<ul class="empty"> +<li> +<virtual-host>_<physical-host>_access.log_YYYYMMDD[.xz]</li> +</ul> +<p>The underscore is a separator symbol between the various parts +of the filename.</p> +</div> +<div id="rfc.section.4.3.p.3"> +<p>Sanitized log files may additionally be sorted into directories +by virtual host and date as in:</p> +<ul class="empty"> +<li> +<virtual-host>/YYYY/MM/<virtual-host>_<physical-host>_access.log_YYYYMMDD[.xz]</li> +</ul> +<p>The virtual hostnames, like 'metrics.torproject.org' or +'dist.torproject.org', are more familiar to the public and were +therefore chosen to be the first naming component.</p> +</div> +<div id="rfc.section.4.3.p.4"> +<p>As last and certainly not least important sanitizing step, all +rewritten log lines are sorted alphabetically, so that request +order cannot be inferred from sanitized log files.</p> +</div> +<div id="rfc.section.4.3.p.5"> +<p>Sanitized log files are typically compressed before publication. +In particular the sorting step allows for highly efficient +compression rates. We typically use XZ for compression, which is +indicated by appending ".xz" to log file names, but this is subject +to change.</p> +</div> +</section> +</div>  +</section> +</div>  +<jsp:include page="bottom.jsp"/>

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 08 Nov '17

08 Nov '17

commit bee14e7ba6c2f0b4cd8731de40da4219ccaf07e9 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 8 09:22:18 2017 +0000 Update translations for tor-browser-manual --- it/it.po | 44 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 39 insertions(+), 5 deletions(-) diff --git a/it/it.po b/it/it.po index 1f76b6011..5a9293ae0 100644 --- a/it/it.po +++ b/it/it.po @@ -13,13 +13,12 @@ # Massimo Scacco <massimo.scacco(a)hotmail.it>, 2017 # Daniele <daniele356(a)protonmail.com>, 2017 # Giuseppe Pignataro (Fasbyte01) <rogepix(a)gmail.com>, 2017 -# s r <stefano.rufini(a)gmail.com>, 2017 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2016-12-06 16:36-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: s r <stefano.rufini(a)gmail.com>, 2017\n" +"Last-Translator: Giuseppe Pignataro (Fasbyte01) <rogepix(a)gmail.com>, 2017\n" "Language-Team: Italian (https://www.transifex.com/otf/teams/1519/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -151,6 +150,13 @@ msgid "" " in combination with pluggable transports helps to disguise the fact that " "you are using Tor." msgstr "" +"La maggior parte dei <link xref=\"transports\">Pluggable transports</link>, " +"come obfs3 e ofsf4, si basano su dei nodi relay. come i nodi ordinari di Tor" +" anche i nodi relay sono mantenuti da volontari; a differenza dei nodi " +"ordinari gli indirizzi dei nodi relay non sono pubblici. Per questo motivo " +"un attaccante non può identificarli facilmente. La combinazione di nodi e " +"pluggable transports aiuta a mascherare il fatto che si stia utilizzando la " +"rete Tor" #: bridges.page:21 msgid "" @@ -257,9 +263,9 @@ msgid "" "available." msgstr "" "L'accesso diretto alla rete Tor potrebbe essere bloccato dal tuo Provider di" -" servizi Internet o dal governo. Tor Browser include alcune utilità per " -"superare questi ostacoli, e sono chiamate \"pluggable transports\". Vai alla" -" </link> pagina <link xref=\"transports\"> Pluggable Transports per " +" servizi Internet o dal governo. Il browser Tor include alcune strumenti per" +" superare questi ostacoli, e sono chiamati \"pluggable transports\". Vai " +"alla pagina <link xref=\"transports\"> Pluggable Transports</link> per " "ulteriori informazioni." #: circumvention.page:22 @@ -1032,6 +1038,9 @@ msgid "" "methods that do not use Flash. These methods may be compatible with Tor " "Browser." msgstr "" +"Alcuni siti web ( ad esempio Youtube) offrono alternative per la " +"visualizzazione dei video che non utilizzano Flash. Questi metodi potrebbero" +" essere compatibili col browser Tor" #: plugins.page:31 msgid "JavaScript" @@ -1091,6 +1100,8 @@ msgid "" "Tor Browser is based on Firefox, and any browser add-ons or themes that are " "compatible with Firefox can also be installed in Tor Browser." msgstr "" +"Il browser Tor è basato su Firefox, questo permette di utilizzare add-ons e " +"temi compatibili con Firefox anche nel browser Tor" #: plugins.page:64 msgid "" @@ -1444,6 +1455,9 @@ msgid "" "Tor from running. You may need to consult the documentation for your " "antivirus software if you do not know how to do this." msgstr "" +"Controllate che l'antivirus installato sul vostro sistema non stia bloccando" +" la rete Tor. Se non sapete questa informazione consultate il manuale " +"dell'antivirus" #: troubleshooting.page:49 msgid "Temporarily disable your firewall." @@ -1465,6 +1479,9 @@ msgid "" "censoring connections to the Tor network. Read the <link " "xref=\"circumvention\">Circumvention</link> section for possible solutions." msgstr "" +"Se nonostante tutto non riuscite a connettervi, il vostro fornitore di " +"servizi internet potrebbe aver bloccato le connessioni alla rete Tor. Nella " +"sezione <link xref=\"circumvention\">Elusione</link>per possibili soluzioni" #: troubleshooting.page:74 msgid "Known issues" @@ -1496,6 +1513,9 @@ msgid "" " computer. Uninstalling Tor Browser will not affect your system’s software " "or settings." msgstr "" +"Il browser Tor non modifica nessuna delle impostazioni del sistema o i " +"programmi installati sul vostro PC. La disinstallazione del browser Tor non " +"modificherà ne le impostazioni di sistema ne i programmi installati" #: uninstalling.page:18 msgid "Removing Tor Browser from your system is simple:" @@ -1508,6 +1528,11 @@ msgid "" "default location, however the folder will be named \"tor-browser_en-US\" if " "you are running the English Tor Browser." msgstr "" +"Trovare la cartella del browser Tor. La potete trovare sul Desktop se state " +"utilizzando Windows, nella cartella Applicazioni se state utilizzando Mac OS" +" X. Per Linux non esiste un percorso d'installazione predefinito; la " +"cartella contenente il browser verrà nominata \"tor-browser_it-IT\" se state" +" utilizzando la versione Italiana del Browser Tor." #: uninstalling.page:32 msgid "Delete the Tor Browser folder." @@ -1538,6 +1563,9 @@ msgid "" "outdated version of the software, you may be vulnerable to serious security " "flaws that compromise your privacy and anonymity." msgstr "" +"Il browser Tor va mantenuto sempre aggiornato. Se continuate a usare una " +"vecchai versione del browser potreste essere vulnerabili a gravi falle di " +"sicurezza che comprometterebbero la vostra privacy e il vostro anonimato" #: updating.page:18 msgid "" @@ -1546,6 +1574,10 @@ msgid "" "may see a written update indicator when Tor Browser opens. You can update " "either automatically or manually." msgstr "" +"Il browser Tor avviserà automaticamente la presenza di una nuova versione e " +"sull'icona Torbutton apparirà un triangolo giallo ed eventualmente una " +"schermata all'avvio del browser. Potrete decidere se aggiornare manualmente " +"o automaticamente il browser" #: updating.page:26 msgid "Updating Tor Browser automatically" @@ -1569,6 +1601,8 @@ msgid "" "When you are prompted to update Tor Browser, click on the Torbutton icon, " "then select “Check for Tor Browser Update”." msgstr "" +"Per aggiornare il browser Tor basta cliccare sull'icona Torbutton e " +"selezionare la voce \"Controlla aggiornamenti browser Tor\"" #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 08 Nov '17

08 Nov '17

commit 618aabbef79bc08a2fe6042ceda415f9b3db7a6b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 8 08:50:42 2017 +0000 Update translations for tor-browser-manual --- it/it.po | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/it/it.po b/it/it.po index ed2a79b4e..1f76b6011 100644 --- a/it/it.po +++ b/it/it.po @@ -532,6 +532,10 @@ msgid "" "Settings window. This offers you the option to connect directly to the Tor " "network, or to configure Tor Browser for your connection." msgstr "" +"Quando proverete il browser Tor per la prima volta, verrà visualizzata la " +"finestra Impostazioni rete Tor. Questa vi offrirà l'opzione di connetervi " +"direttamente alla rete Tor o di configurare il browser in base al vostro " +"tipo di connessione" #: first-time.page:19 msgid "Connect"

1 0

[tor-browser-bundle/maint-7.0] Release preparations for 7.0.10
by gk＠torproject.org 08 Nov '17

08 Nov '17

commit d03218cdf30922b517ac3246e4abb5458e4b88a7 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 8 08:39:31 2017 +0000 Release preparations for 7.0.10 Changelog update, version bumps, and config.yml update --- Bundle-Data/Docs/ChangeLog.txt | 15 +++++++++++++++ gitian/versions | 14 +++++++------- tools/update-responses/config.yml | 10 +++++----- 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 478814b..cf394ef 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,18 @@ +Tor Browser 7.0.10 -- November 14 2017 + * All Platforms + * Update Firefox to 52.5.0esr + * Update Tor to 0.3.1.8 + * Update Torbutton to 1.9.7.10 + * Bug 23997: Add link to Tor Browser manual for de, nl, tr, vi + * Translations update + * Update HTTPS-Everywhere to 2017.10.30 + * Update NoScript to 5.1.5 + * Bug 23968: NoScript icon jumps to the right after update + * Windows + * Bug 23582: Enable the Windows DLL blocklist for mingw-w64 builds + * Bug 23396: Update the msvcr100.dll we ship + * Bug 24052: Block file:// redirects early + Tor Browser 7.0.9 -- November 3 2017 * OS X * Bug 24052: Streamline handling of file:// resources diff --git a/gitian/versions b/gitian/versions index f0c1726..1f08327 100755 --- a/gitian/versions +++ b/gitian/versions @@ -10,15 +10,15 @@ DATA_OUTSIDE_APP_DIR=1 VERIFY_TAGS=1 -FIREFOX_VERSION=52.4.1esr +FIREFOX_VERSION=52.5.0esr TORBROWSER_UPDATE_CHANNEL=release TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-1-build1 -TOR_TAG=tor-0.3.1.7 +TOR_TAG=tor-0.3.1.8 TORLAUNCHER_TAG=0.2.12.3 -TORBUTTON_TAG=1.9.7.9 -HTTPSE_TAG=2017.10.4 +TORBUTTON_TAG=1.9.7.10 +HTTPSE_TAG=2017.10.30 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable @@ -45,7 +45,7 @@ GITIAN_TAG=tor-browser-builder-4-5 OPENSSL_VER=1.0.2k GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build1 +FIREFOX_LANG_BUILD=build2 BINUTILS_VER=2.24 GCC_VER=5.1.0 CLANG_VER=3.8.0 @@ -67,7 +67,7 @@ YASM_VER=1.2.0 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-5.1.2-fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-5.1.5-fx+sm.xpi CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz MSVCR100_PACKAGE=msvcr100.dll @@ -102,7 +102,7 @@ YASM_PACKAGE=yasm-${YASM_VER}.tar.gz OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf -NOSCRIPT_HASH=82687646b9ecc39d478ac5d4de035b32fdf88efc6faceec3e74b49c863bbfabb +NOSCRIPT_HASH=0620b8608441b5a346e347a07ce3c1e707edc8d4d04f2c72af53e73a0d9b6d5c CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=8793353461826fbd48f25ea8b835be204b758ce7510db2af631b28850355bd18 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index cf3cd4d..628b131 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -20,14 +20,14 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 7.0a4 - release: 7.0.9 + release: 7.0.10 versions: - 7.0.9: - platformVersion: 52.4.1 - detailsURL: https://blog.torproject.org/tor-browser-709-released + 7.0.10: + platformVersion: 52.5.0 + detailsURL: https://blog.torproject.org/tor-browser-7010-released incremental_from: - - 7.0.7 - 7.0.8 + - 7.0.9 migrate_archs: osx32: osx64 migrate_langs:

1 0

[torbutton/maint-1.9.7] Translations update
by gk＠torproject.org 08 Nov '17

08 Nov '17

commit cc60e20b3f71b99908883db5cdd1eefa2a64beb5 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 8 08:15:30 2017 +0000 Translations update --- src/chrome/locale/nl/aboutTBUpdate.dtd | 8 ++++---- src/chrome/locale/pt-BR/aboutTor.properties | 4 ++-- src/chrome/locale/zh-CN/torbutton.dtd | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/chrome/locale/nl/aboutTBUpdate.dtd b/src/chrome/locale/nl/aboutTBUpdate.dtd index e773a68..3fc2ec2 100644 --- a/src/chrome/locale/nl/aboutTBUpdate.dtd +++ b/src/chrome/locale/nl/aboutTBUpdate.dtd @@ -1,6 +1,6 @@ -<!ENTITY aboutTBUpdate.title "Tor-browserupdate"> -<!ENTITY aboutTBUpdate.updated "Tor-browser is bijgewerkt."> -<!ENTITY aboutTBUpdate.linkPrefix "Bezoek voor meer info over deze uitgave"> -<!ENTITY aboutTBUpdate.linkLabel "onze website"> +<!ENTITY aboutTBUpdate.title "Tor Browser Update"> +<!ENTITY aboutTBUpdate.updated "Tor Browser is bijgewerkt."> +<!ENTITY aboutTBUpdate.linkPrefix "Voor de meest recentste informatie over deze release,"> +<!ENTITY aboutTBUpdate.linkLabel "bezoek onze website"> <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.changeLogHeading "Wijzigingslogboek:"> diff --git a/src/chrome/locale/pt-BR/aboutTor.properties b/src/chrome/locale/pt-BR/aboutTor.properties index ca749aa..44b7303 100644 --- a/src/chrome/locale/pt-BR/aboutTor.properties +++ b/src/chrome/locale/pt-BR/aboutTor.properties @@ -10,8 +10,8 @@ aboutTor.searchDDG.search.link=https://duckduckgo.com/ aboutTor.donationBanner.donate=Faça uma Doação Agora! -aboutTor.donationBanner.slogan=Tor: Desligando a Resistência Digital -aboutTor.donationBanner.mozilla=Faça uma doação hoje e a Mozilla vai doará em dobro! +aboutTor.donationBanner.slogan=Tor: Fortalecendo a Resistência Digital +aboutTor.donationBanner.mozilla=Faça uma doação hoje e a Mozilla doará em dobro! aboutTor.donationBanner.tagline1=Protegendo Jornalistas, Whistleblowers e Ativistas desde 2006 aboutTor.donationBanner.tagline2=Construindo Redes de Liberdade no Mundo Todo diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd index 16bbfda..c02f2c4 100644 --- a/src/chrome/locale/zh-CN/torbutton.dtd +++ b/src/chrome/locale/zh-CN/torbutton.dtd @@ -41,7 +41,7 @@ <!ENTITY torbutton.prefs.sec_html5_desc "HTML5 视频和音频需通过 NoScript 点击播放。"> <!ENTITY torbutton.prefs.sec_html5_tooltip "在某些网站，可通过 NoScript 工具栏按钮播放这些媒体。"> <!ENTITY torbutton.prefs.sec_some_jit_desc "禁用某些 JavaScript 性能优化。"> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT，原生正则表达式。"> +<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT，原版RegExp。"> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT。"> <!ENTITY torbutton.prefs.sec_jit_slower_desc "一些网站脚本可能会缓执行。"> <!ENTITY torbutton.prefs.sec_mathml_desc "禁用数学方程式的某些显示机制。">

1 0

[torbutton/maint-1.9.7] Release preparations for 1.9.7.10
by gk＠torproject.org 08 Nov '17

08 Nov '17

commit 308b94d568d0d63e68a616ea321eb741b152ceea Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 8 08:17:45 2017 +0000 Release preparations for 1.9.7.10 Version bump and CHANGELOG update --- src/CHANGELOG | 4 ++++ src/install.rdf | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 58800ee..8973359 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,7 @@ +1.9.7.10 + * Bug 23997: Add link to Tor Browser manual for de, nl, tr, vi + * Translations update + 1.9.7.9 * Bug 23949: Fix donation banner display * Update locales with translated banner diff --git a/src/install.rdf b/src/install.rdf index 763b30d..3101291 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.9.7.9</em:version> + <em:version>1.9.7.10</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL>

1 0