September 2019 - tor-commits - lists.torproject.org

[translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
by translation＠torproject.org 19 Sep '19

19 Sep '19

commit 5457c121da31cecbfee7305a08a1d32b1ceda15e Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 19 14:46:02 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere --- es/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es/https-everywhere.dtd b/es/https-everywhere.dtd index f366599c5..1cd7f741c 100644 --- a/es/https-everywhere.dtd +++ b/es/https-everywhere.dtd @@ -48,7 +48,7 @@ <!ENTITY https-everywhere.chrome.settings_for_this_site_header "Configuraciones para este sitio"> <!ENTITY https-everywhere.chrome.settings_for_this_site_subheader "Cambia tus preferencias para conexiones cifradas"> -<!ENTITY https-everywhere.chrome.settings_for_this_site_explained "A medida que navegas por diferentes sitios web, puedes cambiar tus preferencias para cada uno"> +<!ENTITY https-everywhere.chrome.settings_for_this_site_explained "Mientras navegas por diferentes sitios web, puedes cambiar tus preferencias para cada uno"> <!ENTITY https-everywhere.chrome.stable_rules "Reglas estables"> <!ENTITY https-everywhere.chrome.stable_rules_description "Forzar conexiones cifradas a estos sitios web:"> <!ENTITY https-everywhere.chrome.experimental_rules "Reglas estables">

1 0

[translation/exoneratorproperties_completed] https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties_completed
by translation＠torproject.org 19 Sep '19

19 Sep '19

commit 24bbd821bc477f2d83a04bece1cac471b9676461 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 19 14:45:54 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=exoneratorpropertie… --- es/exonerator.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es/exonerator.properties b/es/exonerator.properties index 611239f3c..03fb6f2c0 100644 --- a/es/exonerator.properties +++ b/es/exonerator.properties @@ -43,7 +43,7 @@ technicaldetails.exit.yes=Sí technicaldetails.exit.no=No permanentlink.heading=Enlace permanente footer.abouttor.heading=Acerca de Tor -footer.abouttor.body.text=Tor es un proyecto de software internacional para hacer anónimo el tráfico de Internet, cifrando paquetes y enviándolos a través de una serie de saltos antes de que lleguen a su destination.  Por lo tanto, si ves tráfico de un relé de Tor, este tráfico generalmente lo origina alguien que usa Tor, en lugar de hacerlo por el operador del relé operator.  Los operadores de retransmisión del Proyecto Tor y de Tor no tienen registros del tráfico que pasa por la red y, por lo tanto, no pueden proporcionar información alguna sobre su origin.  Asegúrate de%s, y no dudes en %s para más información. +# footer.abouttor.body.text=Tor is an international software project to anonymize Internet traffic by encrypting packets and sending them through a series of hops before they reach their destination.  Therefore, if you see traffic from a Tor relay, this traffic usually originates from someone using Tor, rather than from the relay operator.  The Tor Project and Tor relay operators have no records of the traffic that passes over the network and therefore cannot provide any information about its origin.  Be sure to %s, and don't hesitate to %s for more information. footer.abouttor.body.link1=aprende acerca de Tor footer.abouttor.body.link2=contacta con The Tor Project, Inc. footer.aboutexonerator.heading=Acerca de ExoneraTor

1 0

[translation/exoneratorproperties] https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties
by translation＠torproject.org 19 Sep '19

19 Sep '19

commit b46decd7d164c7fabb62c099b70e12fbaca11bba Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 19 14:45:48 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties --- es/exonerator.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es/exonerator.properties b/es/exonerator.properties index 611239f3c..795fe3bb9 100644 --- a/es/exonerator.properties +++ b/es/exonerator.properties @@ -43,7 +43,7 @@ technicaldetails.exit.yes=Sí technicaldetails.exit.no=No permanentlink.heading=Enlace permanente footer.abouttor.heading=Acerca de Tor -footer.abouttor.body.text=Tor es un proyecto de software internacional para hacer anónimo el tráfico de Internet, cifrando paquetes y enviándolos a través de una serie de saltos antes de que lleguen a su destination.  Por lo tanto, si ves tráfico de un relé de Tor, este tráfico generalmente lo origina alguien que usa Tor, en lugar de hacerlo por el operador del relé operator.  Los operadores de retransmisión del Proyecto Tor y de Tor no tienen registros del tráfico que pasa por la red y, por lo tanto, no pueden proporcionar información alguna sobre su origin.  Asegúrate de%s, y no dudes en %s para más información. +footer.abouttor.body.text=Tor es un proyecto de software internacional para hacer anónimo el tráfico de Internet, cifrando paquetes y enviándolos a través de una serie de saltos antes de que lleguen a su destination.  Por lo tanto, si ves tráfico de un repetidor de Tor, este tráfico generalmente lo origina alguien que usa Tor, en lugar de hacerlo por el operador del repetidor operator.  Los operadores de retransmisión del Proyecto Tor y de Tor no tienen registros del tráfico que pasa por la red y, por lo tanto, no pueden proporcionar información alguna sobre su origin.  Asegúrate de%s, y no dudes en %s para más información. footer.abouttor.body.link1=aprende acerca de Tor footer.abouttor.body.link2=contacta con The Tor Project, Inc. footer.aboutexonerator.heading=Acerca de ExoneraTor

1 0

[metrics-web/master] Re-add recent bridge pool assignments.
by karsten＠torproject.org 19 Sep '19

19 Sep '19

commit 7ccae10c5c171d363d907dd74736d51d89725748 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Sep 19 16:30:16 2019 +0200 Re-add recent bridge pool assignments. --- src/main/resources/web/jsps/collector.jsp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/resources/web/jsps/collector.jsp b/src/main/resources/web/jsps/collector.jsp index 42280a9..102bcab 100644 --- a/src/main/resources/web/jsps/collector.jsp +++ b/src/main/resources/web/jsps/collector.jsp @@ -158,7 +158,8 @@ <tr> <td><a href="#type-bridge-pool-assignment">Bridge Pool Assignments</a></td> <td><code>@type bridge-pool-assignment 1.0</code></td> - <td><a href="/collector/archive/bridge-pool-assignments/" class="btn btn-primary btn-xs pull-right"> archive</a></td> + <td><a href="/collector/recent/bridge-pool-assignments/" class="btn btn-primary btn-xs pull-left"> recent</a> + <a href="/collector/archive/bridge-pool-assignments/" class="btn btn-primary btn-xs pull-right"> archive</a></td> </tr> <tr class="tableHeadline"> <td colspan="3"><a href="#exit-lists">TorDNSEL's Exit Lists</a></td> @@ -573,6 +574,7 @@ statistical analysis. <h3 id="type-bridge-pool-assignment" class="hover">Bridge Pool Assignments <code>@type bridge-pool-assignment 1.0</code> +<a href="/collector/recent/bridge-pool-assignments/" class="btn btn-primary btn-xs"> recent</a> <a href="/collector/archive/bridge-pool-assignments/" class="btn btn-primary btn-xs"> archive</a> <a href="#type-bridge-pool-assignment" class="anchor">#</a> </h3> @@ -613,11 +615,6 @@ bridge-pool-assignment 2011-03-13 14:38:03 [...] </pre> - -As of December 8, 2014, bridge pool assignment files are no longer -archived. - - <h2 id="exit-lists" class="hover">TorDNSEL's Exit Lists <a href="#exit-lists" class="anchor">#</a>

1 0

[collector/master] Bump version to 1.11.1-dev.
by karsten＠torproject.org 19 Sep '19

19 Sep '19

commit 18877fdb4d270a6ef02664eb07271c064fab785f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Sep 19 15:11:37 2019 +0200 Bump version to 1.11.1-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 9f2a0a6..6b097a3 100644 --- a/build.xml +++ b/build.xml @@ -9,7 +9,7 @@ <property name="javadoc-title" value="CollecTor API Documentation"/> <property name="implementation-title" value="CollecTor" /> - <property name="release.version" value="1.11.1" /> + <property name="release.version" value="1.11.1-dev" /> <property name="project-main-class" value="org.torproject.metrics.collector.Main" /> <property name="name" value="collector"/> <property name="metricslibversion" value="2.7.0" />

1 0

[collector/release] Update create-tarballs.sh script and PROTOCOL.
by karsten＠torproject.org 19 Sep '19

19 Sep '19

commit d3203ceb9e726d641ea1a2621ff325873b7d6d45 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Sep 19 12:37:18 2019 +0200 Update create-tarballs.sh script and PROTOCOL. These changes still belong to archiving bridge pool assignments. But they're not important enough for putting out a new release at this point. --- CHANGELOG.md | 7 +++++++ src/main/resources/create-tarballs.sh | 7 +++++++ src/main/resources/docs/PROTOCOL | 5 +---- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f5f9488..d6992c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# Changes in version 1.??.? - 2019-??-?? + + * Minor changes + - Update create-tarballs.sh to also produce bridge pool assignments + tarballs. + + # Changes in version 1.11.0 - 2019-09-19 * Medium changes diff --git a/src/main/resources/create-tarballs.sh b/src/main/resources/create-tarballs.sh index 50b7fdb..5802020 100755 --- a/src/main/resources/create-tarballs.sh +++ b/src/main/resources/create-tarballs.sh @@ -61,6 +61,8 @@ TARBALLS=( bridge-extra-infos-$YEARTWO-$MONTHTWO snowflakes-$YEARONE-$MONTHONE snowflakes-$YEARTWO-$MONTHTWO + bridge-pool-assignments-$YEARONE-$MONTHONE + bridge-pool-assignments-$YEARTWO-$MONTHTWO ) TARBALLS=($(printf "%s\n" "${TARBALLS[@]}" | uniq)) @@ -90,6 +92,8 @@ DIRECTORIES=( $OUTDIR/bridge-descriptors/$YEARTWO/$MONTHTWO/extra-infos/ $OUTDIR/snowflakes/$YEARONE/$MONTHONE/ $OUTDIR/snowflakes/$YEARTWO/$MONTHTWO/ + $OUTDIR/bridge-pool-assignments/$YEARONE/$MONTHONE/ + $OUTDIR/bridge-pool-assignments/$YEARTWO/$MONTHTWO/ ) DIRECTORIES=($(printf "%s\n" "${DIRECTORIES[@]}" | uniq)) @@ -176,4 +180,7 @@ ln -f -s -t $ARCHIVEDIR/webstats/ $TARBALLTARGETDIR/webstats-20??-??.tar mkdir -p $ARCHIVEDIR/snowflakes/ ln -f -s -t $ARCHIVEDIR/snowflakes/ $TARBALLTARGETDIR/snowflakes-20??-??.tar.xz +mkdir -p $ARCHIVEDIR/bridge-pool-assignments/ +ln -f -s -t $ARCHIVEDIR/bridge-pool-assignments/ $TARBALLTARGETDIR/bridge-pool-assignments-20??-??.tar.xz + echo `date` "Finished." diff --git a/src/main/resources/docs/PROTOCOL b/src/main/resources/docs/PROTOCOL index 478f168..d735d40 100644 --- a/src/main/resources/docs/PROTOCOL +++ b/src/main/resources/docs/PROTOCOL @@ -282,15 +282,12 @@ The top level of subdirectories is * bridge-descriptors + * bridge-pool-assignments * exit-lists * relay-descriptors * torperf * snowflakes - (There has been another subdirectory 'bridge-pool-assignments' which has been - removed when CollecTor stopped collecting those descriptors. However, it's - structure can still be found in the tarballs.) - 5.1 'exit-lists' and 'torperf' Tars 5.1.1

