[tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
commit d5df636dc10378ac8cc9e45fc4bab2c3d210463d Author: Translation commit bot Date: Tue Dec 15 07:46:49 2020 + https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- hu.po | 284 +- 1 file changed, 142 insertions(+), 142 deletions(-) diff --git a/hu.po b/hu.po index 650209de72..ec5c210f3e 100644 --- a/hu.po +++ b/hu.po @@ -17,8 +17,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-12-04 11:24+0100\n" -"PO-Revision-Date: 2020-12-11 09:16+\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2020-12-15 07:32+\n" +"Last-Translator: vargaviktor \n" "Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -162,7 +162,7 @@ msgstr "nincs elég szabad memória a rendszerben." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:338 #, perl-brace-format msgid "No explanation available for reason '{reason}'." -msgstr "" +msgstr "Nincs elérhetÅ magyarázat erre az okra: '{reason}'." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:359 msgid "The system is up-to-date" @@ -177,14 +177,14 @@ msgstr "A Tails ezen verziója nem naprakész és biztonsági hibákat tartalmaz msgid "" "The available incremental upgrade requires {space_needed} of free space on " "Tails system partition, but only {free_space} is available." -msgstr "" +msgstr "A növekményes frissÃtés {space_needed} szabad helyet igényel a Tails rendszer partÃción, de csak {free_space} elérhetÅ." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:407 #, perl-brace-format msgid "" "The available incremental upgrade requires {memory_needed} of free memory, " "but only {free_memory} is available." -msgstr "" +msgstr "A növekményes frissÃtés {memory_needed} szabad memóriát igényel, de csak {free_memory} memória elérhetÅ." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:426 msgid "" @@ -209,7 +209,7 @@ msgid "" "Download size: {size}\n" "\n" "Do you want to upgrade now?" -msgstr "" +msgstr "FrissÃtenie kell a {name}{version} változatra.\n\nA verzióról további részletekért látogasson el {details_url} oldalra.\n\nAjánlott, hogy becsukjon minden más alkalmazást a frissÃtés idejére.\nA frissÃtés letöltése sokáig is tarthat, néhány perctÅl néhány óráig.\n\nLetöltési méret: {size}\n\nSzeretne frissÃteni most?" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:451 msgid "Upgrade available" @@ -233,7 +233,7 @@ msgid "" "It is not possible to automatically upgrade your device to this new version: {explanation}.\n" "\n" "To learn how to do a manual upgrade, go to {manual_upgrade_url}" -msgstr "" +msgstr "Kézi frissÃtést kellene csinálnia a {name}{version} változatra.\n\nBÅvebb információ az új verzióról itt: {details_url}\n\nNem lehetséges az automatikus frissÃtés az eszközön erre a verzióra: {explanation}.\n\nInformáció a kézzel történÅ frissÃtésrÅl itt: {manual_upgrade_url}" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:471 msgid "New version available" @@ -246,7 +246,7 @@ msgstr "FrissÃtés letöltése" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:554 #, perl-brace-format msgid "Downloading the upgrade to {name} {version}..." -msgstr "" +msgstr "{name} {version} frissÃtés letöltése..." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:614 msgid "" @@ -266,7 +266,7 @@ msgstr "Hiba frissÃtés letöltésekor" msgid "" "Output file '{output_file}' does not exist, but tails-iuk-get-target-file " "did not complain. Please report a bug." -msgstr "" +msgstr "Kimeneti fájl '{output_file}' nem létezik, de tails-iuk-get-target-file nem jelzett hibát. Kérjük jelentse a hibát." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:651 msgid "Error while creating temporary downloading directory" @@ -344,11 +344,11 @@ msgstr "Nem sikerült a hálózat leállÃtása" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:750 msgid "Error while cancelling the upgrade download" -msgstr "" +msgstr "Hiba frissÃtés letöltésének megszakÃtásakor" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:751 msgid "Failed to cancel the upgrade download" -msgstr "" +msgstr "Sikertelen a frissÃtés letöltésének megszakÃtása" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:757 msgid "Upgrading the system" @@ -506,23 +506,23 @@ msgstr "_Billentyűzet kiosztás" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:261 #, python-format msgid "Unable to write on %(device)s, skipping."
[tor-commits] [translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
commit 82da0d2d46c7059883726777f206353379195e06 Author: Translation commit bot Date: Tue Dec 15 07:46:03 2020 + https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- hu.po | 46 +++--- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/hu.po b/hu.po index d69fd5e596..a4ef948a00 100644 --- a/hu.po +++ b/hu.po @@ -17,8 +17,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-12-04 11:24+0100\n" -"PO-Revision-Date: 2020-12-11 09:16+\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2020-12-15 07:32+\n" +"Last-Translator: vargaviktor \n" "Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -184,7 +184,7 @@ msgstr "A növekményes frissÃtés {space_needed} szabad helyet igényel a Tail msgid "" "The available incremental upgrade requires {memory_needed} of free memory, " "but only {free_memory} is available." -msgstr "A jnövekményes frissÃtés {memory_needed} szabad memóriát igényel, de csak {free_memory} memória elérhetÅ." +msgstr "A növekményes frissÃtés {memory_needed} szabad memóriát igényel, de csak {free_memory} memória elérhetÅ." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:426 msgid "" @@ -233,7 +233,7 @@ msgid "" "It is not possible to automatically upgrade your device to this new version: {explanation}.\n" "\n" "To learn how to do a manual upgrade, go to {manual_upgrade_url}" -msgstr "" +msgstr "Kézi frissÃtést kellene csinálnia a {name}{version} változatra.\n\nBÅvebb információ az új verzióról itt: {details_url}\n\nNem lehetséges az automatikus frissÃtés az eszközön erre a verzióra: {explanation}.\n\nInformáció a kézzel történÅ frissÃtésrÅl itt: {manual_upgrade_url}" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:471 msgid "New version available" @@ -344,11 +344,11 @@ msgstr "Nem sikerült a hálózat leállÃtása" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:750 msgid "Error while cancelling the upgrade download" -msgstr "" +msgstr "Hiba frissÃtés letöltésének megszakÃtásakor" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:751 msgid "Failed to cancel the upgrade download" -msgstr "" +msgstr "Sikertelen a frissÃtés letöltésének megszakÃtása" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:757 msgid "Upgrading the system" @@ -550,12 +550,12 @@ msgstr "Nem tudom másolni a %(infile)s a %(outfile)s: %(message)s" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:497 msgid "Removing existing Tails system" -msgstr "" +msgstr "A meglévÅ Tails rendszer eltávolÃtása" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:507 #, python-format msgid "Unable to remove file from previous Tails system: %(message)s" -msgstr "" +msgstr "Sikertelen a fájl eltávolÃtása a korábbi Tails rendszerbÅl: %(message)s" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:514 #, python-format @@ -565,7 +565,7 @@ msgstr "chmod végrehajtása sikertelen %(file)s: %(message)s" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:521 #, python-format msgid "Unable to remove directory from previous Tails system: %(message)s" -msgstr "" +msgstr "Sikertelen a könyvtár eltávolÃtása a korábbi Tails rendszerbÅl: %(message)s" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:569 #, python-format @@ -749,7 +749,7 @@ msgstr "Nincs kiválasztva ISO fájl" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:393 msgid "Please select a Tails ISO image." -msgstr "Kérlek válassz ki egy Tails ISO fájlt." +msgstr "Kérjük válasszon ki egy Tails ISO fájlt." #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:435 msgid "No device suitable to install Tails could be found" @@ -817,7 +817,7 @@ msgid "" "\n" "\n" "The persistent storage on this USB stick will be preserved." -msgstr "\n\nAz állandó tárhely az USB sticken megÅrzésre kerül." +msgstr "\n\nAz állandó tárhely az USB meghajtón megÅrzésre kerül." #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:652 #, python-format @@ -834,7 +834,7 @@ msgstr "A kijelölt fájl nem olvasható. Változtasd meg a jogosultságokat vag msgid "" "Unable to use the selected file. You may have better luck if you move your " "ISO to the root of your drive (ie: C:\\)" -msgstr "Nem tudom használni a kiválasztott fájlt. Szerrencsésebb lenne aaz ISO fájlt a meghatjó gyökerébe
[tor-commits] [translation/fenix-torbrowserstringsxml_completed] https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstringsxml_completed
commit fc825d36dc25219efc388d32ea03729e6811965b Author: Translation commit bot Date: Tue Dec 15 07:45:30 2020 + https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstringsxml_completed --- hu/torbrowser_strings.xml | 24 +++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/hu/torbrowser_strings.xml b/hu/torbrowser_strings.xml index 9abcf8617c..69ae15a432 100644 --- a/hu/torbrowser_strings.xml +++ b/hu/torbrowser_strings.xml @@ -2,6 +2,9 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + +%1$s - készÃti: Tor Project, egy U.S.-bázisú 501(c)(3) nonprofit szervezet. + Csak a privát böngészési mód engedélyezése @@ -20,6 +23,7 @@ Biztonsági szint beállÃtása Néhány web szolgáltatás kikapcsolása, amivel támadhatják, sértve biztonságát és anonimitását. +Jelenlegi Biztonsági Szint: %s Biztonsági beállÃtások megnyitása Támogasson a Tor biztonságáért A Tor ingyenes az Ãnhöz hasonló személyek támogatásai miatt. @@ -54,4 +58,22 @@ ÃjraindÃtás Hidak engedélyezve: %s - + +Biztonsági beállÃtások +Biztonsági szint + + +Normál +Minden Tor BöngészŠés weboldal szolgáltatás engedélyezve. +Biztonságosabb +Azon weboldal szolgáltatások tiltása, amelyek többnyire veszélyesek, ami néhány oldal működésének problémáit okozhatja. +Legbiztonságosabb +Csak azon weboldal szolgáltatások engedélyezése, amelyek a statikus, vagy alap szolgáltatásokhoz szükségesek. Ezek a beállÃtások érintik a képeket, médiákat és scripteket. + + +Igényelje az angol verzióját a weboldalaknak a kibÅvÃtett biztonságért + +Használjon maszkot, használjon Tor-t. +Ãlljon ellen a lehallgatási pandémiának. +A támogatásoddal egyezÅ támogatás ad a Friends of Tor. + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/fenix-torbrowserstringsxml] https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstringsxml
commit e61e2ca896774c62985a83a1ad3f1ebffae3dce9 Author: Translation commit bot Date: Tue Dec 15 07:45:25 2020 + https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstringsxml --- hu/torbrowser_strings.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hu/torbrowser_strings.xml b/hu/torbrowser_strings.xml index 1dcab5b1ea..69ae15a432 100644 --- a/hu/torbrowser_strings.xml +++ b/hu/torbrowser_strings.xml @@ -70,6 +70,9 @@ Legbiztonságosabb Csak azon weboldal szolgáltatások engedélyezése, amelyek a statikus, vagy alap szolgáltatásokhoz szükségesek. Ezek a beállÃtások érintik a képeket, médiákat és scripteket. + +Igényelje az angol verzióját a weboldalaknak a kibÅvÃtett biztonságért + Használjon maszkot, használjon Tor-t. Ãlljon ellen a lehallgatási pandémiának. A támogatásoddal egyezÅ támogatás ad a Friends of Tor. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/fenix-torbrowserstringsxml_completed] https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstringsxml_completed
commit 129ebcddad4971e4946d35a474eeb4cf92f56156 Author: Translation commit bot Date: Tue Dec 15 07:15:38 2020 + https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstringsxml_completed --- hu/torbrowser_strings.xml | 9 ++--- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/hu/torbrowser_strings.xml b/hu/torbrowser_strings.xml index a1933791f8..9abcf8617c 100644 --- a/hu/torbrowser_strings.xml +++ b/hu/torbrowser_strings.xml @@ -20,12 +20,6 @@ Biztonsági szint beállÃtása Néhány web szolgáltatás kikapcsolása, amivel támadhatják, sértve biztonságát és anonimitását. -Normál -Minden Tor BöngészŠés weboldal szolgáltatás engedélyezve. -Biztonságosabb -Azon weboldal szolgáltatások tiltása, amelyek többnyire veszélyesek, ami néhány oldal működésének problémáit okozhatja. -Legbiztonságosabb -Csak azon weboldal szolgáltatások engedélyezése, amelyek a statikus, vagy alap szolgáltatásokhoz szükségesek. Ezek a beállÃtások érintik a képeket, médiákat és scripteket. Biztonsági beállÃtások megnyitása Támogasson a Tor biztonságáért A Tor ingyenes az Ãnhöz hasonló személyek támogatásai miatt. @@ -59,4 +53,5 @@ Csatlakozva ÃjraindÃtás Hidak engedélyezve: %s - + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/fenix-torbrowserstringsxml] https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstringsxml
commit 3956f6f929e1838f88ab20cc6b0eb41927894750 Author: Translation commit bot Date: Tue Dec 15 07:15:34 2020 + https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstringsxml --- hu/torbrowser_strings.xml | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hu/torbrowser_strings.xml b/hu/torbrowser_strings.xml index 5c649b0349..1dcab5b1ea 100644 --- a/hu/torbrowser_strings.xml +++ b/hu/torbrowser_strings.xml @@ -2,6 +2,9 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + +%1$s - készÃti: Tor Project, egy U.S.-bázisú 501(c)(3) nonprofit szervezet. + Csak a privát böngészési mód engedélyezése @@ -69,4 +72,5 @@ Használjon maszkot, használjon Tor-t. Ãlljon ellen a lehallgatási pandémiának. - +A támogatásoddal egyezÅ támogatás ad a Friends of Tor. + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/abouttor-homepage_completed] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage_completed
commit 3e7f006f7078a0a6608b19b3c94d384ddbdef7f3 Author: Translation commit bot Date: Tue Dec 15 07:15:05 2020 + https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage_completed --- hu/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hu/aboutTor.dtd b/hu/aboutTor.dtd index c9dcc75019..d910ddd047 100644 --- a/hu/aboutTor.dtd +++ b/hu/aboutTor.dtd @@ -33,4 +33,4 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/abouttor-homepage] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
commit ce97ee0ccbb50fe1e9abb619439d1d6b81e84ea7 Author: Translation commit bot Date: Tue Dec 15 07:15:02 2020 + https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage --- hu/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hu/aboutTor.dtd b/hu/aboutTor.dtd index 5485636eba..d910ddd047 100644 --- a/hu/aboutTor.dtd +++ b/hu/aboutTor.dtd @@ -33,4 +33,4 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [collector/master] Include OnionPerf analysis files when syncing.
commit 06c0d78e4a73042c0e7fb6052f079237b8d7ff01 Author: Karsten Loesing Date: Mon Dec 14 23:23:54 2020 +0100 Include OnionPerf analysis files when syncing. --- CHANGELOG.md | 4 +- .../collector/onionperf/OnionPerfDownloader.java | 1 + .../collector/persist/OnionPerfPersistence.java| 60 +++--- src/main/resources/collector.properties| 2 +- 4 files changed, 57 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f56f74d..7956e55 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 and certs when syncing from another -CollecTor instance. + - Include microdescriptors, certs, and OnionPerf analysis files when +syncing from another CollecTor instance. - Update to metrics-lib 2.15.0. diff --git a/src/main/java/org/torproject/metrics/collector/onionperf/OnionPerfDownloader.java b/src/main/java/org/torproject/metrics/collector/onionperf/OnionPerfDownloader.java index f90bdfe..352d24a 100644 --- a/src/main/java/org/torproject/metrics/collector/onionperf/OnionPerfDownloader.java +++ b/src/main/java/org/torproject/metrics/collector/onionperf/OnionPerfDownloader.java @@ -57,6 +57,7 @@ public class OnionPerfDownloader extends CollecTorMain { public OnionPerfDownloader(Configuration config) { super(config); this.mapPathDescriptors.put("recent/torperf", TorperfResult.class); +this.mapPathDescriptors.put("recent/onionperf", TorperfResult.class); } /** File containing the download history, which is necessary, because diff --git a/src/main/java/org/torproject/metrics/collector/persist/OnionPerfPersistence.java b/src/main/java/org/torproject/metrics/collector/persist/OnionPerfPersistence.java index 7ed16a2..8975d80 100644 --- a/src/main/java/org/torproject/metrics/collector/persist/OnionPerfPersistence.java +++ b/src/main/java/org/torproject/metrics/collector/persist/OnionPerfPersistence.java @@ -6,12 +6,21 @@ package org.torproject.metrics.collector.persist; import org.torproject.descriptor.TorperfResult; import org.torproject.metrics.collector.conf.Annotation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; import java.nio.file.Paths; import java.nio.file.StandardOpenOption; public class OnionPerfPersistence extends DescriptorPersistence { + private static final Logger logger + = LoggerFactory.getLogger(OnionPerfPersistence.class); + private static final String ONIONPERF = "torperf"; public OnionPerfPersistence(TorperfResult desc) { @@ -32,18 +41,55 @@ public class OnionPerfPersistence name).toString(); } - /** OnionPerf default storage appends. */ + /** If the original descriptor file was a .tpf file, append the parsed Torperf + * result to the destination .tpf file, but if it was a .json.xz file, just + * copy over the entire file, unless it already exists. */ @Override - public boolean storeOut(String outRoot) { -return super.storeOut(outRoot, StandardOpenOption.APPEND); + public boolean storeOut(String outRoot, StandardOpenOption option) { +if (desc.getDescriptorFile().getName().endsWith(".tpf")) { + return super.storeOut(outRoot, StandardOpenOption.APPEND); +} else { + String fileName = desc.getDescriptorFile().getName(); + String[] dateParts = fileName.split("\\.")[0].split("-"); + return this.copyIfNotExists( + Paths.get(outRoot, + "onionperf", + dateParts[0], // year + dateParts[1], // month + dateParts[2], // day + fileName)); +} } - /** OnionPerf default storage appends. */ + /** If the original descriptor file was a .tpf file, append the parsed Torperf + * result to the destination .tpf file, but if it was a .json.xz file, just + * copy over the entire file, unless it already exists. */ @Override - public boolean storeAll(String recentRoot, String outRoot) { -return super.storeAll(recentRoot, outRoot, StandardOpenOption.APPEND, -StandardOpenOption.APPEND); + public boolean storeRecent(String recentRoot, StandardOpenOption option) { +if (desc.getDescriptorFile().getName().endsWith(".tpf")) { + return super.storeRecent(recentRoot, StandardOpenOption.APPEND); +} else { + String fileName = desc.getDescriptorFile().getName(); + return this.copyIfNotExists( + Paths.get(recentRoot, + "onionperf", + fileName)); +} } + private boolean copyIfNotExists(Path destinationFile) { +if (Files.exists(destinationFile)) { + return false; +} +Path originalFile = this.desc.getDescriptorFile().toPath(); +
[tor-commits] [community/master] Add new onion services images. Fix #152
commit 80623c484a325f45036e2f6ded98988336434730 Author: gus Date: Wed Dec 9 21:58:26 2020 -0500 Add new onion services images. Fix #152 --- .../onion-services/overview/onion-service-01.png | Bin 0 -> 152528 bytes .../onion-services/overview/onion-service-02.png | Bin 0 -> 119489 bytes .../onion-services/overview/onion-service-03.png | Bin 0 -> 141765 bytes .../onion-services/overview/onion-service-04.png | Bin 0 -> 159940 bytes .../onion-services/overview/onion-service-05.png | Bin 0 -> 172457 bytes .../onion-services/overview/onion-service-06.png | Bin 0 -> 147472 bytes .../onion-services/overview/onion-service-07.png | Bin 0 -> 137636 bytes .../onion-services/overview/onion-service-08.png | Bin 0 -> 137909 bytes .../onion-services/overview/onion-service-09.png | Bin 0 -> 125387 bytes .../overview/tor-onion-services-1.png | Bin 17222 -> 0 bytes .../overview/tor-onion-services-4.png | Bin 21419 -> 0 bytes content/onion-services/overview/contents.lr| 101 - 12 files changed, 57 insertions(+), 44 deletions(-) diff --git a/assets/static/images/onion-services/overview/onion-service-01.png b/assets/static/images/onion-services/overview/onion-service-01.png new file mode 100755 index 000..cd92201 Binary files /dev/null and b/assets/static/images/onion-services/overview/onion-service-01.png differ diff --git a/assets/static/images/onion-services/overview/onion-service-02.png b/assets/static/images/onion-services/overview/onion-service-02.png new file mode 100755 index 000..d50c0ad Binary files /dev/null and b/assets/static/images/onion-services/overview/onion-service-02.png differ diff --git a/assets/static/images/onion-services/overview/onion-service-03.png b/assets/static/images/onion-services/overview/onion-service-03.png new file mode 100755 index 000..e551d9c Binary files /dev/null and b/assets/static/images/onion-services/overview/onion-service-03.png differ diff --git a/assets/static/images/onion-services/overview/onion-service-04.png b/assets/static/images/onion-services/overview/onion-service-04.png new file mode 100755 index 000..7f68c8a Binary files /dev/null and b/assets/static/images/onion-services/overview/onion-service-04.png differ diff --git a/assets/static/images/onion-services/overview/onion-service-05.png b/assets/static/images/onion-services/overview/onion-service-05.png new file mode 100755 index 000..5e8ba7a Binary files /dev/null and b/assets/static/images/onion-services/overview/onion-service-05.png differ diff --git a/assets/static/images/onion-services/overview/onion-service-06.png b/assets/static/images/onion-services/overview/onion-service-06.png new file mode 100755 index 000..cb59f60 Binary files /dev/null and b/assets/static/images/onion-services/overview/onion-service-06.png differ diff --git a/assets/static/images/onion-services/overview/onion-service-07.png b/assets/static/images/onion-services/overview/onion-service-07.png new file mode 100755 index 000..ad20f47 Binary files /dev/null and b/assets/static/images/onion-services/overview/onion-service-07.png differ diff --git a/assets/static/images/onion-services/overview/onion-service-08.png b/assets/static/images/onion-services/overview/onion-service-08.png new file mode 100755 index 000..34d4ba7 Binary files /dev/null and b/assets/static/images/onion-services/overview/onion-service-08.png differ diff --git a/assets/static/images/onion-services/overview/onion-service-09.png b/assets/static/images/onion-services/overview/onion-service-09.png new file mode 100755 index 000..062a158 Binary files /dev/null and b/assets/static/images/onion-services/overview/onion-service-09.png differ diff --git a/assets/static/images/onion-services/overview/tor-onion-services-1.png b/assets/static/images/onion-services/overview/tor-onion-services-1.png deleted file mode 100644 index 75de366..000 Binary files a/assets/static/images/onion-services/overview/tor-onion-services-1.png and /dev/null differ diff --git a/assets/static/images/onion-services/overview/tor-onion-services-4.png b/assets/static/images/onion-services/overview/tor-onion-services-4.png deleted file mode 100644 index 88db970..000 Binary files a/assets/static/images/onion-services/overview/tor-onion-services-4.png and /dev/null differ diff --git a/content/onion-services/overview/contents.lr b/content/onion-services/overview/contents.lr index 1122aa1..1fa3c20 100644 --- a/content/onion-services/overview/contents.lr +++ b/content/onion-services/overview/contents.lr @@ -45,7 +45,6 @@ Is your network filtered and you can't open ports on your firewall? This could happen if you are in a university campus, an office, an airport, or pretty much anywhere. Onion services don't need open ports because they punch through NAT. They only establish outgoing connections. - ## The Onion Service Protocol: Overview Now the question
[tor-commits] [community/master] Merge branch 'update-onion-services-images'
commit 66a2b6656053cd72cc3571d7abc8ebf127b964db Merge: 7ad8087 21b5856 Author: gus Date: Mon Dec 14 17:13:42 2020 -0500 Merge branch 'update-onion-services-images' .../onion-services/overview/onion-service-01.png | Bin 0 -> 152528 bytes .../onion-services/overview/onion-service-02.png | Bin 0 -> 119489 bytes .../onion-services/overview/onion-service-03.png | Bin 0 -> 141765 bytes .../onion-services/overview/onion-service-04.png | Bin 0 -> 159940 bytes .../onion-services/overview/onion-service-05.png | Bin 0 -> 172457 bytes .../onion-services/overview/onion-service-06.png | Bin 0 -> 147472 bytes .../onion-services/overview/onion-service-07.png | Bin 0 -> 137636 bytes .../onion-services/overview/onion-service-08.png | Bin 0 -> 137909 bytes .../onion-services/overview/onion-service-09.png | Bin 0 -> 125387 bytes .../overview/tor-onion-services-1.png | Bin 17222 -> 0 bytes .../overview/tor-onion-services-4.png | Bin 21419 -> 0 bytes content/onion-services/overview/contents.lr| 101 - 12 files changed, 57 insertions(+), 44 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [community/master] Add gaba's review, explicitly say SecureDrop onion service
commit 21b58560186f095aab029f02fd087785599f1cb8 Author: gus Date: Mon Dec 14 12:47:43 2020 -0500 Add gaba's review, explicitly say SecureDrop onion service --- content/onion-services/overview/contents.lr | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/onion-services/overview/contents.lr b/content/onion-services/overview/contents.lr index 1fa3c20..8d6be84 100644 --- a/content/onion-services/overview/contents.lr +++ b/content/onion-services/overview/contents.lr @@ -93,7 +93,7 @@ All the previous steps were just set up for the onion service so that it's reach Now let's fast-forward to the point where an actual client wants to visit the service. In this case, the client has the onion address of SecureDrop and want to visit it, so they connect to the service with Tor Browser. -Now the next thing that needs to happen is that the client goes to the _distributed hash table_ from **Step 2** and ask for the signed descriptor of SecureDrop. +Now the next thing that needs to happen is that the client goes to the _distributed hash table_ from **Step 2** and ask for the signed descriptor of SecureDrop's onion service. @@ -102,7 +102,7 @@ Now the next thing that needs to happen is that the client goes to the _distribu When the client receives the signed descriptor, they verify the signature of the descriptor using the public key that is encoded in the onion address. This provides the _end-to-end authentication_ security property, since we are now sure that this descriptor could only be produced by that onion service and no one else. -And inside the descriptor, there are the introduction points that allow the client to introduce themselves to SecureDrop. +And inside the descriptor, there are the introduction points that allow the client to introduce themselves to SecureDrop's onion service. @@ -115,7 +115,7 @@ The client asks the relay to become their rendezvous point and give it an "one-t ### Act 7: Where the onion service rendezvous with the client -The introduction point passes your details on to the onion service, which runs multiple verification processes to decide whether you're trustworthy or not. +The introduction point passes your details (secret string and rendezvous address) on to the onion service, which runs multiple verification processes to decide whether you're trustworthy or not. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [community/master] Fix #173
commit 7ad8087892283e1d05b975c80550e4c9fd06cd61 Author: gus Date: Mon Dec 14 16:59:13 2020 -0500 Fix #173 --- content/relay-operations/technical-setup/post-install/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/relay-operations/technical-setup/post-install/contents.lr b/content/relay-operations/technical-setup/post-install/contents.lr index 36a3c22..dbd00c6 100644 --- a/content/relay-operations/technical-setup/post-install/contents.lr +++ b/content/relay-operations/technical-setup/post-install/contents.lr @@ -91,7 +91,7 @@ ORPort [IPv6-address]:9001 ``` The location of that line in the configuration file does not matter. -You can simply add it next to the first ORPort lins in your torrc file. +You can simply add it next to the first ORPort lines in your torrc file. Note: You have to explicitly specify your IPv6 address in square brackets, you can not tell tor to bind to any IPv6 (like you do for IPv4). If you have a global IPv6 address you should be able to find it in the output of the following command: ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [community/master] Update how to setup tor with a webserver. Fix #157
commit 1505dabdf82300cf32c307cc6bc8db8a82f72465 Author: gus Date: Tue Dec 8 09:03:06 2020 -0500 Update how to setup tor with a webserver. Fix #157 --- content/onion-services/setup/contents.lr | 130 --- 1 file changed, 101 insertions(+), 29 deletions(-) diff --git a/content/onion-services/setup/contents.lr b/content/onion-services/setup/contents.lr index 464596f..50fed1c 100644 --- a/content/onion-services/setup/contents.lr +++ b/content/onion-services/setup/contents.lr @@ -19,77 +19,149 @@ cta: Get Started html: two-columns-page.html --- body: - -This guide shows you how to set up an onion service for your website. +This guide shows you how to set up an onion service for your website. +For the technical details of how the onion service protocol works, see our onion service protocol page. ## Step 0: Get a working Tor -As part of this guide, we will assume you have a functional Tor in your machine. Tor should be up and running correctly for this guide to work. You should also know where Tor's configuration files are. - -To setup Tor, Windows users can follow the [Windows howto](https://2019.www.torproject.org/docs/tor-doc-windows.html.en), OS X users should follow the [OS X howto](https://2019.www.torproject.org/docs/tor-doc-osx.html.en), and Linux/BSD/Unix users should follow the [Unix howto](https://2019.www.torproject.org/docs/tor-doc-unix.html.en). +As part of this guide, we will assume you have a functional Tor in your machine. +To set up Tor, please follow the [Tor installation guide](https://community.torproject.org/onion-services/setup/install/). +Tor should be up and running correctly for this guide to work. +You should also know where Tor's configuration files are. ## Step 1: Get a web server working -As a first step you should setup a web server locally, like nginx or lighttpd. Setting up a web server can be complex. -We're not going to cover how to set up a web server here. If you get stuck or want to do more, find a friend who can help you. +As a first step, you should set up a web server locally, like Nginx, Apache, or your favorite web server. +Setting up a web server can be complex. +If you get stuck or want to do more, find a friend who can help you or connect with any of the forums online that offer help. + +As an example, we will cover how to set up an onion site with Nginx and Apache on Debian. We recommend you install a new separate web server for your onion service. -You need to configure your web server so it doesn't give away any information about you, your computer, or your location. -This is not an easy task and in the end of this document we will offer more resources on how to make this possible. +On this page, the commands to manage the web server are based on Debian-like operating systems and may differ from other systems. +Check your web server and operating system documentation. + +### Apache + +Apache is available in the main repository of multiple Linux and *BSD distributions. +To install `apache2` package: + +`$ sudo apt install apache2` -Once your web server is set up, make sure it works: open your browser and go to http://localhost:8080/, where 8080 is the webserver port you chose during setup (you can choose any port, 8080 is just an example). +### Nginx + +Nginx is available in the main repository of multiple Linux and *BSD distributions. +To install `nginx` package: + +`$ sudo apt install nginx` + +By default, the web server will be running on `localhost:80` at the end of the installation. +If you get an error message, something has gone wrong and you cannot continue until you've figured out why this didn't work. + +Once your web server is set up, make sure it works: open your browser and go to http://localhost/. Then try putting a file in the main html directory, and make sure it shows up when you access the site. ## Step 2: Configure your Tor onion service The next step is opening the config file of Tor (torrc) and doing the appropriate configurations to setup an onion service. Depending on your operating system and setup, your Tor configuration file can be at a different location or look different. -You will need to put the following two lines in your torrc: - HiddenServiceDir /var/lib/tor/hidden_service/ - HiddenServicePort 80 127.0.0.1:8080 +You will need to put the following two lines in your `torrc` file: + HiddenServiceDir /var/lib/tor/my_website/ + HiddenServicePort 80 127.0.0.1:80 The `HiddenServiceDir` line specifies the directory which should contain information and cryptographic keys for your onion service. You will want to change the `HiddenServiceDir` line, so that it points to an actual directory that is readable/writeable by the user that will be running Tor. -The `HiddenServicePort` line specifies a _virtual port_ (that is, the port that people visiting your onion service will be using), and in the above case it says that any
[tor-commits] [community/master] Add tor-onions mailing list and why setup a separate webserver
commit 07d636dad7fed03d3a3d062902ef0fb6fbdb280b Author: gus Date: Tue Dec 8 13:24:45 2020 -0500 Add tor-onions mailing list and why setup a separate webserver --- content/onion-services/setup/contents.lr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/onion-services/setup/contents.lr b/content/onion-services/setup/contents.lr index 50fed1c..b872eaf 100644 --- a/content/onion-services/setup/contents.lr +++ b/content/onion-services/setup/contents.lr @@ -33,10 +33,10 @@ You should also know where Tor's configuration files are. As a first step, you should set up a web server locally, like Nginx, Apache, or your favorite web server. Setting up a web server can be complex. -If you get stuck or want to do more, find a friend who can help you or connect with any of the forums online that offer help. +If you get stuck or want to do more, find a friend who can help you or join our [tor-onions](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-onions) mailing list to speak with other operators. As an example, we will cover how to set up an onion site with Nginx and Apache on Debian. -We recommend you install a new separate web server for your onion service. +We recommend you install a new separate web server for your onion service, since even if you already have one installed, you may be using it (or want to use it later) for a regular website. On this page, the commands to manage the web server are based on Debian-like operating systems and may differ from other systems. Check your web server and operating system documentation. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-build/master] Bug 40189: Update expiration date of torbrowser-nightly.gpg
commit 7627586f17fd6a373e50bc5a49618eecff14acd6 Author: Nicolas Vigier Date: Mon Dec 14 21:18:40 2020 +0100 Bug 40189: Update expiration date of torbrowser-nightly.gpg --- keyring/torbrowser-nightly.gpg | Bin 2289 -> 3523 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/torbrowser-nightly.gpg b/keyring/torbrowser-nightly.gpg index 15d2b62..952db15 100644 Binary files a/keyring/torbrowser-nightly.gpg and b/keyring/torbrowser-nightly.gpg differ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
commit d894d23cf47ac75b4a99e2729908ac52e5137a07 Author: Translation commit bot Date: Mon Dec 14 19:48:22 2020 + https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+es-AR.po | 42 ++ 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/contents+es-AR.po b/contents+es-AR.po index 3129df59e3..3ad9c12ab4 100644 --- a/contents+es-AR.po +++ b/contents+es-AR.po @@ -9183,7 +9183,8 @@ msgstr "" #: https//support.torproject.org/metrics/user-estimation/ #: (content/metrics/user-estimation/contents+en.lrquestion.title) msgid "How is it even possible to count users in an anonymity network?" -msgstr "¿Cómo es incluso posible contar usuarios en una red de anonimato?" +msgstr "" +"¿Cómo es que incluso sea posible contar usuarios en una red de anonimato?" #: https//support.torproject.org/metrics/user-estimation/ #: (content/metrics/user-estimation/contents+en.lrquestion.description) @@ -9194,7 +9195,7 @@ msgid "" msgstr "" "Realmente, no contamos usuarios, sino solicitudes para los directorios que " "los clientes efectúan periódicamente para actualizar su lista de " -"repetidores, y estimamos el número de usuarios indirectamente de ahÃ." +"repetidores, y estimamos el número de usuarios indirectamente desde ahÃ." #: https//support.torproject.org/metrics/user-numbers/ #: (content/metrics/user-numbers/contents+en.lrquestion.title) @@ -9232,7 +9233,8 @@ msgid "" "minutes." msgstr "" "Otra forma de mirarlo, es que asumimos que cada solicitud representa un " -"cliente que permanece en lÃnea por un décimo de dÃa: 2 horas y 24 minutos." +"cliente que permanece en lÃnea la décima parte de un dÃa: 2 horas y 24 " +"minutos." #: https//support.torproject.org/metrics/users-or-clients/ #: (content/metrics/user-or-clients/contents+en.lrquestion.title) @@ -9339,10 +9341,9 @@ msgid "" "[Facebook](https://www.facebook.com/notes/protect-the-graph/making-; "connections-to-facebook-more-secure/1526085754298237/)." msgstr "" -"A los servicios onion se los confÃa también para chatear y compartir " -"archivos, libres de metadatos, lo cual es una interacción más segura entre " -"periodistas y sus fuentes, como por ejemplo con " -"[SecureDrop](https://securedrop.org/) u " +"También se confÃa en los servicios onion para chatear y compartir archivos " +"sin metadatos, lo cual es una interacción más segura entre periodistas y sus" +" fuentes, como por ejemplo con [SecureDrop](https://securedrop.org/) u " "[OnionShare](https://onionshare.org/), actualizaciones de programas más " "seguras, y maneras más seguras de alcanzar sitios web populares como " "[Facebook](https://www.facebook.com/notes/protect-the-graph/making-; @@ -9354,9 +9355,9 @@ msgid "" "These services use the special-use top level domain (TLD) .onion (instead of" " .com, .net, .org, etc..) and are only accessible through the Tor network." msgstr "" -"Estos servicios usan el dominio de nivel tope (TLD) de uso especial .onion " -"(en vez de .com, .net, .org, etc.), y solamente son accesibles a través de " -"la red Tor." +"Estos servicios usan el dominio de nivel superior (TLD) de uso especial " +".onion (en vez de .com, .net, .org, etc.), y solamente son accesibles a " +"través de la red Tor." #: https//support.torproject.org/onionservices/onionservices-2/ #: (content/onionservices/onionservices-2/contents+en.lrquestion.description) @@ -9430,8 +9431,9 @@ msgid "" "You can also ensure that you're able to access other onion services by " "connecting to [DuckDuckGo's onion service](http://3g2upl4pq6kufc4m.onion)." msgstr "" -"Podés también asegurarte que seas capaz de acceder otros servicios onion " -"conectando al [servicio onion de DuckDuckGo](http://3g2upl4pq6kufc4m.onion)." +"También podés asegurarte de que seas capaz de acceder otros servicios onion " +"conectándote al [servicio onion de " +"DuckDuckGo](http://3g2upl4pq6kufc4m.onion)." #: https//support.torproject.org/onionservices/onionservices-4/ #: (content/onionservices/onionservices-4/contents+en.lrquestion.title) @@ -9559,7 +9561,7 @@ msgid "" "When sending us feedback or reporting a bug, please include as many of these" " as possible:" msgstr "" -"Cuando nos envÃes comentarios o reportes un error, por favor incluà tantos " +"Cuando nos enviés comentarios o reportes un error, por favor incluà tantos " "de estos como sea posible:" #: https//support.torproject.org/misc/bug-or-feedback/ @@ -9633,7 +9635,7 @@ msgstr " Correo Electrónico" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) msgid "Send us an email to frontd...@torproject.org" -msgstr "Envianos un correo electrónico a frontdesk AT torproject DOT org" +msgstr "Envianos un correo electrónico a frontd...@torproject.org" #: https//support.torproject.org/misc/bug-or-feedback/ #:
[tor-commits] [translation/support-portal_completed] https://gitweb.torproject.org/translation.git/commit/?h=support-portal_completed
commit 87e9110aa2399cd9e1e294d244a6109a906f3001 Author: Translation commit bot Date: Mon Dec 14 19:48:27 2020 + https://gitweb.torproject.org/translation.git/commit/?h=support-portal_completed --- contents+es-AR.po | 117 ++ 1 file changed, 100 insertions(+), 17 deletions(-) diff --git a/contents+es-AR.po b/contents+es-AR.po index 8e20ae602e..7158d637e1 100644 --- a/contents+es-AR.po +++ b/contents+es-AR.po @@ -9184,6 +9184,7 @@ msgstr "" #: (content/metrics/user-estimation/contents+en.lrquestion.title) msgid "How is it even possible to count users in an anonymity network?" msgstr "" +"¿Cómo es que incluso sea posible contar usuarios en una red de anonimato?" #: https//support.torproject.org/metrics/user-estimation/ #: (content/metrics/user-estimation/contents+en.lrquestion.description) @@ -9192,11 +9193,15 @@ msgid "" " clients make periodically to update their list of relays and estimate user " "numbers indirectly from there." msgstr "" +"Realmente, no contamos usuarios, sino solicitudes para los directorios que " +"los clientes efectúan periódicamente para actualizar su lista de " +"repetidores, y estimamos el número de usuarios indirectamente desde ahÃ." #: https//support.torproject.org/metrics/user-numbers/ #: (content/metrics/user-numbers/contents+en.lrquestion.title) msgid "How do you get from these directory requests to user numbers?" msgstr "" +"¿Cómo llegan desde estas solicitudes de directorio a número de usuarios?" #: https//support.torproject.org/metrics/user-numbers/ #: (content/metrics/user-numbers/contents+en.lrquestion.description) @@ -9206,6 +9211,10 @@ msgid "" "but not all clients are connected 24/7, so we picked the number 10 for the " "average client." msgstr "" +"Hacemos la suposición que el cliente promedio hace 10 de tales solicitudes " +"por dÃa. Un cliente tor que está conectado 24/7 hace cerca de 15 " +"solicitudes por dÃa, pero no todos los clientes están conectados 24/7, por " +"lo que elegimos el número 10 para el cliente promedio." #: https//support.torproject.org/metrics/user-numbers/ #: (content/metrics/user-numbers/contents+en.lrquestion.description) @@ -9213,6 +9222,8 @@ msgid "" "We simply divide directory requests by 10 and consider the result as the " "number of users." msgstr "" +"Simplemente dividimos las solicitudes de directorio por 10 y consideramos al" +" resultado como el número de usuarios." #: https//support.torproject.org/metrics/user-numbers/ #: (content/metrics/user-numbers/contents+en.lrquestion.description) @@ -9221,6 +9232,9 @@ msgid "" " a client that stays online for one tenth of a day, so 2 hours and 24 " "minutes." msgstr "" +"Otra forma de mirarlo, es que asumimos que cada solicitud representa un " +"cliente que permanece en lÃnea la décima parte de un dÃa: 2 horas y 24 " +"minutos." #: https//support.torproject.org/metrics/users-or-clients/ #: (content/metrics/user-or-clients/contents+en.lrquestion.title) @@ -9228,6 +9242,8 @@ msgid "" "Are these tor clients or users? What if there's more than one user behind a" " tor client?" msgstr "" +"¿Estos son clientes tor o usuarios? ¿Y qué si hay más de un usuario detrás " +"de un cliente tor?" #: https//support.torproject.org/metrics/users-or-clients/ #: (content/metrics/user-or-clients/contents+en.lrquestion.description) @@ -9236,6 +9252,9 @@ msgid "" "intuitive for most people to think of users, that's why we say users and not" " clients." msgstr "" +"Entonces contamos esos usuarios como uno. Realmente contamos clientes, pero " +"es más intuitivo para la mayorÃa de la gente pensar en usuarios, por eso es " +"que decimos usuarios y no clientes." #: https//support.torproject.org/metrics/user-overcount/ #: (content/metrics/user-overcount/contents+en.lrquestion.title) @@ -9243,6 +9262,8 @@ msgid "" "What if a user runs tor on a laptop and changes their IP address a few times" " per day? Don't you overcount that user?" msgstr "" +"¿Y qué si un usuario corre tor en una laptop y cambia su dirección IP unas " +"pocas veces por dÃa? ¿No cuentan demás a ese usuario?" #: https//support.torproject.org/metrics/user-overcount/ #: (content/metrics/user-overcount/contents+en.lrquestion.description) @@ -9250,6 +9271,8 @@ msgid "" "No, because that user updates their list of relays as often as a user that " "doesn't change IP address over the day." msgstr "" +"No, porque ese usuario actualiza su lista de repetidores tan a menudo como " +"un usuario que no cambia la dirección IP a lo largo del dÃa." #: https//support.torproject.org/onionservices/onionservices-1/ #: (content/onionservices/onionservices-1/contents+en.lrquestion.title) @@ -9275,6 +9298,8 @@ msgid "" "For example, the DuckDuckGo onion is " "[https://3g2upl4pq6kufc4m.onion](https://3g2upl4pq6kufc4m.onion)." msgstr "" +"Por ejemplo, el onion de DuckDuckGo es "
[tor-commits] [translation/support-portal_completed] https://gitweb.torproject.org/translation.git/commit/?h=support-portal_completed
commit 306f0712e87fa9ed83746a1a89ab9b6c9cb8233c Author: Translation commit bot Date: Mon Dec 14 19:18:36 2020 + https://gitweb.torproject.org/translation.git/commit/?h=support-portal_completed --- contents+es-AR.po | 74 --- 1 file changed, 70 insertions(+), 4 deletions(-) diff --git a/contents+es-AR.po b/contents+es-AR.po index 07414f2225..8e20ae602e 100644 --- a/contents+es-AR.po +++ b/contents+es-AR.po @@ -8900,17 +8900,22 @@ msgid "" "We do have descriptor archives from before that time, but those descriptors " "didn't contain all the data we use to estimate user numbers." msgstr "" +"Sà tenemos archivos de descriptores desde antes de ese tiempo, pero esos " +"descriptores no contenÃan todos los datos que usamos para estimar números de" +" usuarios." #: https//support.torproject.org/metrics/2011-archive/ #: (content/metrics/2011-archive/contents+en.lrquestion.description) msgid "Please find the following tarball for more details:" -msgstr "" +msgstr "Por favor, inspeccioná el siguiente archivo tar para más detalles:" #: https//support.torproject.org/metrics/2011-archive/ #: (content/metrics/2011-archive/contents+en.lrquestion.description) msgid "" "[Tarball](https://archive.org/details/tor_metrics_old_user_number_estimates_2008_2013)" msgstr "" +"[Archivo " +"tar](https://archive.org/details/tor_metrics_old_user_number_estimates_2008_2013)" #: https//support.torproject.org/metrics/bridge-users/ #: (content/metrics/bridge-users/contents+en.lrquestion.title) @@ -8918,6 +8923,8 @@ msgid "" "And what about the advantage of the current approach over the old one when " "it comes to bridge users?" msgstr "" +"¿Y qué acerca de la ventaja del abordaje actual sobre el antiguo, cuando se " +"refiere a usuarios de puentes?" #: https//support.torproject.org/metrics/bridge-users/ #: (content/metrics/bridge-users/contents+en.lrquestion.description) @@ -8926,6 +8933,10 @@ msgid "" "report](https://research.torproject.org/techreports/counting-daily-bridge-; "users-2012-10-24.pdf) explaining the reasons for retiring the old approach." msgstr "" +"Oh, esa es una historia por completo diferente. Escribimos un [informe " +"técnico](https://research.torproject.org/techreports/counting-daily-bridge-; +"users-2012-10-24.pdf) de 13 páginas explicando las razones para abandonar el" +" viejo abordaje." #: https//support.torproject.org/metrics/bridge-users/ #: (content/metrics/bridge-users/contents+en.lrquestion.description) @@ -8933,16 +8944,20 @@ msgid "" "tl;dr: in the old approach we measured the wrong thing, and now we measure " "the right thing." msgstr "" +"tl;dr: en el viejo abordaje, medÃamos una cosa equivocada, y ahora medimos " +"la correcta." #: https//support.torproject.org/metrics/bridges-reports/ #: (content/metrics/bridges-reports/contents+en.lrquestion.title) msgid "Why are there so few bridge users that are not using the default OR" msgstr "" +"¿Por qué hay tan pocos usuarios de puentes que no están usando el protocolo " +"por" #: https//support.torproject.org/metrics/bridges-reports/ #: (content/metrics/bridges-reports/contents+en.lrquestion.title) msgid "protocol or that are using IPv6?" -msgstr "" +msgstr "defecto OR, o que están usando IPv6?" #: https//support.torproject.org/metrics/bridges-reports/ #: (content/metrics/bridges-reports/contents+en.lrquestion.description) @@ -8950,18 +8965,24 @@ msgid "" "Very few bridges report data on transports or IP versions yet, and by " "default we consider requests to use the default OR protocol and IPv4." msgstr "" +"TodavÃa muy pocos puentes informan datos sobre transportes o versiones de " +"IP, y por defecto consideramos solicitudes para usar el protocolo por " +"defecto OR e IPv4." #: https//support.torproject.org/metrics/bridges-reports/ #: (content/metrics/bridges-reports/contents+en.lrquestion.description) msgid "" "Once more bridges report these data, the numbers will become more accurate." msgstr "" +"Una vez que más puentes informen estos datos, los números se volverán más " +"precisos." #: https//support.torproject.org/metrics/censorship-events/ #: (content/metrics/censorship-events/contents+en.lrquestion.title) msgid "" "What are these red and blue dots indicating possible censorship events?" msgstr "" +"¿Qué son estos puntos rojos y azules indicando posibles eventos de censura?" #: https//support.torproject.org/metrics/censorship-events/ #: (content/metrics/censorship-events/contents+en.lrquestion.description) @@ -8970,6 +8991,9 @@ msgid "" "user numbers over a series of days and predicts the user number in the next " "days." msgstr "" +"Corremos un sistema de detección de censura basado en anomalÃas que " +"contempla números estimados de usuarios sobre una serie de dÃas, y predice " +"el número de usuarios en los dÃas siguientes." #:
[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
commit 4e686fc7c5669e8f1294284cd858c98d65fb595d Author: Translation commit bot Date: Mon Dec 14 19:18:29 2020 + https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+es-AR.po | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/contents+es-AR.po b/contents+es-AR.po index 93636e2796..3129df59e3 100644 --- a/contents+es-AR.po +++ b/contents+es-AR.po @@ -8935,8 +8935,8 @@ msgid "" msgstr "" "Oh, esa es una historia por completo diferente. Escribimos un [informe " "técnico](https://research.torproject.org/techreports/counting-daily-bridge-; -"users-2012-10-24.pdf) de 13 páginas explicando las razones para retirar el " -"viejo abordaje." +"users-2012-10-24.pdf) de 13 páginas explicando las razones para abandonar el" +" viejo abordaje." #: https//support.torproject.org/metrics/bridge-users/ #: (content/metrics/bridge-users/contents+en.lrquestion.description) @@ -8944,8 +8944,8 @@ msgid "" "tl;dr: in the old approach we measured the wrong thing, and now we measure " "the right thing." msgstr "" -"tl;dr: en el viejo abordaje, medÃamos la cosa equivocada, y ahora medimos la" -" correcta." +"tl;dr: en el viejo abordaje, medÃamos una cosa equivocada, y ahora medimos " +"la correcta." #: https//support.torproject.org/metrics/bridges-reports/ #: (content/metrics/bridges-reports/contents+en.lrquestion.title) @@ -8991,8 +8991,8 @@ msgid "" "user numbers over a series of days and predicts the user number in the next " "days." msgstr "" -"Corremos sistema un de detección de censura basado en anomalÃas que " -"contemplan números estimados de usuarios sobre una serie de dÃas, y predice " +"Corremos un sistema de detección de censura basado en anomalÃas que " +"contempla números estimados de usuarios sobre una serie de dÃas, y predice " "el número de usuarios en los dÃas siguientes." #: https//support.torproject.org/metrics/censorship-events/ @@ -9034,7 +9034,7 @@ msgstr "" #: https//support.torproject.org/metrics/country-origin/ #: (content/metrics/country-origin/contents+en.lrquestion.title) msgid "How do you know which countries users come from?" -msgstr "¿Sómo saben desde qué paÃses vienen los usuarios?" +msgstr "¿Cómo saben desde qué paÃses vienen los usuarios?" #: https//support.torproject.org/metrics/country-origin/ #: (content/metrics/country-origin/contents+en.lrquestion.description) @@ -9177,7 +9177,7 @@ msgid "" "would be too detailed and might put users at risk." msgstr "" "Las estadÃsticas que necesitarÃamos recolectar para el número de usuarios " -"por hora serÃan demasiado detalladas, y podrÃan poner a los usuarios es " +"por hora serÃan demasiado detalladas, y podrÃan poner a los usuarios en " "riesgo." #: https//support.torproject.org/metrics/user-estimation/ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/support-portal_completed] https://gitweb.torproject.org/translation.git/commit/?h=support-portal_completed
commit 3ebd1d5adfe128c00f8fc9bb9fde3b058afc7c7d Author: Translation commit bot Date: Mon Dec 14 09:48:30 2020 + https://gitweb.torproject.org/translation.git/commit/?h=support-portal_completed --- contents+es-AR.po | 217 +- 1 file changed, 200 insertions(+), 17 deletions(-) diff --git a/contents+es-AR.po b/contents+es-AR.po index dfdda6c016..07414f2225 100644 --- a/contents+es-AR.po +++ b/contents+es-AR.po @@ -8003,11 +8003,15 @@ msgid "" "before they expire otherwise the Tor process on the relay will exit upon " "expiration." msgstr "" +"Tendrás que renovar manualmente la clave de firma de medio término y el " +"certificado antes de que expiren, de otra manera, el proceso Tor en el " +"repetidor terminará una vez alcanzada la expiración." #: https//support.torproject.org/operators/offline-ed25519/ #: (content/operators/offline-ed25519/contents+en.lrquestion.description) msgid "This feature is optional, you don't need to use it unless you want to." msgstr "" +"Esta caracterÃstica es opcional, no necesitás usarla a menos que quieras." #: https//support.torproject.org/operators/offline-ed25519/ #: (content/operators/offline-ed25519/contents+en.lrquestion.description) @@ -8017,6 +8021,11 @@ msgid "" "leave the master identity secret key in DataDirectory/keys, just make a " "backup in case you'll need to reinstall it." msgstr "" +"Si querés que tu repetidor corra sin atención por un tiempo más largo sin " +"tener que hacer manualmente la renovación de la clave de firma de medio " +"término en forma regular, lo mejor es dejar la clave secreta de la identidad" +" maestra en DataDirectory/keys, solo hacete una copia de seguridad en el " +"caso que vayas a necesitar reinstalarla." #: https//support.torproject.org/operators/offline-ed25519/ #: (content/operators/offline-ed25519/contents+en.lrquestion.description) @@ -8025,6 +8034,9 @@ msgid "" "guide](https://trac.torproject.org/projects/tor/wiki/doc/TorRelaySecurity/OfflineKeys)" " on the topic." msgstr "" +"Si querés usar esta caracterÃstica, podés consultar nuestra [guÃa más " +"detallada](https://trac.torproject.org/projects/tor/wiki/doc/TorRelaySecurity/OfflineKeys)" +" sobre el tópico." #: https//support.torproject.org/operators/operators-1/ #: (content/operators/operators-1/contents+en.lrquestion.title) @@ -8041,6 +8053,8 @@ msgid "" "For the most in-depth resource on running a relay, see the [Relay Setup " "Guide](https://community.torproject.org/relay/setup)." msgstr "" +"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/ #: (content/operators/operators-2/contents+en.lrquestion.title) @@ -8084,6 +8098,8 @@ msgid "" "* As root, add the following lines to /etc/apt/sources.list. Replace " "'version' with the version you found in the previous step:" msgstr "" +"* Como superusuario, añadà las siguientes lÃneas a /etc/apt/sources.list. " +"Remplazá 'version' con la versión que encontraste en el paso previo:" #: https//support.torproject.org/operators/operators-4/ #: (content/operators/operators-4/contents+en.lrquestion.description) @@ -8134,7 +8150,7 @@ msgstr "$ sudo apt-get install tor deb.torproject.org-keyring" #: https//support.torproject.org/operators/operators-6/ #: (content/operators/operators-6/contents+en.lrquestion.title) msgid "How do I run an obfs4 bridge?" -msgstr "" +msgstr "¿Cómo corro un puente obfs4?" #: https//support.torproject.org/operators/operators-6/ #: (content/operators/operators-6/contents+en.lrquestion.description) @@ -8143,6 +8159,9 @@ msgid "" "guide](https://community.torproject.org/relay/setup/bridge/) to learn how to" " set up an obfs4 bridge." msgstr "" +"Mirá nuestra [guÃa de configuración de " +"obfs4](https://community.torproject.org/relay/setup/bridge/) para aprender " +"cómo configurar un puente obfs4." #: https//support.torproject.org/operators/operators-7/ #: (content/operators/operators-7/contents+en.lrquestion.title) @@ -8202,7 +8221,7 @@ msgstr "" #: https//support.torproject.org/operators/outgoing-firewall/ #: (content/operators/outgoing-firewall/contents+en.lrquestion.title) msgid "How should I configure the outgoing filters on my relay?" -msgstr "" +msgstr "¿Cómo deberÃa configurar los filtros de salida en mi repetidor?" #: https//support.torproject.org/operators/outgoing-firewall/ #: (content/operators/outgoing-firewall/contents+en.lrquestion.description) @@ -8210,6 +8229,8 @@ msgid "" "All outgoing connections must be allowed, so that each relay can communicate" " with every other relay." msgstr "" +"Todas las conexiones salientes deben ser permitidas, para que cada repetidor" +" pueda comunicarse con todos los demás." #: https//support.torproject.org/operators/outgoing-firewall/
[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
commit cf10fc421e9dcff7e8aee5c42ec0a53b148253ba Author: Translation commit bot Date: Mon Dec 14 09:48:24 2020 + 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
[tor-commits] [collector/master] Include certs when syncing from another instance.
commit 9834cec8c0e88c1e810434f543f5d8c4d5cb2de8 Author: Karsten Loesing 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 000..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 { + + 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 { "-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
[tor-commits] [translation/support-portal_completed] https://gitweb.torproject.org/translation.git/commit/?h=support-portal_completed
commit 5e74dca7f0e6cf4534b0251ae728f7dc0e585cd0 Author: Translation commit bot Date: Mon Dec 14 09:18:23 2020 + https://gitweb.torproject.org/translation.git/commit/?h=support-portal_completed --- 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
[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
commit 99105cf2fe679a41f14d4d7d8fdd78dd7948b0c5 Author: Translation commit bot Date: Mon Dec 14 09:18:17 2020 + 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
[tor-commits] [collector/master] Make sure that the DirectoryStream gets closed.
commit 83850daa9de893cf2d7f846e67191a469cc64900 Author: Karsten Loesing 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 files = Files.list(dir)) { +if (!files.findFirst().isPresent()) { + Files.delete(dir); +} + } } return FileVisitResult.CONTINUE; } ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [collector/master] Fix a few paths for cleaning up.
commit 4879cdc219c797e3e0a54226978462fe67d7cf3b Author: Karsten Loesing 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()); } } ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [collector/master] Only clean up a single time during sync.
commit 5e5a7d1dfa30ffaf0a27ea4e246de5bef30d1cbc Author: Karsten Loesing 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(); } } ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [collector/master] Include microdescriptors when syncing.
commit a1b8ebb9545b148524c6e3db2a1601f228784905 Author: Karsten Loesing 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 @@ - + 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 000..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 { + + 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("/MM/"); +SimpleDateFormat descriptorFormat = new SimpleDateFormat("-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 +
[tor-commits] [collector/master] Add log statement for current memory usage.
commit bddc73ce6700a1498cbffb294de135949d02a41d Author: Karsten Loesing 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 " ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits