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

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

14 Dec '20

commit cf10fc421e9dcff7e8aee5c42ec0a53b148253ba Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 14 09:48:24 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+es-AR.po | 59 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/contents+es-AR.po b/contents+es-AR.po index d8562b3b20..93636e2796 100644 --- a/contents+es-AR.po +++ b/contents+es-AR.po @@ -8053,7 +8053,7 @@ msgid "" "For the most in-depth resource on running a relay, see the [Relay Setup " "Guide](https://community.torproject.org/relay/setup)." msgstr "" -"Por el recurso más profundo sobre cómo correr un repetidor, mirá la [Guía de" +"Por un recurso más profundo sobre cómo correr un repetidor, mirá la [Guía de" " Configuración de Repetidor](https://community.torproject.org/relay/setup)." #: https//support.torproject.org/operators/operators-2/ @@ -8255,7 +8255,7 @@ msgstr "" #: https//support.torproject.org/operators/outgoing-firewall/ #: (content/operators/outgoing-firewall/contents+en.lrquestion.description) msgid "Tor promotes free network access without interference." -msgstr "Tor promueve el acceso libre e la red sin interferencia." +msgstr "Tor promueve el acceso libre a la red sin interferencia." #: https//support.torproject.org/operators/outgoing-firewall/ #: (content/operators/outgoing-firewall/contents+en.lrquestion.description) @@ -8263,7 +8263,7 @@ msgid "" "Exit relays must not filter the traffic that passes through them to the " "internet." msgstr "" -"Los repetidores de salida no deben filtrar el tráfico que pasa a rtavés de " +"Los repetidores de salida no deben filtrar el tráfico que pasa a través de " "ellos hacia Internet." #: https//support.torproject.org/operators/outgoing-firewall/ @@ -8325,8 +8325,8 @@ msgid "" "* Tor runs with `--verify-config`, so that most problems with your config " "file get caught." msgstr "" -"* Tor corre con `--verify-config`, por lo cual es detectada la mayoría de " -"los problemas con tu archivo de configuración." +"* Tor corre con `--verify-config`, por lo cual la mayoría de los problemas " +"con tu archivo de configuración es detectada." #: https//support.torproject.org/operators/packaged-tor/ #: (content/operators/packaged-tor/contents+en.lrquestion.description) @@ -8365,7 +8365,7 @@ msgid "" "when it disconnects will break." msgstr "" "Solo tratá de asegurarte que no sea muy a menudo, ya que las conexiones que " -"están usando al repetidor cuando se desconecta se cortarán." +"están usando al repetidor cuando se desconecta se van a cortar." #: https//support.torproject.org/operators/relay-flexible/ #: (content/operators/relay-flexible/contents+en.lrquestion.description) @@ -8386,8 +8386,8 @@ msgid "" "If you are uncomfortable allowing people to exit from your relay, you can " "set it up to only allow connections to other Tor relays." msgstr "" -"Si no estás confortable permitiendo a la gente que salga desde tu repetidor," -" podés configurarlo para permitir solamente conexiones a otros repetidores " +"Si no estás cómodo permitiéndole a la gente que salga desde tu repetidor, " +"podés configurarlo para permitir solamente conexiones a otros repetidores " "Tor." #: https//support.torproject.org/operators/relay-flexible/ @@ -8397,10 +8397,10 @@ msgid "" "capacity, so high-bandwidth relays will attract more users than low-" "bandwidth ones. Therefore, having low-bandwidth relays is useful too." msgstr "" -"* Tu repetidor estimará pasivamente su capacidad de ancho de banda reciente " -"y la publicitará, por lo que repetidores de ancho de banda alto atraerán más" -" usuarios que los de ancho de banda bajo. Por consiguiente, tener " -"repetidores de ancho de banda bajo también es útil." +"* Tu repetidor va a estimar pasivamente su capacidad de ancho de banda " +"reciente y la va a publicitar, por lo que repetidores de ancho de banda alto" +" atraerán más usuarios que los de ancho de banda bajo. Por consiguiente, " +"tener repetidores de ancho de banda bajo también es útil." #: https//support.torproject.org/operators/relay-memory/ #: (content/operators/relay-memory/contents+en.lrquestion.title) @@ -8414,7 +8414,7 @@ msgid "" "for reducing its footprint:" msgstr "" "Si tu repetidor Tor está usando más memoria de la que te gustaría, acá hay " -"algunos consejos para reducir su huella:" +"algunos consejos para reducir su uso:" #: https//support.torproject.org/operators/relay-memory/ #: (content/operators/relay-memory/contents+en.lrquestion.description) @@ -8431,7 +8431,7 @@ msgid "" "That is, when Tor releases memory back to the system, the pieces of memory " "are fragmented so they're hard to reuse." msgstr "" -"Eso es, cuando Tor devuelve memoria al sistema, esas piezas están " +"Eso es, cuando Tor le devuelve memoria al sistema, esas piezas están " "fragmentadas, por lo que son difíciles de reutilizar." #: https//support.torproject.org/operators/relay-memory/ @@ -8482,7 +8482,7 @@ msgid "" "automatically recognize and use this feature." msgstr "" "Si actualizás a OpenSSL 1.0.0 o más nuevo, la compilación de Tor lo " -"reconocerá automáticamente, y usará esta característica." +"reconocerá automáticamente, y va a usar esta característica." #: https//support.torproject.org/operators/relay-memory/ #: (content/operators/relay-memory/contents+en.lrquestion.description) @@ -8573,7 +8573,7 @@ msgstr "" #: https//support.torproject.org/operators/should-i-run-a-relay/ #: (content/operators/should-i-run-a-relay/contents+en.lrquestion.title) msgid "How do I decide if I should run a relay?" -msgstr "¿Cómo decido si debiera correr un repetidor?" +msgstr "¿Cómo decido si debería correr un repetidor?" #: https//support.torproject.org/operators/should-i-run-a-relay/ #: (content/operators/should-i-run-a-relay/contents+en.lrquestion.description) @@ -8628,7 +8628,7 @@ msgid "" msgstr "" "Mantener copias de seguridad de la claves de identidad de manera que puedas " "restaurar un repetidor en el futuro es la forma recomendada de asegurar que " -"la reputación del repetidor no será desperdiciada." +"la reputación del repetidor no va a ser desperdiciada." #: https//support.torproject.org/operators/upgrade-or-move/ #: (content/operators/upgrade-or-move/contents+en.lrquestion.description) @@ -8639,7 +8639,7 @@ msgid "" msgstr "" "Esto significa que si estás actualizando tu repetidor Tor y mantenés los " "mismos torrc y DataDirectory, entonces la actualización simplemente debería " -"funcionar, y tu repetidor seguirá usando la misma clave." +"funcionar, y tu repetidor va a seguir usando la misma clave." #: https//support.torproject.org/operators/upgrade-or-move/ #: (content/operators/upgrade-or-move/contents+en.lrquestion.description) @@ -8657,7 +8657,7 @@ msgid "" "based on ed25519 elliptic curve cryptography." msgstr "" "Nota: Desde Tor 0.2.7 estamos usando identidades de nueva generación para " -"los repetidores, basadas en la criptografía de curva elíptica ed25519." +"los repetidores, basadas en la criptografía de curva elíptica ed25519." #: https//support.torproject.org/operators/upgrade-or-move/ #: (content/operators/upgrade-or-move/contents+en.lrquestion.description) @@ -8665,8 +8665,9 @@ msgid "" "Eventually they will replace the old RSA identities, but that will happen in" " time, to ensure compatibility with older versions." msgstr "" -"Eventualmente, reemplazarán a las viejas identidades RSA, pero eso ocurrirá " -"con el tiempo, para asegurar la compatibilidad con versiones más viejas." +"Eventualmente, van a reemplaz a las viejas identidades RSA, pero eso va a " +"ocurrir con el tiempo, para asegurar la compatibilidad con versiones más " +"viejas." #: https//support.torproject.org/operators/upgrade-or-move/ #: (content/operators/upgrade-or-move/contents+en.lrquestion.description) @@ -8734,7 +8735,7 @@ msgid "" "home**)." msgstr "" "* El repetidor de salida es el tipo más necesitado, pero también viene con " -"la exposición legal y el riesgo más altos (y **NO debieras correrlos desde " +"la exposición legal y el riesgo más altos (y **NO deberías correrlos desde " "tu hogar**)." #: https//support.torproject.org/operators/what-type-of-relays-are-most-needed/ @@ -8770,7 +8771,7 @@ msgid "" "website, etc. who want to know more about the host they're relaying through." msgstr "" "Si permitís conexiones de salida, algunos servicios a los que la gente se " -"conecta desde tu repetidor se conectarán a su vez para recolectar más " +"conecta desde tu repetidor se van a conectar a su vez para recolectar más " "información acerca tuyo. Por ejemplo, algunos servidores IRC lo hacen a tu " "puerto identd para registrar qué usuario hizo la conexión. (Esto realmente " "no funciona para ellos, porque Tor no conoce esta información, pero lo " @@ -8798,15 +8799,15 @@ msgid "" "relays](https://trac.torproject.org/projects/tor/wiki/TorRelayGuide/Securit…" " for more suggestions." msgstr "" -"En cualquier caso, necesitás mantenerte al día con tu securidad. Mirá este " -"artículo sobre [securidad para repetidores " +"En cualquier caso, necesitás mantenerte al día con tu seguridad. Mirá este " +"artículo sobre [seguridad para repetidores " "Tor](https://trac.torproject.org/projects/tor/wiki/TorRelayGuide/Security) " "por más sugerencias." #: https//support.torproject.org/operators/why-isnt-my-relay-being-used-more/ #: (content/operators/why-isnt-my-relay-being-used-more/contents+en.lrquestion.title) msgid "Why isn't my relay being used more?" -msgstr "¿Por qué no está siendo más usado mi repetidor?" +msgstr "¿Por qué mi repetidor no está siendo usado en mayor medida?" #: https//support.torproject.org/operators/why-isnt-my-relay-being-used-more/ #: (content/operators/why-isnt-my-relay-being-used-more/contents+en.lrquestion.description) @@ -8861,8 +8862,8 @@ msgid "" msgstr "" "Tor adivina su dirección IP preguntándole a la computadora por su nombre de " "equipo, y después resolviendo ese nombre de equipo. A menudo, la gente tiene" -" viejas entradas en su archivo /etc/hosts que apuntan a viejas direcciones " -"IP." +" viejas entradas en su archivo /etc/hosts que apuntan a direcciones IP " +"viejas." #: https//support.torproject.org/operators/wrong-ip/ #: (content/operators/wrong-ip/contents+en.lrquestion.description) @@ -8872,7 +8873,7 @@ msgid "" "only has an internal IP address, see the following Support entry on dynamic " "IP addresses." msgstr "" -"Si eso no lo arregla, debieras usar la opción de configuración \"Address\" " +"Si eso no lo arregla, deberías usar la opción de configuración \"Address\" " "para especificar el IP que querés que elija. Si tu computadora está detrás " "de un NAT y solamente tiene una dirección IP interna, mirá la siguiente " "entrada de Soporte sobre direcciones IP dinámicas."

1 0

[collector/master] Include certs when syncing from another instance.
by karsten＠torproject.org 14 Dec '20

14 Dec '20

commit 9834cec8c0e88c1e810434f543f5d8c4d5cb2de8 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Dec 14 09:35:35 2020 +0100 Include certs when syncing from another instance. --- CHANGELOG.md | 4 ++-- .../DirectoryKeyCertificatePersistence.java | 27 ++++++++++++++++++++++ .../collector/relaydescs/ArchiveWriter.java | 7 +++++- .../metrics/collector/sync/SyncPersistence.java | 6 +++++ 4 files changed, 41 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 22d3517..f56f74d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,8 @@ - Clean up descriptors written to the `out/` directory by deleting files that are older than seven weeks. - Correctly index files that are moved away and back. - - Include microdescriptors when syncing from another CollecTor - instance. + - Include microdescriptors and certs when syncing from another + CollecTor instance. - Update to metrics-lib 2.15.0. diff --git a/src/main/java/org/torproject/metrics/collector/persist/DirectoryKeyCertificatePersistence.java b/src/main/java/org/torproject/metrics/collector/persist/DirectoryKeyCertificatePersistence.java new file mode 100644 index 0000000..39f88f3 --- /dev/null +++ b/src/main/java/org/torproject/metrics/collector/persist/DirectoryKeyCertificatePersistence.java @@ -0,0 +1,27 @@ +/* Copyright 2020 The Tor Project + * See LICENSE for licensing information */ + +package org.torproject.metrics.collector.persist; + +import org.torproject.descriptor.DirectoryKeyCertificate; +import org.torproject.metrics.collector.conf.Annotation; + +import java.nio.file.Paths; + +public class DirectoryKeyCertificatePersistence + extends DescriptorPersistence<DirectoryKeyCertificate> { + + public DirectoryKeyCertificatePersistence( + DirectoryKeyCertificate descriptor) { + super(descriptor, Annotation.Cert.bytes()); + this.calculatePaths(); + } + + private void calculatePaths() { + String fileName = this.desc.getFingerprint().toUpperCase() + "-" + + PersistenceUtils.dateTime(this.desc.getDirKeyPublishedMillis()); + this.recentPath = Paths.get(RELAYDESCS, "certs", fileName).toString(); + this.storagePath = this.recentPath; + } +} + 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 5c58f23..616d7dd 100644 --- a/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java @@ -7,6 +7,7 @@ import org.torproject.descriptor.BandwidthFile; import org.torproject.descriptor.Descriptor; import org.torproject.descriptor.DescriptorParser; import org.torproject.descriptor.DescriptorSourceFactory; +import org.torproject.descriptor.DirectoryKeyCertificate; import org.torproject.descriptor.Microdescriptor; import org.torproject.descriptor.RelayExtraInfoDescriptor; import org.torproject.descriptor.RelayNetworkStatusConsensus; @@ -105,6 +106,8 @@ public class ArchiveWriter extends CollecTorMain { super(config); this.mapPathDescriptors.put("recent/relay-descriptors/votes", RelayNetworkStatusVote.class); + this.mapPathDescriptors.put("recent/relay-descriptors/certs", + DirectoryKeyCertificate.class); this.mapPathDescriptors.put("recent/relay-descriptors/consensuses", RelayNetworkStatusConsensus.class); this.mapPathDescriptors.put( @@ -738,7 +741,9 @@ public class ArchiveWriter extends CollecTorMain { "yyyy-MM-dd-HH-mm-ss"); File tarballFile = Paths.get(this.outputDirectory, "certs", fingerprint + "-" + printFormat.format(new Date(published))).toFile(); - File[] outputFiles = new File[] { tarballFile }; + File rsyncFile = Paths.get(recentPathName, RELAY_DESCRIPTORS, "certs", + tarballFile.getName()).toFile(); + File[] outputFiles = new File[] { tarballFile, rsyncFile }; if (this.store(Annotation.Cert.bytes(), data, outputFiles, null)) { this.storedCertsCounter++; } diff --git a/src/main/java/org/torproject/metrics/collector/sync/SyncPersistence.java b/src/main/java/org/torproject/metrics/collector/sync/SyncPersistence.java index e8f780e..ba06bd1 100644 --- a/src/main/java/org/torproject/metrics/collector/sync/SyncPersistence.java +++ b/src/main/java/org/torproject/metrics/collector/sync/SyncPersistence.java @@ -10,6 +10,7 @@ import org.torproject.descriptor.BridgePoolAssignment; import org.torproject.descriptor.BridgeServerDescriptor; import org.torproject.descriptor.BridgedbMetrics; import org.torproject.descriptor.Descriptor; +import org.torproject.descriptor.DirectoryKeyCertificate; import org.torproject.descriptor.ExitList; import org.torproject.descriptor.Microdescriptor; import org.torproject.descriptor.RelayExtraInfoDescriptor; @@ -30,6 +31,7 @@ import org.torproject.metrics.collector.persist.BridgeServerDescriptorPersistenc import org.torproject.metrics.collector.persist.BridgedbMetricsPersistence; import org.torproject.metrics.collector.persist.ConsensusPersistence; import org.torproject.metrics.collector.persist.DescriptorPersistence; +import org.torproject.metrics.collector.persist.DirectoryKeyCertificatePersistence; import org.torproject.metrics.collector.persist.ExitlistPersistence; import org.torproject.metrics.collector.persist.ExtraInfoPersistence; import org.torproject.metrics.collector.persist.MicroConsensusPersistence; @@ -108,6 +110,10 @@ public class SyncPersistence { descPersist = new MicroConsensusPersistence(cons, received); } break; + case "DirectoryKeyCertificate": + descPersist = new DirectoryKeyCertificatePersistence( + (DirectoryKeyCertificate) desc); + break; case "RelayServerDescriptor": descPersist = new ServerDescriptorPersistence( (RelayServerDescriptor) desc, received);

1 0

[translation/support-portal_completed] https://gitweb.torproject.org/translation.git/commit/?h=support-portal_completed
by translation＠torproject.org 14 Dec '20

14 Dec '20

commit 5e74dca7f0e6cf4534b0251ae728f7dc0e585cd0 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 14 09:18:23 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal_comp… --- contents+es-AR.po | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 79 insertions(+), 2 deletions(-) diff --git a/contents+es-AR.po b/contents+es-AR.po index 8221a1d3ac..dfdda6c016 100644 --- a/contents+es-AR.po +++ b/contents+es-AR.po @@ -7664,6 +7664,9 @@ msgid "" "total amount of bytes served for a week (that resets every Wednesday at " "10:00am), you would use:" msgstr "" +"Esto especifica cuándo debiera restablecerse la contabilidad. Por ejemplo, " +"para configurar una cantidad total de bytes servidos por una semana (que se " +"restablece cada miércoles a las 10:00), usarías:" #: https//support.torproject.org/operators/limit-total-bandwidth/ #: (content/operators/limit-total-bandwidth/contents+en.lrquestion.description) @@ -7682,6 +7685,8 @@ msgid "" "accounting period, and the maximum amount of data your relay will receive " "during an account period." msgstr "" +"Esto especifica tanto la máxima cantidad de datos que tu repetidor va a " +"enviar como la que va a recibir durante un periodo de contabilidad." #: https//support.torproject.org/operators/limit-total-bandwidth/ #: (content/operators/limit-total-bandwidth/contents+en.lrquestion.description) @@ -7689,6 +7694,8 @@ msgid "" "When the accounting period resets (from AccountingStart), then the counters " "for AccountingMax are reset to 0." msgstr "" +"Cuando el periodo de contabilidad se restablece (desde AccountingStart), " +"entonces los contadores para AccountingMax son restablecidos a 0." #: https//support.torproject.org/operators/limit-total-bandwidth/ #: (content/operators/limit-total-bandwidth/contents+en.lrquestion.description) @@ -7696,6 +7703,8 @@ msgid "" "Example: Let's say you want to allow 50 GB of traffic every day in each " "direction and the accounting should reset at noon each day:" msgstr "" +"Ejemplo: Digamos que querés permitir 50 GB de tráfico cada día en cada " +"dirección, y la contabilidad debiera restablecerse al mediodía cada día:" #: https//support.torproject.org/operators/limit-total-bandwidth/ #: (content/operators/limit-total-bandwidth/contents+en.lrquestion.description) @@ -7713,6 +7722,8 @@ msgid "" "Note that your relay won't wake up exactly at the beginning of each " "accounting period." msgstr "" +"Tené en cuenta que tu repetidor no va a despertar exactamente al principio " +"de cada periodo de contabilidad." #: https//support.torproject.org/operators/limit-total-bandwidth/ #: (content/operators/limit-total-bandwidth/contents+en.lrquestion.description) @@ -7720,6 +7731,8 @@ msgid "" "It will keep track of how quickly it used its quota in the last period, and " "choose a random point in the new interval to wake up." msgstr "" +"Va a monitorear qué tan rápidamente usó su cuota en el último periodo, y va " +"a elegir un punto al azar en el nuevo intervalo para despertar." #: https//support.torproject.org/operators/limit-total-bandwidth/ #: (content/operators/limit-total-bandwidth/contents+en.lrquestion.description) @@ -7727,6 +7740,8 @@ msgid "" "This way we avoid having hundreds of relays working at the beginning of each" " month but none still up by the end." msgstr "" +"De esta manera evitamos tener cientos de repetidores funcionando al " +"principio de cada mes, pero ninguno a fin de mes." #: https//support.torproject.org/operators/limit-total-bandwidth/ #: (content/operators/limit-total-bandwidth/contents+en.lrquestion.description) @@ -7735,6 +7750,10 @@ msgid "" "connection speed, we recommend you use daily accounting, so you don't end up" " using your entire monthly quota in the first day." msgstr "" +"Si tenés solamente una cantidad chica de ancho de banda para donar comparada" +" con la velocidad de tu conexión, te recomendamos que usés contabilidad " +"diaria, para que no terminés usando la cuota completa del mes en el primer " +"día." #: https//support.torproject.org/operators/limit-total-bandwidth/ #: (content/operators/limit-total-bandwidth/contents+en.lrquestion.description) @@ -7743,6 +7762,10 @@ msgid "" " to spread your usefulness over more of the day: if you want to offer X GB " "in each direction, you could set your RelayBandwidthRate to 20*X KBytes." msgstr "" +"Solo dividí tu cantidad mensual por 30. También podrías considerar la " +"limitación de la tasa para dispersar tu utilidad sobre más del día: si " +"querés ofrecer X GB en cada dirección, podrías establecer tu " +"RelayBandwidthRate a 20*X KBytes." #: https//support.torproject.org/operators/limit-total-bandwidth/ #: (content/operators/limit-total-bandwidth/contents+en.lrquestion.description) @@ -7751,6 +7774,9 @@ msgid "" "RelayBandwidthRate to 1000 KBytes: this way your relay will always be useful" " for at least half of each day." msgstr "" +"Por ejemplo, si tenés 50 GB para ofrecer para cada lado, podrías establecer " +"tu RelayBandwidthRate a 1000 KBytes: de esta manera, tu repetidor siempre va" +" a ser útil por al menos la mitad de cada día." #: https//support.torproject.org/operators/limit-total-bandwidth/ #: (content/operators/limit-total-bandwidth/contents+en.lrquestion.description) @@ -7767,11 +7793,13 @@ msgstr "RelayBandwidthRate 1000 KBytes" msgid "" "RelayBandwidthBurst 5000 KBytes # allow higher bursts but maintain average" msgstr "" +"RelayBandwidthBurst 5000 KBytes # permite picos más altos pero mantiene el " +"promedio" #: https//support.torproject.org/operators/multiple-relays/ #: (content/operators/multiple-relays/contents+en.lrquestion.title) msgid "I want to run more than one Tor relay." -msgstr "" +msgstr "Quiero correr más de un repetidor Tor." #: https//support.torproject.org/operators/multiple-relays/ #: (content/operators/multiple-relays/contents+en.lrquestion.description) @@ -7779,6 +7807,8 @@ msgid "" "Great. If you want to run several relays to donate more to the network, " "we're happy with that." msgstr "" +"Bárbaro. Si querés correr varios repetidores para donar más a la red, eso " +"nos hace felices." #: https//support.torproject.org/operators/multiple-relays/ #: (content/operators/multiple-relays/contents+en.lrquestion.description) @@ -7786,6 +7816,8 @@ msgid "" "But please don't run more than a few dozen on the same network, since part " "of the goal of the Tor network is dispersal and diversity." msgstr "" +"Pero por favor no corras más que unas pocas docenas sobre la misma red, ya " +"que parte del objetivo de la red Tor es la dispersión y la diversidad." #: https//support.torproject.org/operators/multiple-relays/ #: (content/operators/multiple-relays/contents+en.lrquestion.description) @@ -7794,6 +7826,9 @@ msgid "" "config option in the torrc of each relay, listing all the relays (comma-" "separated) that are under your control:" msgstr "" +"Si decidís correr más de un repetidor, por favor establecé la opción de " +"configuración \"MyFamily\" en el torrc de cada repetidor, listando a todos " +"(separados por coma) los que están bajo tu control:" #: https//support.torproject.org/operators/multiple-relays/ #: (content/operators/multiple-relays/contents+en.lrquestion.description) @@ -7806,6 +7841,8 @@ msgid "" "where each fingerprint is the 40 character identity fingerprint (without " "spaces)." msgstr "" +"donde cada huella digital es una cadena de 40 caracteres con la identidad " +"del repetidor (sin espacios)." #: https//support.torproject.org/operators/multiple-relays/ #: (content/operators/multiple-relays/contents+en.lrquestion.description) @@ -7813,6 +7850,8 @@ msgid "" "That way, Tor clients will know to avoid using more than one of your relays " "in a single circuit." msgstr "" +"De esa manera, los clientes Tor van a saber evitar el uso de más de uno de " +"tus repetidores en un circuito único." #: https//support.torproject.org/operators/multiple-relays/ #: (content/operators/multiple-relays/contents+en.lrquestion.description) @@ -7821,11 +7860,16 @@ msgid "" "or of their network, even if they're not all in the same geographic " "location." msgstr "" +"Deberías establecer MyFamily si tenés control administrativo de las " +"computadoras o su red, aún si no están todas en la misma ubicación " +"geográfica." #: https//support.torproject.org/operators/my-relay-got-guard-flag-traffic-dropped/ #: (content/operators/my-relay-got-guard-flag-traffic-dropped/contents+en.lrquestion.title) msgid "My relay recently got the Guard flag and traffic dropped by half." msgstr "" +"Mi repetidor fue marcado recientemente como Guardián, y el tráfico cayó a la" +" mitad." #: https//support.torproject.org/operators/my-relay-got-guard-flag-traffic-dropped/ #: (content/operators/my-relay-got-guard-flag-traffic-dropped/contents+en.lrquestion.description) @@ -7834,6 +7878,9 @@ msgid "" "not many clients have rotated their existing guards out to use it as a guard" " yet." msgstr "" +"Ya que desde ahora es guardián, los clientes lo están usando menos en otras " +"posiciones, pero aún no muchos clientes han rotado sus guardianes existentes" +" para usarlo como guardián." #: https//support.torproject.org/operators/my-relay-got-guard-flag-traffic-dropped/ #: (content/operators/my-relay-got-guard-flag-traffic-dropped/contents+en.lrquestion.description) @@ -7843,16 +7890,22 @@ msgid "" "Understanding and Improving Entry Guard Selection in " "Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)." msgstr "" +"Leé más detalles en este [posteo blog](https://blog.torproject.org/blog" +"/lifecycle-of-a-new-relay) o en [Cambio de los Guardianes: Un Marco de " +"Trabajo para Entender y Mejorar la Selección del Guardián de Entrada en " +"Tor](https://www.freehaven.net/anonbib/cache/wpes12-cogs.pdf)." #: https//support.torproject.org/operators/offline-ed25519/ #: (content/operators/offline-ed25519/contents+en.lrquestion.title) msgid "How do offline ed25519 identity keys work? What do I need to know?" msgstr "" +"¿Cómo funcionan las claves de identidad ed25519 fuera de línea? ¿Qué " +"necesito saber?" #: https//support.torproject.org/operators/offline-ed25519/ #: (content/operators/offline-ed25519/contents+en.lrquestion.description) msgid "In simple words, it works like this:" -msgstr "" +msgstr "En palabras simples, funciona así:" #: https//support.torproject.org/operators/offline-ed25519/ #: (content/operators/offline-ed25519/contents+en.lrquestion.description) @@ -7860,6 +7913,8 @@ msgid "" "* There is a master ed25519 identity secret key file named " "\"ed25519_master_id_secret_key\"." msgstr "" +"* Hay un archivo para la clave secreta de identidad maestra ed25519, llamado" +" \"ed25519_master_id_secret_key\"." #: https//support.torproject.org/operators/offline-ed25519/ #: (content/operators/offline-ed25519/contents+en.lrquestion.description) @@ -7867,6 +7922,9 @@ msgid "" "This is the most important one, so make sure you keep a backup in a secure " "place - the file is sensitive and should be protected." msgstr "" +"Este es el más importante, por lo que asegurate de mantener una copia de " +"seguridad en un lugar seguro - el archivo tiene información delicada y " +"debería ser protegido." #: https//support.torproject.org/operators/offline-ed25519/ #: (content/operators/offline-ed25519/contents+en.lrquestion.description) @@ -7874,6 +7932,8 @@ msgid "" "Tor could encrypt it for you if you generate it manually and enter a " "password when asked." msgstr "" +"Tor podría encriptarlo por vos si lo generaste manualmente, e ingresar una " +"contraseña cuando se te solicite." #: https//support.torproject.org/operators/offline-ed25519/ #: (content/operators/offline-ed25519/contents+en.lrquestion.description) @@ -7881,6 +7941,8 @@ msgid "" "* A medium term signing key named \"ed25519_signing_secret_key\" is " "generated for Tor to use." msgstr "" +"* Una clave de firma de medio término llamada \"ed25519_signing_secret_key\"" +" es generada por Tor para usarla." #: https//support.torproject.org/operators/offline-ed25519/ #: (content/operators/offline-ed25519/contents+en.lrquestion.description) @@ -7889,6 +7951,10 @@ msgid "" "signed by the master identity secret key and confirms that the medium term " "signing key is valid for a certain period of time." msgstr "" +"También es generado un certificado, llamado \"ed25519_signing_cert\", el " +"cual es firmado por la clave secreta de la identidad maestra, y confirma que" +" la clave de firma de medio término es válida por un cierto periodo de " +"tiempo." #: https//support.torproject.org/operators/offline-ed25519/ #: (content/operators/offline-ed25519/contents+en.lrquestion.description) @@ -7896,6 +7962,8 @@ msgid "" "The default validity is 30 days, but this can be customized by setting " "\"SigningKeyLifetime N days|weeks|months\" in torrc." msgstr "" +"La validez por defecto es 30 días, pero esto puede ser personalizado " +"ajustando \"SigningKeyLifetime N days|weeks|months\" en torrc." #: https//support.torproject.org/operators/offline-ed25519/ #: (content/operators/offline-ed25519/contents+en.lrquestion.description) @@ -7903,6 +7971,9 @@ msgid "" "* There is also a master public key named \"ed25519_master_id_public_key, " "which is the actual identity of the relay advertised in the network." msgstr "" +"* También hay una clave pública maestra llamada " +"\"ed25519_master_id_public_key, la cual es la identidad real del repetidor, " +"publicada en la red." #: https//support.torproject.org/operators/offline-ed25519/ #: (content/operators/offline-ed25519/contents+en.lrquestion.description) @@ -7910,6 +7981,8 @@ msgid "" "This one is not sensitive and can be easily computed from " "\"ed5519_master_id_secret_key\"." msgstr "" +"Esta no tiene información delicada, y puede ser computada fácilmente a " +"partir de \"ed5519_master_id_secret_key\"." #: https//support.torproject.org/operators/offline-ed25519/ #: (content/operators/offline-ed25519/contents+en.lrquestion.description) @@ -7918,6 +7991,10 @@ msgid "" "long as they are valid, so the master identity secret key can be kept " "outside DataDirectory/keys, on a storage media or a different computer." msgstr "" +"Tor solamente necesitará acceso a la clave de firma de medio término y el " +"certificado en la medida en que sean válidos, por lo que la clave secreta de" +" la identidad maestra puede ser mantenida fuera de DataDirectory/keys, en un" +" medio de almacenamiento o una computadora diferente." #: https//support.torproject.org/operators/offline-ed25519/ #: (content/operators/offline-ed25519/contents+en.lrquestion.description)

1 0

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

14 Dec '20

commit 99105cf2fe679a41f14d4d7d8fdd78dd7948b0c5 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 14 09:18:17 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+es-AR.po | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/contents+es-AR.po b/contents+es-AR.po index d682964669..d8562b3b20 100644 --- a/contents+es-AR.po +++ b/contents+es-AR.po @@ -7685,8 +7685,8 @@ msgid "" "accounting period, and the maximum amount of data your relay will receive " "during an account period." msgstr "" -"Esto especifica tanto la máxima cantidad de datos que tu repetidor enviará " -"como la que recibirá durante un periodo de contabilidad." +"Esto especifica tanto la máxima cantidad de datos que tu repetidor va a " +"enviar como la que va a recibir durante un periodo de contabilidad." #: https//support.torproject.org/operators/limit-total-bandwidth/ #: (content/operators/limit-total-bandwidth/contents+en.lrquestion.description) @@ -7731,8 +7731,8 @@ msgid "" "It will keep track of how quickly it used its quota in the last period, and " "choose a random point in the new interval to wake up." msgstr "" -"Monitoreará qué tan rápidamente usó su cuota en el últino periodo, y elegirá" -" un punto al azar en el nuevo intervalo para despertar." +"Va a monitorear qué tan rápidamente usó su cuota en el último periodo, y va " +"a elegir un punto al azar en el nuevo intervalo para despertar." #: https//support.torproject.org/operators/limit-total-bandwidth/ #: (content/operators/limit-total-bandwidth/contents+en.lrquestion.description) @@ -7775,8 +7775,8 @@ msgid "" " for at least half of each day." msgstr "" "Por ejemplo, si tenés 50 GB para ofrecer para cada lado, podrías establecer " -"tu RelayBandwidthRate a 1000 KBytes: de esta manera, tu repetidor siempre " -"será útil por al menos la mitad de cada día." +"tu RelayBandwidthRate a 1000 KBytes: de esta manera, tu repetidor siempre va" +" a ser útil por al menos la mitad de cada día." #: https//support.torproject.org/operators/limit-total-bandwidth/ #: (content/operators/limit-total-bandwidth/contents+en.lrquestion.description) @@ -7807,8 +7807,8 @@ msgid "" "Great. If you want to run several relays to donate more to the network, " "we're happy with that." msgstr "" -"Bárbaro. Si querés correr varios repetidores para donar más a la red, " -"estamos felices con eso." +"Bárbaro. Si querés correr varios repetidores para donar más a la red, eso " +"nos hace felices." #: https//support.torproject.org/operators/multiple-relays/ #: (content/operators/multiple-relays/contents+en.lrquestion.description) @@ -7841,7 +7841,7 @@ msgid "" "where each fingerprint is the 40 character identity fingerprint (without " "spaces)." msgstr "" -"Donde cada huella digital es una cadena de 40 caracteres con la identidad " +"donde cada huella digital es una cadena de 40 caracteres con la identidad " "del repetidor (sin espacios)." #: https//support.torproject.org/operators/multiple-relays/ @@ -7850,8 +7850,8 @@ msgid "" "That way, Tor clients will know to avoid using more than one of your relays " "in a single circuit." msgstr "" -"De esa manera, los clientes Tor sabrán evitar el uso de más de uno de tus " -"repetidores en un circuito único." +"De esa manera, los clientes Tor van a saber evitar el uso de más de uno de " +"tus repetidores en un circuito único." #: https//support.torproject.org/operators/multiple-relays/ #: (content/operators/multiple-relays/contents+en.lrquestion.description) @@ -7860,7 +7860,7 @@ msgid "" "or of their network, even if they're not all in the same geographic " "location." msgstr "" -"Debieras establecer MyFamily si tenés control administrativo de las " +"Deberías establecer MyFamily si tenés control administrativo de las " "computadoras o su red, aún si no están todas en la misma ubicación " "geográfica." @@ -7879,7 +7879,7 @@ msgid "" " yet." msgstr "" "Ya que desde ahora es guardián, los clientes lo están usando menos en otras " -"posiciones, pero no muchos clientes han rotado sus guardianes existentes aún" +"posiciones, pero aún no muchos clientes han rotado sus guardianes existentes" " para usarlo como guardián." #: https//support.torproject.org/operators/my-relay-got-guard-flag-traffic-dropped/ @@ -7899,7 +7899,7 @@ msgstr "" #: (content/operators/offline-ed25519/contents+en.lrquestion.title) msgid "How do offline ed25519 identity keys work? What do I need to know?" msgstr "" -"¿Cómo funcionan las claves de identidad fuera de línea ed25519? ¿Qué " +"¿Cómo funcionan las claves de identidad ed25519 fuera de línea? ¿Qué " "necesito saber?" #: https//support.torproject.org/operators/offline-ed25519/ @@ -7923,8 +7923,8 @@ msgid "" "place - the file is sensitive and should be protected." msgstr "" "Este es el más importante, por lo que asegurate de mantener una copia de " -"seguridad en un lugar seguro - el archivo es delicado y debiera ser " -"protegido." +"seguridad en un lugar seguro - el archivo tiene información delicada y " +"debería ser protegido." #: https//support.torproject.org/operators/offline-ed25519/ #: (content/operators/offline-ed25519/contents+en.lrquestion.description) @@ -7981,8 +7981,8 @@ msgid "" "This one is not sensitive and can be easily computed from " "\"ed5519_master_id_secret_key\"." msgstr "" -"Esta no es delicada, y puede ser computada fácilmente a partir de " -"\"ed5519_master_id_secret_key\"." +"Esta no tiene información delicada, y puede ser computada fácilmente a " +"partir de \"ed5519_master_id_secret_key\"." #: https//support.torproject.org/operators/offline-ed25519/ #: (content/operators/offline-ed25519/contents+en.lrquestion.description)

1 0

[collector/master] Include microdescriptors when syncing.
by karsten＠torproject.org 14 Dec '20

14 Dec '20

commit a1b8ebb9545b148524c6e3db2a1601f228784905 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Dec 9 22:01:21 2020 +0100 Include microdescriptors when syncing. --- CHANGELOG.md | 3 ++ build.xml | 2 +- .../persist/MicrodescriptorPersistence.java | 36 ++++++++++++++++++++++ .../collector/relaydescs/ArchiveWriter.java | 11 +++++-- .../metrics/collector/sync/SyncPersistence.java | 10 ++++++ 5 files changed, 58 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2928937..22d3517 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ - Clean up descriptors written to the `out/` directory by deleting files that are older than seven weeks. - Correctly index files that are moved away and back. + - Include microdescriptors when syncing from another CollecTor + instance. + - Update to metrics-lib 2.15.0. # Changes in version 1.16.1 - 2020-08-16 diff --git a/build.xml b/build.xml index 5dcb29d..f2bda4e 100644 --- a/build.xml +++ b/build.xml @@ -12,7 +12,7 @@ <property name="release.version" value="1.16.1-dev" /> <property name="project-main-class" value="org.torproject.metrics.collector.Main" /> <property name="name" value="collector"/> - <property name="metricslibversion" value="2.14.0" /> + <property name="metricslibversion" value="2.15.0" /> <property name="jarincludes" value="collector.properties logback.xml" /> <patternset id="runtime" > diff --git a/src/main/java/org/torproject/metrics/collector/persist/MicrodescriptorPersistence.java b/src/main/java/org/torproject/metrics/collector/persist/MicrodescriptorPersistence.java new file mode 100644 index 0000000..41929af --- /dev/null +++ b/src/main/java/org/torproject/metrics/collector/persist/MicrodescriptorPersistence.java @@ -0,0 +1,36 @@ +/* Copyright 2020 The Tor Project + * See LICENSE for licensing information */ + +package org.torproject.metrics.collector.persist; + +import org.torproject.descriptor.Microdescriptor; +import org.torproject.metrics.collector.conf.Annotation; + +import java.nio.file.Paths; + +public class MicrodescriptorPersistence + extends DescriptorPersistence<Microdescriptor> { + + private static final String RELAY_DESCRIPTORS = "relay-descriptors"; + + public MicrodescriptorPersistence(Microdescriptor descriptor, long received, + String year, String month) { + super(descriptor, Annotation.Microdescriptor.bytes()); + calculatePaths(received, year, month); + } + + private void calculatePaths(long received, String year, String month) { + String file = PersistenceUtils.dateTime(received); + this.recentPath = Paths.get( + RELAY_DESCRIPTORS, MICRODESCS, "micro", + file + "-micro-" + year + "-" + month).toString(); + String digest = desc.getDigestSha256Hex(); + this.storagePath = Paths.get( + RELAY_DESCRIPTORS, + MICRODESC, year, month, "micro", + digest.substring(0,1), + digest.substring(1,2), + digest).toString(); + } +} + 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 28472f8..5c58f23 100644 --- a/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java @@ -7,6 +7,7 @@ import org.torproject.descriptor.BandwidthFile; import org.torproject.descriptor.Descriptor; import org.torproject.descriptor.DescriptorParser; import org.torproject.descriptor.DescriptorSourceFactory; +import org.torproject.descriptor.Microdescriptor; import org.torproject.descriptor.RelayExtraInfoDescriptor; import org.torproject.descriptor.RelayNetworkStatusConsensus; import org.torproject.descriptor.RelayNetworkStatusVote; @@ -109,6 +110,8 @@ public class ArchiveWriter extends CollecTorMain { this.mapPathDescriptors.put( "recent/relay-descriptors/microdescs/consensus-microdesc", RelayNetworkStatusConsensus.class); + this.mapPathDescriptors.put("recent/relay-descriptors/microdescs/micro/", + Microdescriptor.class); this.mapPathDescriptors.put("recent/relay-descriptors/server-descriptors", RelayServerDescriptor.class); this.mapPathDescriptors.put("recent/relay-descriptors/extra-infos", @@ -801,15 +804,17 @@ public class ArchiveWriter extends CollecTorMain { * file written in the first call. However, this method must be * called twice to store the same microdescriptor in two different * valid-after months. */ - SimpleDateFormat descriptorFormat = new SimpleDateFormat("yyyy/MM/"); + SimpleDateFormat descriptorFormat = new SimpleDateFormat("yyyy-MM"); + String[] yearMonth = descriptorFormat.format(validAfter).split("-"); File tarballFile = Paths.get(this.outputDirectory, MICRODESC, - descriptorFormat.format(validAfter), MICRO, + yearMonth[0], yearMonth[1], MICRO, microdescriptorDigest.substring(0, 1), microdescriptorDigest.substring(1, 2), microdescriptorDigest).toFile(); boolean tarballFileExistedBefore = tarballFile.exists(); File rsyncCatFile = Paths.get(recentPathName, RELAY_DESCRIPTORS, - MICRODESCS, MICRO, this.rsyncCatString + "-micro.tmp").toFile(); + MICRODESCS, MICRO, this.rsyncCatString + "-micro-" + yearMonth[0] + "-" + + yearMonth[1] + ".tmp").toFile(); File[] outputFiles = new File[] { tarballFile, rsyncCatFile }; boolean[] append = new boolean[] { false, true }; if (this.store(Annotation.Microdescriptor.bytes(), data, outputFiles, diff --git a/src/main/java/org/torproject/metrics/collector/sync/SyncPersistence.java b/src/main/java/org/torproject/metrics/collector/sync/SyncPersistence.java index bbb61b7..e8f780e 100644 --- a/src/main/java/org/torproject/metrics/collector/sync/SyncPersistence.java +++ b/src/main/java/org/torproject/metrics/collector/sync/SyncPersistence.java @@ -11,6 +11,7 @@ import org.torproject.descriptor.BridgeServerDescriptor; import org.torproject.descriptor.BridgedbMetrics; import org.torproject.descriptor.Descriptor; import org.torproject.descriptor.ExitList; +import org.torproject.descriptor.Microdescriptor; import org.torproject.descriptor.RelayExtraInfoDescriptor; import org.torproject.descriptor.RelayNetworkStatusConsensus; import org.torproject.descriptor.RelayNetworkStatusVote; @@ -32,6 +33,7 @@ import org.torproject.metrics.collector.persist.DescriptorPersistence; import org.torproject.metrics.collector.persist.ExitlistPersistence; import org.torproject.metrics.collector.persist.ExtraInfoPersistence; import org.torproject.metrics.collector.persist.MicroConsensusPersistence; +import org.torproject.metrics.collector.persist.MicrodescriptorPersistence; import org.torproject.metrics.collector.persist.OnionPerfPersistence; import org.torproject.metrics.collector.persist.PersistenceUtils; import org.torproject.metrics.collector.persist.ServerDescriptorPersistence; @@ -118,6 +120,14 @@ public class SyncPersistence { descPersist = new ExtraInfoPersistence( (RelayExtraInfoDescriptor) desc, received); break; + case "Microdescriptor": + if (filename.contains("-micro-")) { + String[] yearMonth = filename.substring( + filename.indexOf("-micro-") + 7).split("-"); + descPersist = new MicrodescriptorPersistence((Microdescriptor) desc, + received, yearMonth[0], yearMonth[1]); + } + break; case "BridgeNetworkStatus": // need to infer authId from filename String[] filenameParts = filename.split(DASH); if (filenameParts.length < 3) {

1 0

[collector/master] Add log statement for current memory usage.
by karsten＠torproject.org 14 Dec '20

14 Dec '20

commit bddc73ce6700a1498cbffb294de135949d02a41d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Dec 10 22:08:42 2020 +0100 Add log statement for current memory usage. --- .../org/torproject/metrics/collector/indexer/CreateIndexJson.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/org/torproject/metrics/collector/indexer/CreateIndexJson.java b/src/main/java/org/torproject/metrics/collector/indexer/CreateIndexJson.java index 3d86947..887a3e1 100644 --- a/src/main/java/org/torproject/metrics/collector/indexer/CreateIndexJson.java +++ b/src/main/java/org/torproject/metrics/collector/indexer/CreateIndexJson.java @@ -245,6 +245,10 @@ public class CreateIndexJson extends CollecTorMain { logger.info("Writing uncompressed and compressed index.json files to " + "disk."); this.writeIndex(this.index, now); + Runtime rt = Runtime.getRuntime(); + logger.info("Current memory usage is: free = {} B, total = {} B, " + + "max = {} B.", + rt.freeMemory(), rt.totalMemory(), rt.maxMemory()); logger.info("Pausing until next index update run."); } catch (IOException e) { logger.error("I/O error while updating index.json files. Trying again in "

1 0

[collector/master] Fix a few paths for cleaning up.
by karsten＠torproject.org 14 Dec '20

14 Dec '20

commit 4879cdc219c797e3e0a54226978462fe67d7cf3b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Dec 11 16:55:37 2020 +0100 Fix a few paths for cleaning up. --- .../metrics/collector/bridgedb/BridgedbMetricsProcessor.java | 6 ++++-- .../metrics/collector/bridgedescs/SanitizedBridgesWriter.java | 6 ++++-- .../metrics/collector/snowflake/SnowflakeStatsDownloader.java | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/torproject/metrics/collector/bridgedb/BridgedbMetricsProcessor.java b/src/main/java/org/torproject/metrics/collector/bridgedb/BridgedbMetricsProcessor.java index d05aa9c..94f697e 100644 --- a/src/main/java/org/torproject/metrics/collector/bridgedb/BridgedbMetricsProcessor.java +++ b/src/main/java/org/torproject/metrics/collector/bridgedb/BridgedbMetricsProcessor.java @@ -178,9 +178,11 @@ public class BridgedbMetricsProcessor extends CollecTorMain { * in the last three days (seven weeks). */ private void cleanUpDirectories() { - PersistenceUtils.cleanDirectory(Paths.get(this.recentPathName), + PersistenceUtils.cleanDirectory( + Paths.get(this.recentPathName).resolve("bridgedb-metrics"), Instant.now().minus(3, ChronoUnit.DAYS).toEpochMilli()); - PersistenceUtils.cleanDirectory(Paths.get(this.outputPathName), + PersistenceUtils.cleanDirectory( + Paths.get(this.outputPathName).resolve("bridgedb-metrics"), Instant.now().minus(49, ChronoUnit.DAYS).toEpochMilli()); } } 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 7619453..ffafdea 100644 --- a/src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java +++ b/src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java @@ -449,9 +449,11 @@ public class SanitizedBridgesWriter extends CollecTorMain { * in the last three days (seven weeks), and remove the .tmp extension from * newly written files. */ private void cleanUpDirectories() { - PersistenceUtils.cleanDirectory(this.recentDirectory, + PersistenceUtils.cleanDirectory( + this.recentDirectory.resolve("bridge-descriptors"), Instant.now().minus(3, ChronoUnit.DAYS).toEpochMilli()); - PersistenceUtils.cleanDirectory(this.outputDirectory, + PersistenceUtils.cleanDirectory( + this.outputDirectory.resolve("bridge-descriptors"), Instant.now().minus(49, ChronoUnit.DAYS).toEpochMilli()); } } diff --git a/src/main/java/org/torproject/metrics/collector/snowflake/SnowflakeStatsDownloader.java b/src/main/java/org/torproject/metrics/collector/snowflake/SnowflakeStatsDownloader.java index 93388d5..c9b6b03 100644 --- a/src/main/java/org/torproject/metrics/collector/snowflake/SnowflakeStatsDownloader.java +++ b/src/main/java/org/torproject/metrics/collector/snowflake/SnowflakeStatsDownloader.java @@ -156,9 +156,11 @@ public class SnowflakeStatsDownloader extends CollecTorMain { /** Delete all files from the rsync (out) directory that have not been * modified in the last three days (seven weeks). */ private void cleanUpDirectories() { - PersistenceUtils.cleanDirectory(Paths.get(this.recentPathName), + PersistenceUtils.cleanDirectory( + Paths.get(this.recentPathName, "snowflakes"), Instant.now().minus(3, ChronoUnit.DAYS).toEpochMilli()); - PersistenceUtils.cleanDirectory(Paths.get(this.outputPathName), + PersistenceUtils.cleanDirectory( + Paths.get(this.outputPathName, "snowflakes"), Instant.now().minus(49, ChronoUnit.DAYS).toEpochMilli()); } }

1 0

[collector/master] Make sure that the DirectoryStream gets closed.
by karsten＠torproject.org 14 Dec '20

14 Dec '20

commit 83850daa9de893cf2d7f846e67191a469cc64900 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Dec 5 22:22:22 2020 +0100 Make sure that the DirectoryStream gets closed. As the docs say, "If timely disposal of file system resources is required, the try-with-resources construct should be used to ensure that the stream's close method is invoked after the stream operations are completed." Turns out that without closing the stream, the JVM runs out of memory pretty quickly. Doing this is not optional but mandatory. --- .../torproject/metrics/collector/persist/PersistenceUtils.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) 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 2b7621d..1dc36d6 100644 --- a/src/main/java/org/torproject/metrics/collector/persist/PersistenceUtils.java +++ b/src/main/java/org/torproject/metrics/collector/persist/PersistenceUtils.java @@ -20,6 +20,7 @@ import java.nio.file.attribute.BasicFileAttributes; import java.text.SimpleDateFormat; import java.time.Instant; import java.util.Date; +import java.util.stream.Stream; public class PersistenceUtils { @@ -132,9 +133,12 @@ public class PersistenceUtils { @Override public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException { - if (!pathToClean.equals(dir) - && !Files.list(dir).findFirst().isPresent()) { - Files.delete(dir); + if (!pathToClean.equals(dir)) { + try (Stream<Path> files = Files.list(dir)) { + if (!files.findFirst().isPresent()) { + Files.delete(dir); + } + } } return FileVisitResult.CONTINUE; }

1 0

[collector/master] Only clean up a single time during sync.
by karsten＠torproject.org 14 Dec '20

14 Dec '20

commit 5e5a7d1dfa30ffaf0a27ea4e246de5bef30d1cbc Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Dec 11 16:55:58 2020 +0100 Only clean up a single time during sync. --- src/main/java/org/torproject/metrics/collector/sync/SyncManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/metrics/collector/sync/SyncManager.java b/src/main/java/org/torproject/metrics/collector/sync/SyncManager.java index 1fa1347..8e9c7d3 100644 --- a/src/main/java/org/torproject/metrics/collector/sync/SyncManager.java +++ b/src/main/java/org/torproject/metrics/collector/sync/SyncManager.java @@ -108,11 +108,11 @@ public class SyncManager { persist.storeDesc(desc, collectionDate.getTime()); } - persist.cleanDirectory(); descriptorReader.saveHistoryFile(historyFile); } logger.info("Done merging {} from {}.", marker, source.getHost()); } + persist.cleanDirectory(); } }

1 0

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

14 Dec '20

commit d130feac0445a202ebf4f35ddd16f5a462eb19df Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 14 05:48:30 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ru.po | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/contents+ru.po b/contents+ru.po index b2525b66b3..a35966f0b4 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -2269,7 +2269,7 @@ msgstr "" #: (content/faq/staying-anonymous/contents+en.lrquestion.description) msgid "### Use Tor Browser and software specifically configured for Tor." msgstr "" -"### Используйте Tor Browser и программы, специально настроенные для Tor." +"### Используйте Tor Browser и программы, специально настроенные для Tor" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) @@ -2323,7 +2323,7 @@ msgstr "- Небезопасно: [BitTorret через Tor](/misc/misc-4)" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) msgid "### Control what information you provide through web forms." -msgstr "### Аккуратнее с информацией, которую вводите в веб-формы." +msgstr "### Аккуратнее с информацией, которую вводите в веб-формы" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) @@ -2552,7 +2552,7 @@ msgstr "" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) msgid "### Use bridges and/or find company" -msgstr "" +msgstr "### Пользуйтесь мостами, находите единомышленников" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) @@ -2560,6 +2560,7 @@ msgid "" "Tor tries to prevent attackers from learning what destination websites you " "connect to." msgstr "" +"Tor старается не дать злоумышленникам понять, какие сайты вы посещаете." #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) @@ -2567,6 +2568,8 @@ msgid "" "However, by default, it does not prevent somebody watching your Internet " "traffic from learning that you're using Tor." msgstr "" +"Но по умолчанию cам факт того, что вы используете Tor, не скрывается от " +"злоумышленника." #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) @@ -2575,6 +2578,9 @@ msgid "" " [bridge](https://tb-manual.torproject.org/bridges/) rather than connecting " "directly to the Tor network." msgstr "" +"Если это для вас проблема, можете снизить риск. Настройте Tor на " +"использование не прямого подключения, а [моста](https://tb-" +"manual.torproject.org/ru/bridges/)" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description)

1 0