1 0

[collector/release] Prepare for 1.11.1 release.
by karsten＠torproject.org 19 Sep '19

19 Sep '19

commit 91e5a07df83f4432043afe13ad221d8d8992c176 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Sep 19 15:00:00 2019 +0200 Prepare for 1.11.1 release. --- CHANGELOG.md | 2 +- build.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 48eae33..e30b086 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 1.??.? - 2019-??-?? +# Changes in version 1.11.1 - 2019-09-19 * Minor changes - Update create-tarballs.sh to also produce bridge pool assignments diff --git a/build.xml b/build.xml index da10311..9f2a0a6 100644 --- a/build.xml +++ b/build.xml @@ -9,7 +9,7 @@ <property name="javadoc-title" value="CollecTor API Documentation"/> <property name="implementation-title" value="CollecTor" /> - <property name="release.version" value="1.11.0-dev" /> + <property name="release.version" value="1.11.1" /> <property name="project-main-class" value="org.torproject.metrics.collector.Main" /> <property name="name" value="collector"/> <property name="metricslibversion" value="2.7.0" />

1 0

[collector/release] Fix bridge pool assignments sync and log statement.
by karsten＠torproject.org 19 Sep '19

19 Sep '19

commit 8ed8de6e76e0f45f6112f3d60597037bdf27493f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Sep 19 14:57:15 2019 +0200 Fix bridge pool assignments sync and log statement. --- CHANGELOG.md | 2 ++ .../collector/bridgepools/BridgePoolAssignmentsProcessor.java | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d6992c9..48eae33 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ * Minor changes - Update create-tarballs.sh to also produce bridge pool assignments tarballs. + - Fix synchronization part of newly re-added bridge pool + assignments module. # Changes in version 1.11.0 - 2019-09-19 diff --git a/src/main/java/org/torproject/metrics/collector/bridgepools/BridgePoolAssignmentsProcessor.java b/src/main/java/org/torproject/metrics/collector/bridgepools/BridgePoolAssignmentsProcessor.java index a386fb6..875273d 100644 --- a/src/main/java/org/torproject/metrics/collector/bridgepools/BridgePoolAssignmentsProcessor.java +++ b/src/main/java/org/torproject/metrics/collector/bridgepools/BridgePoolAssignmentsProcessor.java @@ -3,6 +3,7 @@ package org.torproject.metrics.collector.bridgepools; +import org.torproject.descriptor.BridgePoolAssignment; import org.torproject.metrics.collector.conf.Configuration; import org.torproject.metrics.collector.conf.ConfigurationException; import org.torproject.metrics.collector.conf.Key; @@ -79,6 +80,8 @@ public class BridgePoolAssignmentsProcessor extends CollecTorMain { */ public BridgePoolAssignmentsProcessor(Configuration config) { super(config); + this.mapPathDescriptors.put("recent/bridge-pool-assignments", + BridgePoolAssignment.class); } /** @@ -153,7 +156,7 @@ public class BridgePoolAssignmentsProcessor extends CollecTorMain { } } if (null != latestPublished - && latestPublished.minusMinutes(330L).isBefore(LocalDateTime.now())) { + && latestPublished.plusMinutes(330L).isBefore(LocalDateTime.now())) { logger.warn("The last known bridge pool assignment list was " + "published at {}, which is more than 5:30 hours in the past.", latestPublished);

1 0

[collector/release] Bump version to 1.11.0-dev.
by karsten＠torproject.org 19 Sep '19

19 Sep '19

commit cb6e85d79a8622248a68166ae9cd87febcbd0b45 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Sep 19 11:32:29 2019 +0200 Bump version to 1.11.0-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index faf44a9..da10311 100644 --- a/build.xml +++ b/build.xml @@ -9,7 +9,7 @@ <property name="javadoc-title" value="CollecTor API Documentation"/> <property name="implementation-title" value="CollecTor" /> - <property name="release.version" value="1.11.0" /> + <property name="release.version" value="1.11.0-dev" /> <property name="project-main-class" value="org.torproject.metrics.collector.Main" /> <property name="name" value="collector"/> <property name="metricslibversion" value="2.7.0" />

1 0

[collector/master] Fix bridge pool assignments sync and log statement.
by karsten＠torproject.org 19 Sep '19

19 Sep '19

commit 8ed8de6e76e0f45f6112f3d60597037bdf27493f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Sep 19 14:57:15 2019 +0200 Fix bridge pool assignments sync and log statement. --- CHANGELOG.md | 2 ++ .../collector/bridgepools/BridgePoolAssignmentsProcessor.java | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d6992c9..48eae33 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ * Minor changes - Update create-tarballs.sh to also produce bridge pool assignments tarballs. + - Fix synchronization part of newly re-added bridge pool + assignments module. # Changes in version 1.11.0 - 2019-09-19 diff --git a/src/main/java/org/torproject/metrics/collector/bridgepools/BridgePoolAssignmentsProcessor.java b/src/main/java/org/torproject/metrics/collector/bridgepools/BridgePoolAssignmentsProcessor.java index a386fb6..875273d 100644 --- a/src/main/java/org/torproject/metrics/collector/bridgepools/BridgePoolAssignmentsProcessor.java +++ b/src/main/java/org/torproject/metrics/collector/bridgepools/BridgePoolAssignmentsProcessor.java @@ -3,6 +3,7 @@ package org.torproject.metrics.collector.bridgepools; +import org.torproject.descriptor.BridgePoolAssignment; import org.torproject.metrics.collector.conf.Configuration; import org.torproject.metrics.collector.conf.ConfigurationException; import org.torproject.metrics.collector.conf.Key; @@ -79,6 +80,8 @@ public class BridgePoolAssignmentsProcessor extends CollecTorMain { */ public BridgePoolAssignmentsProcessor(Configuration config) { super(config); + this.mapPathDescriptors.put("recent/bridge-pool-assignments", + BridgePoolAssignment.class); } /** @@ -153,7 +156,7 @@ public class BridgePoolAssignmentsProcessor extends CollecTorMain { } } if (null != latestPublished - && latestPublished.minusMinutes(330L).isBefore(LocalDateTime.now())) { + && latestPublished.plusMinutes(330L).isBefore(LocalDateTime.now())) { logger.warn("The last known bridge pool assignment list was " + "published at {}, which is more than 5:30 hours in the past.", latestPublished);

1 0