June 2015 - tor-commits - lists.torproject.org

[tor/master] fix some memory leaks that coverity found
by nickm＠torproject.org 19 Jun '15

19 Jun '15

commit 1edaef2adfe7c929f4fb2bfa1c3519e3f28297ce Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 19 09:03:25 2015 -0400 fix some memory leaks that coverity found --- src/or/routerkeys.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/or/routerkeys.c b/src/or/routerkeys.c index f5cae44..2fd7f41 100644 --- a/src/or/routerkeys.c +++ b/src/or/routerkeys.c @@ -29,10 +29,11 @@ read_encrypted_secret_key(ed25519_secret_key_t *out, sizeof(encrypted_key)); if (encrypted_len < 0) { log_info(LD_OR, "%s is missing", fname); - return 0; + r = 0; + goto done; } if (strcmp(tag, ENC_KEY_TAG)) - return -1; + goto done; while (1) { ssize_t pwlen = @@ -64,6 +65,7 @@ read_encrypted_secret_key(ed25519_secret_key_t *out, done: memwipe(encrypted_key, 0, encrypted_len); memwipe(pwbuf, 0, sizeof(pwbuf)); + tor_free(tag); if (secret) { memwipe(secret, 0, secret_len); tor_free(secret); @@ -498,6 +500,7 @@ load_ed_keys(const or_options_t *options, time_t now) tor_free(fname); goto err; } + tor_free(fname); fname = options_get_datadir_fname2(options, "keys", "ed25519_master_id"); id = ed_key_init_from_file( fname,

1 0

[onionoo/master] Add four new execution modes.
by karsten＠torproject.org 19 Jun '15

19 Jun '15

commit 5cedec578e04116aa588eb791faf08969a69f712 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Apr 26 17:06:39 2015 +0200 Add four new execution modes. New modes are: --single-run Run steps 1--3 only for a single time, then exit. --download-only Only run step 1: download recent descriptors, then exit. --update-only Only run step 2: update internal status files, then exit. --write-only Only run step 3: write output document files, then exit. Default mode is: [no argument] Run steps 1--3 repeatedly once per hour. Use the lock file in default periodic-update mode, too, because we don't want other execution modes to interfere with an ongoing periodic update either. Implements part of #13600. --- .../java/org/torproject/onionoo/cron/Main.java | 276 ++++++++++++++------ .../onionoo/updater/DescriptorSource.java | 3 - 2 files changed, 200 insertions(+), 79 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/cron/Main.java b/src/main/java/org/torproject/onionoo/cron/Main.java index c098dfe..2f45cea 100644 --- a/src/main/java/org/torproject/onionoo/cron/Main.java +++ b/src/main/java/org/torproject/onionoo/cron/Main.java @@ -1,4 +1,4 @@ -/* Copyright 2011, 2012 The Tor Project +/* Copyright 2011--2015 The Tor Project * See LICENSE for licensing information */ package org.torproject.onionoo.cron; @@ -18,102 +18,226 @@ import org.torproject.onionoo.util.LockFile; import org.torproject.onionoo.writer.DocumentWriterRunner; /* Update search data and status data files. */ -public class Main { - - private static Logger log = LoggerFactory.getLogger(Main.class); +public class Main implements Runnable { private Main() { } - private static final ScheduledExecutorService scheduler = - Executors.newScheduledThreadPool(1); + private Logger log = LoggerFactory.getLogger(Main.class); public static void main(String[] args) { - boolean runOnce = "true".equals(System.getProperty( - "onionoo.cron.runonce", "true")); - if (runOnce){ - log.info("Going to run one-time updater ... "); - LockFile lf = new LockFile(); - log.info("Initializing."); - if (lf.acquireLock()) { - log.info("Acquired lock"); - } else { - log.error("Could not acquire lock. Is Onionoo already running? " - + "Terminating"); - return; - } - new Updater().run(); - log.info("Releasing lock."); - if (lf.releaseLock()) { - log.info("Released lock"); - } else { - log.error("Could not release lock. The next execution may not " - + "start as expected"); + Main main = new Main(); + main.parseArgsOrExit(args); + main.runOrScheduleExecutions(); + } + + boolean defaultMode = false, singleRun = false, downloadOnly = false, + updateOnly = false, writeOnly = false; + + /* TODO Parsing command-line arguments is only a workaround until we're + * more certain what kind of options we want to support. We should then + * switch to some library that parses options for us. */ + private void parseArgsOrExit(String[] args) { + boolean validArgs = true; + if (args.length == 0) { + this.defaultMode = true; + } else if (args.length == 1) { + switch (args[0]) { + case "--help": + this.printUsageAndExit(0); + break; + case "--single-run": + this.singleRun = true; + break; + case "--download-only": + this.downloadOnly = true; + break; + case "--update-only": + this.updateOnly = true; + break; + case "--write-only": + this.writeOnly = true; + break; + default: + validArgs = false; } - return; + } else if (args.length > 1) { + validArgs = false; + } + if (!validArgs) { + this.printUsageAndExit(1); + } + } + + private void printUsageAndExit(int status) { + System.err.println("Please provide only a single execution:"); + System.err.println(" [no argument] Run steps 1--3 repeatedly " + + "once per hour."); + System.err.println(" --single-run Run steps 1--3 only for a " + + "single time, then exit."); + System.err.println(" --download-only Only run step 1: download " + + "recent descriptors, then exit."); + System.err.println(" --update-only Only run step 2: update " + + "internal status files, then exit."); + System.err.println(" --write-only Only run step 3: write " + + "output document files, then exit."); + System.err.println(" --help Print out this help message " + + "and exit."); + System.exit(status); + } + + private void runOrScheduleExecutions() { + if (!this.defaultMode) { + this.log.info("Going to run one-time updater ... "); + this.run(); } else { - log.info("Periodic updater started."); - final Runnable updater = new Updater(); - int currentMinute = Calendar.getInstance().get(Calendar.MINUTE); - int initialDelay = (75 - currentMinute + currentMinute % 5) % 60; + this.scheduleExecutions(); + } + } + + private final ScheduledExecutorService scheduler = + Executors.newScheduledThreadPool(1); + + private void scheduleExecutions() { + this.log.info("Periodic updater started."); + final Runnable mainRunnable = this; + int currentMinute = Calendar.getInstance().get(Calendar.MINUTE); + int initialDelay = (75 - currentMinute + currentMinute % 5) % 60; + + /* Run after initialDelay delay and then every hour. */ + this.log.info("Periodic updater will start every hour at minute " + + ((currentMinute + initialDelay) % 60) + "."); + this.scheduler.scheduleAtFixedRate(mainRunnable, initialDelay, 60, + TimeUnit.MINUTES); + } + + public void run() { + this.acquireLockOrExit(); + this.initialize(); + this.downloadDescriptors(); + this.updateStatuses(); + this.writeDocuments(); + this.shutDown(); + this.gatherStatistics(); + this.cleanUp(); + this.releaseLock(); + } + + private LockFile lf; - /* Run after initialDelay delay and then every hour. */ - log.info("Periodic updater will start every hour at minute " - + ((currentMinute + initialDelay) % 60) + "."); - scheduler.scheduleAtFixedRate(updater, initialDelay, 60, - TimeUnit.MINUTES); + private void acquireLockOrExit() { + this.log.info("Initializing."); + this.lf = new LockFile(); + if (this.lf.acquireLock()) { + this.log.info("Acquired lock"); + } else { + this.log.error("Could not acquire lock. Is Onionoo already " + + "running? Terminating"); + System.exit(1); } } - private static class Updater implements Runnable{ + private DescriptorSource dso; - private Logger log = LoggerFactory.getLogger(Main.class); + private DocumentStore ds; - public void run() { - log.debug("Started update ..."); + private StatusUpdateRunner sur; - DescriptorSource dso = - DescriptorSourceFactory.getDescriptorSource(); - log.info("Initialized descriptor source"); - DocumentStore ds = DocumentStoreFactory.getDocumentStore(); - log.info("Initialized document store"); - StatusUpdateRunner sur = new StatusUpdateRunner(); - log.info("Initialized status update runner"); - DocumentWriterRunner dwr = new DocumentWriterRunner(); - log.info("Initialized document writer runner"); + private DocumentWriterRunner dwr; - log.info("Downloading descriptors."); - dso.downloadDescriptors(); + private void initialize() { + this.log.debug("Started update ..."); + if (!this.writeOnly) { + this.dso = DescriptorSourceFactory.getDescriptorSource(); + this.log.info("Initialized descriptor source"); + } + if (!this.downloadOnly) { + this.ds = DocumentStoreFactory.getDocumentStore(); + this.log.info("Initialized document store"); + } + if (!this.downloadOnly && !this.writeOnly) { + this.sur = new StatusUpdateRunner(); + this.log.info("Initialized status update runner"); + } + if (!this.downloadOnly && !this.updateOnly) { + this.dwr = new DocumentWriterRunner(); + this.log.info("Initialized document writer runner"); + } + } - log.info("Reading descriptors."); - dso.readDescriptors(); + private void downloadDescriptors() { + if (this.updateOnly || this.writeOnly) { + return; + } + this.log.info("Downloading descriptors."); + this.dso.downloadDescriptors(); + } - log.info("Updating internal status files."); - sur.updateStatuses(); + private void updateStatuses() { + if (this.downloadOnly || this.writeOnly) { + return; + } + this.log.info("Reading descriptors."); + this.dso.readDescriptors(); + this.log.info("Updating internal status files."); + this.sur.updateStatuses(); + } - log.info("Updating document files."); - dwr.writeDocuments(); + private void writeDocuments() { + if (this.downloadOnly || this.updateOnly) { + return; + } + log.info("Updating document files."); + this.dwr.writeDocuments(); + } - log.info("Shutting down."); - dso.writeHistoryFiles(); + private void shutDown() { + log.info("Shutting down."); + if (this.dso != null) { + this.dso.writeHistoryFiles(); log.info("Wrote parse histories"); - ds.flushDocumentCache(); - log.info("Flushed document cache"); - - log.info("Gathering statistics."); - sur.logStatistics(); - dwr.logStatistics(); - log.info("Descriptor source\n" + dso.getStatsString()); - log.info("Document store\n" + ds.getStatsString()); - - /* Clean up to prevent out-of-memory exception, and to ensure that - * the next execution starts with a fresh descriptor source. */ - log.info("Cleaning up."); - ds.invalidateDocumentCache(); - DocumentStoreFactory.setDocumentStore(null); - DescriptorSourceFactory.setDescriptorSource(null); - - log.info("Done."); + } + if (this.ds != null) { + this.ds.flushDocumentCache(); + this.log.info("Flushed document cache"); + } + } + + private void gatherStatistics() { + this.log.info("Gathering statistics."); + if (this.sur != null) { + this.sur.logStatistics(); + } + if (this.dwr != null) { + this.dwr.logStatistics(); + } + if (this.dso != null) { + this.log.info("Descriptor source\n" + this.dso.getStatsString()); + } + if (this.ds != null) { + this.log.info("Document store\n" + this.ds.getStatsString()); + } + } + + private void cleanUp() { + /* Clean up to prevent out-of-memory exception, and to ensure that the + * next execution starts with a fresh descriptor source. */ + this.log.info("Cleaning up."); + if (this.ds != null) { + this.ds.invalidateDocumentCache(); + } + DocumentStoreFactory.setDocumentStore(null); + DescriptorSourceFactory.setDescriptorSource(null); + this.log.info("Done."); + } + + private void releaseLock() { + this.log.info("Releasing lock."); + if (this.lf.releaseLock()) { + this.log.info("Released lock"); + } else { + this.log.error("Could not release lock. The next execution may " + + "not start as expected"); } } } diff --git a/src/main/java/org/torproject/onionoo/updater/DescriptorSource.java b/src/main/java/org/torproject/onionoo/updater/DescriptorSource.java index 26b7b10..52e00c9 100644 --- a/src/main/java/org/torproject/onionoo/updater/DescriptorSource.java +++ b/src/main/java/org/torproject/onionoo/updater/DescriptorSource.java @@ -68,9 +68,6 @@ public class DescriptorSource { downloadedFiles = 0, deletedLocalFiles = 0; private void downloadDescriptors(DescriptorType descriptorType) { - if (!this.descriptorListeners.containsKey(descriptorType)) { - return; - } DescriptorDownloader descriptorDownloader = new DescriptorDownloader(descriptorType); this.localFilesBefore += descriptorDownloader.statLocalFiles();

1 0

[onionoo/master] Support parsing archived descriptors from in/archive/.
by karsten＠torproject.org 19 Jun '15

19 Jun '15

commit 00494ff1f4ea85c8501cb56a0adba56fd3305616 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Apr 26 19:10:34 2015 +0200 Support parsing archived descriptors from in/archive/. Implements part of #13600. --- .../onionoo/updater/DescriptorQueue.java | 29 +++-- .../onionoo/updater/DescriptorSource.java | 137 ++++++++++++++------ 2 files changed, 120 insertions(+), 46 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/updater/DescriptorQueue.java b/src/main/java/org/torproject/onionoo/updater/DescriptorQueue.java index 93a291c..b86d585 100644 --- a/src/main/java/org/torproject/onionoo/updater/DescriptorQueue.java +++ b/src/main/java/org/torproject/onionoo/updater/DescriptorQueue.java @@ -24,8 +24,6 @@ class DescriptorQueue { private final static Logger log = LoggerFactory.getLogger( DescriptorQueue.class); - private File inDir; - private File statusDir; private DescriptorReader descriptorReader; @@ -56,14 +54,21 @@ class DescriptorQueue { return this.returnedBytes; } - public DescriptorQueue(File inDir, File statusDir) { - this.inDir = inDir; + public DescriptorQueue(File inDir, DescriptorType descriptorType, + File statusDir) { + File directory = inDir; + if (descriptorType != null) { + directory = this.getDirectoryForDescriptorType(inDir, + descriptorType); + } this.statusDir = statusDir; this.descriptorReader = DescriptorSourceFactory.createDescriptorReader(); + this.addDirectory(directory); } - public void addDirectory(DescriptorType descriptorType) { + public File getDirectoryForDescriptorType(File inDir, + DescriptorType descriptorType) { String directoryName = null; switch (descriptorType) { case RELAY_CONSENSUSES: @@ -93,9 +98,16 @@ class DescriptorQueue { default: log.error("Unknown descriptor type. Not adding directory " + "to descriptor reader."); + return null; + } + File directory = new File(inDir, directoryName); + return directory; + } + + private void addDirectory(File directory) { + if (directory == null) { return; } - File directory = new File(this.inDir, directoryName); if (directory.exists() && directory.isDirectory()) { this.descriptorReader.addDirectory(directory); this.descriptorReader.setMaxDescriptorFilesInQueue(1); @@ -107,6 +119,9 @@ class DescriptorQueue { } public void readHistoryFile(DescriptorHistory descriptorHistory) { + if (this.statusDir == null) { + return; + } String historyFileName = null; switch (descriptorHistory) { case RELAY_EXTRAINFO_HISTORY: @@ -168,8 +183,6 @@ class DescriptorQueue { public void writeHistoryFile() { if (this.historyFile == null) { - log.error("Unable to write history file, possibly because of an " - + "unknown descriptor type. Skipping."); return; } SortedMap<String, Long> excludedAndParsedFiles = diff --git a/src/main/java/org/torproject/onionoo/updater/DescriptorSource.java b/src/main/java/org/torproject/onionoo/updater/DescriptorSource.java index 52e00c9..b26a692 100644 --- a/src/main/java/org/torproject/onionoo/updater/DescriptorSource.java +++ b/src/main/java/org/torproject/onionoo/updater/DescriptorSource.java @@ -20,12 +20,15 @@ public class DescriptorSource { private static final Logger log = LoggerFactory.getLogger( DescriptorSource.class); - private final File inDir = new File("in/recent"); + private final File inRecentDir = new File("in/recent"), + inArchiveDir = new File("in/archive"); private final File statusDir = new File("status"); private List<DescriptorQueue> descriptorQueues; + private DescriptorQueue archiveDescriptorQueue; + public DescriptorSource() { this.descriptorQueues = new ArrayList<DescriptorQueue>(); this.descriptorListeners = @@ -35,9 +38,8 @@ public class DescriptorSource { private DescriptorQueue getDescriptorQueue( DescriptorType descriptorType, DescriptorHistory descriptorHistory) { - DescriptorQueue descriptorQueue = new DescriptorQueue(this.inDir, - this.statusDir); - descriptorQueue.addDirectory(descriptorType); + DescriptorQueue descriptorQueue = new DescriptorQueue( + this.inRecentDir, descriptorType, this.statusDir); if (descriptorHistory != null) { descriptorQueue.readHistoryFile(descriptorHistory); } @@ -78,35 +80,32 @@ public class DescriptorSource { } public void readDescriptors() { - /* Careful when changing the order of parsing descriptor types! The - * various status updaters may base assumptions on this order. With - * #13674 being implemented, this may not be the case anymore. */ - - log.debug("Reading " + DescriptorType.RELAY_SERVER_DESCRIPTORS + this.readArchivedDescriptors(); + log.debug("Reading recent " + DescriptorType.RELAY_SERVER_DESCRIPTORS + " ..."); this.readDescriptors(DescriptorType.RELAY_SERVER_DESCRIPTORS, DescriptorHistory.RELAY_SERVER_HISTORY, true); - log.debug("Reading " + DescriptorType.RELAY_EXTRA_INFOS + " ..."); + log.debug("Reading recent " + DescriptorType.RELAY_EXTRA_INFOS + " ..."); this.readDescriptors(DescriptorType.RELAY_EXTRA_INFOS, DescriptorHistory.RELAY_EXTRAINFO_HISTORY, true); - log.debug("Reading " + DescriptorType.EXIT_LISTS + " ..."); + log.debug("Reading recent " + DescriptorType.EXIT_LISTS + " ..."); this.readDescriptors(DescriptorType.EXIT_LISTS, DescriptorHistory.EXIT_LIST_HISTORY, true); - log.debug("Reading " + DescriptorType.RELAY_CONSENSUSES + " ..."); + log.debug("Reading recent " + DescriptorType.RELAY_CONSENSUSES + " ..."); this.readDescriptors(DescriptorType.RELAY_CONSENSUSES, DescriptorHistory.RELAY_CONSENSUS_HISTORY, true); - log.debug("Reading " + DescriptorType.BRIDGE_SERVER_DESCRIPTORS + log.debug("Reading recent " + DescriptorType.BRIDGE_SERVER_DESCRIPTORS + " ..."); this.readDescriptors(DescriptorType.BRIDGE_SERVER_DESCRIPTORS, DescriptorHistory.BRIDGE_SERVER_HISTORY, false); - log.debug("Reading " + DescriptorType.BRIDGE_EXTRA_INFOS + " ..."); + log.debug("Reading recent " + DescriptorType.BRIDGE_EXTRA_INFOS + " ..."); this.readDescriptors(DescriptorType.BRIDGE_EXTRA_INFOS, DescriptorHistory.BRIDGE_EXTRAINFO_HISTORY, false); - log.debug("Reading " + DescriptorType.BRIDGE_POOL_ASSIGNMENTS + log.debug("Reading recent " + DescriptorType.BRIDGE_POOL_ASSIGNMENTS + " ..."); this.readDescriptors(DescriptorType.BRIDGE_POOL_ASSIGNMENTS, DescriptorHistory.BRIDGE_POOLASSIGN_HISTORY, false); - log.debug("Reading " + DescriptorType.BRIDGE_STATUSES + " ..."); + log.debug("Reading recent " + DescriptorType.BRIDGE_STATUSES + " ..."); this.readDescriptors(DescriptorType.BRIDGE_STATUSES, DescriptorHistory.BRIDGE_STATUS_HISTORY, false); } @@ -128,34 +127,88 @@ public class DescriptorSource { } switch (descriptorType) { case RELAY_CONSENSUSES: - log.info("Read relay network consensuses"); + log.info("Read recent relay network consensuses"); break; case RELAY_SERVER_DESCRIPTORS: - log.info("Read relay server descriptors"); + log.info("Read recent relay server descriptors"); break; case RELAY_EXTRA_INFOS: - log.info("Read relay extra-info descriptors"); + log.info("Read recent relay extra-info descriptors"); break; case EXIT_LISTS: - log.info("Read exit lists"); + log.info("Read recent exit lists"); break; case BRIDGE_STATUSES: - log.info("Read bridge network statuses"); + log.info("Read recent bridge network statuses"); break; case BRIDGE_SERVER_DESCRIPTORS: - log.info("Read bridge server descriptors"); + log.info("Read recent bridge server descriptors"); break; case BRIDGE_EXTRA_INFOS: - log.info("Read bridge extra-info descriptors"); + log.info("Read recent bridge extra-info descriptors"); break; case BRIDGE_POOL_ASSIGNMENTS: - log.info("Read bridge-pool assignments"); + log.info("Read recent bridge-pool assignments"); break; } } + public void readArchivedDescriptors() { + if (!this.inArchiveDir.exists()) { + return; + } + log.info("Reading archived descriptors..."); + this.archiveDescriptorQueue = new DescriptorQueue(this.inArchiveDir, + null, null); + Descriptor descriptor; + while ((descriptor = this.archiveDescriptorQueue.nextDescriptor()) + != null) { + DescriptorType descriptorType = null; + boolean relay = false; + for (String annotation : descriptor.getAnnotations()) { + if (annotation.startsWith( + "@type network-status-consensus-3 1.")) { + descriptorType = DescriptorType.RELAY_CONSENSUSES; + relay = true; + } else if (annotation.startsWith("@type server-descriptor 1.")) { + descriptorType = DescriptorType.RELAY_SERVER_DESCRIPTORS; + relay = true; + } else if (annotation.startsWith("@type extra-info 1.")) { + descriptorType = DescriptorType.RELAY_EXTRA_INFOS; + relay = true; + } else if (annotation.startsWith("@type tordnsel 1.")) { + descriptorType = DescriptorType.EXIT_LISTS; + relay = true; + } else if (annotation.startsWith( + "@type bridge-network-status 1.")) { + descriptorType = DescriptorType.BRIDGE_STATUSES; + relay = false; + } else if (annotation.startsWith( + "@type bridge-server-descriptor 1.")) { + descriptorType = DescriptorType.BRIDGE_SERVER_DESCRIPTORS; + relay = false; + } else if (annotation.startsWith("@type bridge-extra-info 1.")) { + descriptorType = DescriptorType.BRIDGE_EXTRA_INFOS; + relay = false; + } + } + if (descriptorType == null) { + log.warn("Unrecognized descriptor in " + + this.inArchiveDir.getAbsolutePath() + " with annotations " + + descriptor.getAnnotations() + ". Not reading any further" + + "archived descriptors."); + break; + } + for (DescriptorListener descriptorListener : + this.descriptorListeners.get(descriptorType)) { + descriptorListener.processDescriptor(descriptor, relay); + } + } + log.info("Read archived descriptors"); + } + public void writeHistoryFiles() { - log.debug("Writing history "); + log.debug("Writing parse histories for recent descriptors..."); for (DescriptorQueue descriptorQueue : this.descriptorQueues) { descriptorQueue.writeHistoryFile(); } @@ -163,34 +216,42 @@ public class DescriptorSource { public String getStatsString() { StringBuilder sb = new StringBuilder(); - sb.append(" " + this.localFilesBefore + " descriptor files found " - + "locally\n"); - sb.append(" " + this.foundRemoteFiles + " descriptor files found " - + "remotely\n"); - sb.append(" " + this.downloadedFiles + " descriptor files " + sb.append(" " + this.localFilesBefore + " recent descriptor files " + + "found locally\n"); + sb.append(" " + this.foundRemoteFiles + " recent descriptor files " + + "found remotely\n"); + sb.append(" " + this.downloadedFiles + " recent descriptor files " + "downloaded from remote\n"); - sb.append(" " + this.deletedLocalFiles + " descriptor files " - + "deleted locally\n"); + sb.append(" " + this.deletedLocalFiles + " recent descriptor " + + "files deleted locally\n"); sb.append(" " + this.descriptorQueues.size() + " descriptor " - + "queues created\n"); + + "queues created for recent descriptors\n"); int historySizeBefore = 0, historySizeAfter = 0; long descriptors = 0L, bytes = 0L; - for (DescriptorQueue descriptorQueue : descriptorQueues) { + for (DescriptorQueue descriptorQueue : this.descriptorQueues) { historySizeBefore += descriptorQueue.getHistorySizeBefore(); historySizeAfter += descriptorQueue.getHistorySizeAfter(); descriptors += descriptorQueue.getReturnedDescriptors(); bytes += descriptorQueue.getReturnedBytes(); } sb.append(" " + FormattingUtils.formatDecimalNumber( - historySizeBefore) + " descriptors excluded from this " + historySizeBefore) + " recent descriptors excluded from this " + "execution\n"); sb.append(" " + FormattingUtils.formatDecimalNumber(descriptors) - + " descriptors provided\n"); + + " recent descriptors provided\n"); sb.append(" " + FormattingUtils.formatBytes(bytes) - + " provided\n"); + + " of recent descriptors provided\n"); sb.append(" " + FormattingUtils.formatDecimalNumber( - historySizeAfter) + " descriptors excluded from next " + historySizeAfter) + " recent descriptors excluded from next " + "execution\n"); + if (this.archiveDescriptorQueue != null) { + sb.append(" " + FormattingUtils.formatDecimalNumber( + this.archiveDescriptorQueue.getReturnedDescriptors()) + + " archived descriptors provided\n"); + sb.append(" " + FormattingUtils.formatBytes( + this.archiveDescriptorQueue.getReturnedBytes()) + " of " + + "archived descriptors provided\n"); + } return sb.toString(); } }

1 0

[onionoo/master] Actually support --update-only and later --write-only.
by karsten＠torproject.org 19 Jun '15

19 Jun '15

commit e430fe2bc011bf37aa658b79b85045c3f03ed12f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Apr 26 19:39:59 2015 +0200 Actually support --update-only and later --write-only. --- .../java/org/torproject/onionoo/cron/Main.java | 4 ++++ .../org/torproject/onionoo/docs/DocumentStore.java | 21 +++++++++----------- .../org/torproject/onionoo/server/NodeIndexer.java | 7 +++---- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/cron/Main.java b/src/main/java/org/torproject/onionoo/cron/Main.java index 2f45cea..6f39cb6 100644 --- a/src/main/java/org/torproject/onionoo/cron/Main.java +++ b/src/main/java/org/torproject/onionoo/cron/Main.java @@ -2,6 +2,7 @@ * See LICENSE for licensing information */ package org.torproject.onionoo.cron; +import java.io.File; import java.util.Calendar; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; @@ -141,6 +142,8 @@ public class Main implements Runnable { private DocumentStore ds; + private File outDir = new File("out"); + private StatusUpdateRunner sur; private DocumentWriterRunner dwr; @@ -160,6 +163,7 @@ public class Main implements Runnable { this.log.info("Initialized status update runner"); } if (!this.downloadOnly && !this.updateOnly) { + this.ds.setOutDir(outDir); this.dwr = new DocumentWriterRunner(); this.log.info("Initialized document writer runner"); } diff --git a/src/main/java/org/torproject/onionoo/docs/DocumentStore.java b/src/main/java/org/torproject/onionoo/docs/DocumentStore.java index 69646f1..3d2ae7a 100644 --- a/src/main/java/org/torproject/onionoo/docs/DocumentStore.java +++ b/src/main/java/org/torproject/onionoo/docs/DocumentStore.java @@ -10,7 +10,6 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.FileReader; -import java.io.FileNotFoundException; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; @@ -45,12 +44,8 @@ public class DocumentStore { private final File statusDir = new File("status"); - private File outDir = new File("out"); - public void setOutDir(File outDir) throws FileNotFoundException { - if (!outDir.exists() || !outDir.isDirectory()) { - throw new FileNotFoundException("Cannot access directory " - + outDir); - } + private File outDir = null; + public void setOutDir(File outDir) { this.outDir = outDir; } @@ -156,9 +151,8 @@ public class DocumentStore { private void cacheSummaryDocuments() { SortedMap<String, SummaryDocument> parsedSummaryDocuments = new TreeMap<String, SummaryDocument>(); - File directory = this.outDir; - if (directory != null) { - File summaryFile = new File(directory, "summary"); + if (this.outDir != null) { + File summaryFile = new File(this.outDir, "summary"); if (summaryFile.exists()) { String line = null; try { @@ -757,6 +751,10 @@ public class DocumentStore { } private void writeSummaryDocuments() { + if (this.outDir == null) { + /* Can't write out/summary without knowing the path of out/. */ + return; + } StringBuilder sb = new StringBuilder(); Gson gson = new Gson(); for (SummaryDocument summaryDocument : @@ -786,8 +784,7 @@ public class DocumentStore { private void writeUpdateStatus() { if (this.outDir == null) { - log.error("Unable to write update status file without knowing the " - + "'out' directory to write to!"); + /* Can't write out/update without knowing the path of out/. */ return; } UpdateStatus updateStatus = new UpdateStatus(); diff --git a/src/main/java/org/torproject/onionoo/server/NodeIndexer.java b/src/main/java/org/torproject/onionoo/server/NodeIndexer.java index 64cf3a9..5788d4e 100644 --- a/src/main/java/org/torproject/onionoo/server/NodeIndexer.java +++ b/src/main/java/org/torproject/onionoo/server/NodeIndexer.java @@ -35,14 +35,13 @@ public class NodeIndexer implements ServletContextListener, Runnable { public void contextInitialized(ServletContextEvent contextEvent) { ServletContext servletContext = contextEvent.getServletContext(); File outDir = new File(servletContext.getInitParameter("outDir")); - DocumentStore documentStore = DocumentStoreFactory.getDocumentStore(); - try { - documentStore.setOutDir(outDir); - } catch(FileNotFoundException fnfe) { + if (!outDir.exists() || !outDir.isDirectory()) { log.error("\n\n\tOut-dir not found! Expected directory: " + outDir + "\n\tVerify the configuration in ./etc/web.xml.template"); System.exit(1); } + DocumentStore documentStore = DocumentStoreFactory.getDocumentStore(); + documentStore.setOutDir(outDir); /* The servlet container created us, and we need to avoid that * ApplicationFactory creates another instance of us. */ NodeIndexerFactory.setNodeIndexer(this);

1 0

[tor-browser-spec/master] Commit FF38 audit notes (incomplete).
by mikeperry＠torproject.org 18 Jun '15

18 Jun '15

commit 989c423b71698e85421c6a85a5855506cea530d5 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Jun 18 15:56:54 2015 -0700 Commit FF38 audit notes (incomplete). Still need to finish XPCOM socket auditing. --- audits/FF38_NETWORK_AUDIT | 269 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 269 insertions(+) diff --git a/audits/FF38_NETWORK_AUDIT b/audits/FF38_NETWORK_AUDIT new file mode 100644 index 0000000..dfcdf8c --- /dev/null +++ b/audits/FF38_NETWORK_AUDIT @@ -0,0 +1,269 @@ +Lowest level resolver calls: + + PR_GetHostByName + + ./profile/dirserviceprovider/src/nsProfileLock.cpp + + nsProfileLock::LockWithSymlink() looks up 127.0.0.1.. + + XXX: Should we remove this? It seems kind of silly. + + ./nsprpub/pr/src/cplus/rcnetdb.cpp + + RCHostLookup::ByName() + + Not used + + ./security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c + + XXX: pkix_pl_Socket_CreateByName and pkix_pl_Socket_CreateByHostAndPort + + Patched + + ./security/nss/lib/certhigh/ocsp.c + + XXX: ocsp_ConnectToHost + + Patched + + PR_GetIPNodeByName + + Used by tests only + + PR_StringToNetAddr + + Passes AI_NUMERICHOST to getaddrinfo. No resolution. + + PR_GetAddrInfoByName + + ./security/nss/cmd/ usage (NSS cli commands only) + + ./netwerk/dns/GetAddrInfo.cpp + + ./netwerk/dns/nsHostResolver.cpp + + nsHostResolver::ResolveHost() is entrypoint + + nsHostResolver::ThreadFunc() will resolve without SOCKS + + Only used by nsDNSService2 + +Direct paths to DNS resolution: + + nsDNSService::Resolve + + nsDNSService::AsyncResolve + + Patched for safety + + nsHostResolver::ResolveHost + + Only used by nsDNSService + +Misc UDP (SOCK_DGRAM, PR_DESC_SOCKET_UDP): + + PR_DESC_SOCKET_UDP + + ./nsprpub/pr/src/md/os2/os2io.c + + ./nsprpub/pr/src/cplus/rcio.h + + RCFileIO (not used) + + RCNetStreamIO (not used) + + ./nsprpub/pr/src/io/prsocket.c + + PR_GetUDPMethods + + ./nsprpub/pr/src/misc/prinit.c + + PR_GetInheritedFD + + ./nsprpub/pr/src/pthreads/ptio.c + + SOCK_DGRAM + + Android junk (not relevant): + + ./other-licenses/android/res_send.c + + ./other-licenses/android/res_init.c + + ./other-licenses/android/getaddrinfo.c + + ./hal/gonk/UeventPoller.cpp + + netlink stuff + + ./ipc/chromium/src/third_party/libevent/evdns.c + + evdns is unused + + ./ipc/chromium/src/third_party/libevent/evutil.c + + interface checking functions. Unused. + + ./media/webrtc/* + + Disabled + + ./media/mtransport/third_party/nICEr/src/stun/addrs.c + + boils down to NrIceCtx::StartGathering + + Used only for PeerConnection, which we disable + + SCTP is only enabled with WEBRTC (see configure.in, netwerk/moz.build, and ./dom/base/moz.build) + + ./netwerk/sctp/src/netinet/sctputil.c + + ./netwerk/sctp/src/netinet/sctp_userspace.c + + ./netwerk/sctp/src/netinet/sctp_pcb.c + + ./netwerk/sctp/src/ifaddrs_android.cpp + + ./netwerk/sctp/src/user_recv_thread.c + + ./netwerk/wifi/nsWifiScannerFreeBSD.cpp + + GeoIP stuff. Is disabled. + + ./nsprpub/pr/src/io/prsocket.c + + PR_NewUDPSocket + + PR_OpenUDPSocket + + PR_Socket + + ./nsprpub/pr/src/pthreads/ptio.c + + PR_NewUDPSocket + + ./media/mtransport/nr_socket_prsock.cpp + + Disabled with WebRTC + + PR_OpenUDPSocket + + RTSP is only on Android (see configure.in, pref: media.rtsp.enabled): + + ./netwerk/protocol/rtsp/rtsp/ARTPSession.cpp + + ./netwerk/protocol/rtsp/rtsp/ARTPConnection.cpp + + ./netwerk/protocol/rtsp/rtsp/ARTPWriter.cpp + + ./netwerk/protocol/rtsp/rtsp/UDPPusher.cpp + + ./netwerk/base/src/Tickler.cpp + + Sends UDP packets to DHCP gateway, but only on android + + ./netwerk/socket/nsUDPSocketProvider.cpp + + NewSocket(). Unused. + + ./netwerk/base/src/ProxyAutoConfig.cpp + + We don't use PAC. + + ./netwerk/base/src/nsUDPSocket.cpp + + Unused except for nsUDPSocketProvider + + PR_ImportUDPSocket + + Only called if NSPR_INHERIT_FDS in environment + +Misc TCP (SOCK_STREAM, PR_DESC_SOCKET_TCP): + + PR_DESC_SOCKET_TCP + + ./nsprpub/pr/src/md/os2/os2io.c + + OS/2 only + + ./nsprpub/pr/src/cplus/rcio.h + + RCFileIO (not used) + + RCNetStreamIO (not used) + + ./nsprpub/pr/src/io/pripv6.c + + Underlying wrapper for PR_Socket + + ./nsprpub/pr/src/io/prsocket.c + + ./nsprpub/pr/src/misc/prinit.c + + ./nsprpub/pr/src/pthreads/ptio.c + + ./netwerk/base/src/nsSocketTransportService2.cpp + + SOCK_STREAM + + ./dom/bluetooth/bluez/BluetoothUnixSocketConnector.cpp + + bluetooth sockets only + + ./dom/system/gonk/VolumeManager.cpp + + local only + + ./ipc/chromium/src/chrome/common/ipc_channel_posix.cc + + AF_UNIX/local only + + ./ipc/chromium/src/third_party/libevent/event.c + + ./ipc/chromium/src/third_party/libevent/evutil.c + + ./ipc/chromium/src/third_party/libevent/listener.c + + ./ipc/chromium/src/third_party/libevent/bufferevent_sock.c + + ./ipc/chromium/src/third_party/libevent/signal.c + + ./ipc/chromium/src/third_party/libevent/http.c + + ./ipc/chromium/src/third_party/libevent/event_iocp.c + + ./ipc/keystore/KeyStore.cpp + + AF_LOCAL only + + ./ipc/nfc/Nfc.cpp + + local/loopback only + + ./ipc/ril/Ril.cpp + + local/loopback only + + ./ipc/netd/Netd.cpp + + local only + + ./media/webrtc/* - disabled + + ./netwerk/dns/GetAddrInfo.cpp + + Only available through dns service + + ./mozglue/build/Nuwa.cpp + + Unix sockets only + + ./nsprpub/pr/src/misc/prnetdb.c + + RTSP and SCTP are disabled if WebRTC is compiled out + + ./netwerk/protocol/rtsp/rtsp/ARTSPConnection.cpp + + ./netwerk/sctp/src/netinet/sctp_pcb.c + + ./netwerk/sctp/src/user_socket.c + + ./netwerk/sctp/datachannel/DataChannel.cpp + + Android stuff: disabled + + ./other-licenses/android/res_send.c + + ./other-licenses/android/getaddrinfo.c + + ./nsprpub/pr/src/md/windows/ntio.c + + ./nsprpub/pr/src/cplus/rcnetio.cpp + + ./nsprpub/pr/src/io/prsocket.c + + ./nsprpub/pr/src/misc/prnetdb.c + + ./nsprpub/pr/src/pthreads/ptio.c + + ./toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/crash_generation_client.cc + + AF_UNIX socket.. + + PR_NewTCPSocket + + ./nsprpub/pr/src/cplus/rcnetio.cpp + + ./nsprpub/pr/src/io/prpolevt.c + + ./media/mtransport/nr_socket_prsock.cpp + + WebRTC only + + ./security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c + + pkix_pl_Socket_CreateClient + + pkix_pl_Socket_CreateByHostAndPort and pkix_pl_Socket_CreateByName + and pkix_pl_Socket_Create + + PKIX_PL_LdapDefaultClient_Create is unused. Other two noted above. + + Patched in pkix_pl_Socket_Create anyway. + + ./security/nss/lib/certhigh/ocsp.c + + ocsp_ConnectToHost. Patched for Defense in Depth + + PR_OpenTCPSocket + + ./security/manager/ssl/src/nsNSSIOLayer.cpp + + nsSSLIOLayerNewSocket + + ./security/manager/ssl/src/nsTLSSocketProvider.cpp + + nsTLSSocketProvider::NewSocket + + ./security/manager/ssl/src/nsSSLSocketProvider.cpp + + nsSSLSocketProvider::NewSocket (nsISocketProvider) + + nsISocketProvider.newSocket + + used with proxy settings (and only in nsSocketTransport::BuildSocket) + + ./netwerk/socket/nsSOCKSIOLayer.cpp + + ./netwerk/socket/nsSOCKSSocketProvider.cpp + + ./netwerk/base/src/nsSocketTransportService2.cpp + + ./netwerk/base/src/nsSocketTransport2.cpp + + ./netwerk/base/src/nsServerSocket.cpp + + PR_ImportTCPSocket + +Misc PR_Socket: + + ./nsprpub/pr/src/io/prmapopt.c + + ./nsprpub/pr/src/cplus/rcnetio.cpp + + RCNetStreamIO::RCNetStreamIO + +Misc XPCOM: + + *SocketProvider + + newSocket + + ./netwerk/base/src/nsSocketTransport2.cpp: + + used with proxy settings + + addToSocket + + @mozilla.org/*/udp-socket (grep for udp-socket) + + dom/push/PushService.jsm: + + WTF. _listenForUDPWakeup!!! + + Controlled by pref services.push.udp.wakeupEnabled + + And also services.push.enabled + + Currently false + + XXX: Verify false on android and in the future! + + dom/network/UDPSocket.cpp: + + dom.udpsocket.enabled prefs this off + + XXX: Watch this in the future! + + dom/apps/PermissionsTable.jsm + + dom/webidl/SocketCommon.webidl + + dom/webidl/UDPSocket.webidl + + layout/build/nsLayoutModule.cpp + + ./netwerk/build/nsNetCID.h + + NS_SOCKETTRANSPORTSERVICE_* + + Proxied if TCP + + Udp limited to mtransport and webrtc + + NS_UDPSOCKET_* + - toolkit/devtools/discovery/discovery.js + - XXX: Wtf is this thing? + - Part of "WebIDE", but seemingly not enabled until FF39? + - toolkit/modules/secondscreen/SimpleServiceDiscovery.jsm + - XXX: wtf is this thing? + + @mozilla.org/*/tcp-socket-* (grep for tcp-socket) + - ./toolkit/modules/secondscreen/RokuApp.jsm + - XXX: Android-only? But def proxy-bypass + + ./netwerk/protocol/rtsp/ (disabled) + - ./dom/network/TCPSocket.js + - XXX: possibly exposed via navigator.mozTCPSocket.. dom.mozTCPSocket.enabled pref control.. Android/FxOS only? + - https://developer.mozilla.org/en-US/docs/Web/API/Navigator/mozTCPSocket + - ./dom/network/TCPSocket.manifest + + ./dom/apps/tests/marketplace/marketplace_privileged_app.webapp + + ./dom/apps/PermissionsTable.jsm + - ./browser/extensions/shumway/chrome/RtmpUtils.jsm + - XXX: shumway.rtmp.enabled governs usage of createSocket + - ./browser/extensions/shumway/chrome/viewerWrapper.js + - ./browser/extensions/shumway/chrome/content.js + - ./browser/extensions/shumway/content/shumway.player.js can also use + mozTCPSocket + + ./layout/build/nsLayoutModule.cpp + - @mozilla.org/network/*socket* (grep -R "@mozilla.org/network/" . | grep socket | grep -v udp-socket) + + ./addon-sdk/source/lib/sdk/io/stream.js + + Addon APIs + + ./dom/ipc/preload.js + + ./dom/network/TCPServerSocket.js + - ./mobile/android/chrome/content/WebappRT.js + - Debugger? + - XXX: Pretty sure this is only for 'webapps', but it sets some scary + prefs that might impact other browser operation if an app is + installed? + + ./netwerk/build/nsNetCID.h + - Debugger stuff + - XXX: Has several prefs: + - devtools.debugger.enabled? + - devtools.debugger.remote-enabled + - devtools.debugger.force-local + - devtools.remote.tls-handshake-timeout + - ./toolkit/devtools/server/main.js + - ./toolkit/devtools/client/connection-manager.js + - ./toolkit/devtools/server/main.js + - ./toolkit/devtools/client/dbg-client.jsm + - ./toolkit/devtools/security/socket.js + - ./toolkit/modules/Sntp.jsm + - B2G ntp + - ./toolkit/xre/nsAppRunner.cpp + - createTransport() + + ./netwerk/protocol/http/nsHttpConnectionMgr.cpp + + ./netwerk/protocol/ftp/nsFtpConnectionThread.cpp + + ./netwerk/protocol/ftp/nsFtpControlConnection.cpp + +- Misc XPCOM Contract-ID/CID defines: + - NS_*SOCKET*_C should get them all (grep -R "NS_" | grep SOCKET | grep "_C") + ++ Gstreamer + + ./dom/media/gstreamer/GStreamerDecoder.cpp + + Uses ChannelMediaResource underneath, and ultimately an nsIChannel + + Only exception seems to be if an RtspMediaResource could be used, + but this appears to be FxOS-only. + + XXX: Note for FxOS tor support. This may be an issue.

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 18 Jun '15

18 Jun '15

commit e57f1c37eb2a7d9a0c9e5eba65e5e7fb2384b23a Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 18 19:46:02 2015 +0000 Update translations for tails-misc_completed --- pt_BR.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt_BR.po b/pt_BR.po index dbd1486..6e7cf9a 100644 --- a/pt_BR.po +++ b/pt_BR.po @@ -17,7 +17,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-05-02 23:47+0200\n" -"PO-Revision-Date: 2015-06-18 19:06+0000\n" +"PO-Revision-Date: 2015-06-18 19:17+0000\n" "Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -78,7 +78,7 @@ msgstr "_Saída" #: config/chroot_local-includes/usr/local/bin/gpgApplet:136 msgid "OpenPGP encryption applet" -msgstr "Applet de criptografia OpenPGP" +msgstr "Applet de encriptação OpenPGP" #: config/chroot_local-includes/usr/local/bin/gpgApplet:139 msgid "Exit"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 18 Jun '15

18 Jun '15

commit 111e2cf1f61406ba06fdc7bf47b5bc0c5b43ce52 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 18 19:45:59 2015 +0000 Update translations for tails-misc --- pt_BR.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt_BR.po b/pt_BR.po index dbd1486..6e7cf9a 100644 --- a/pt_BR.po +++ b/pt_BR.po @@ -17,7 +17,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-05-02 23:47+0200\n" -"PO-Revision-Date: 2015-06-18 19:06+0000\n" +"PO-Revision-Date: 2015-06-18 19:17+0000\n" "Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -78,7 +78,7 @@ msgstr "_Saída" #: config/chroot_local-includes/usr/local/bin/gpgApplet:136 msgid "OpenPGP encryption applet" -msgstr "Applet de criptografia OpenPGP" +msgstr "Applet de encriptação OpenPGP" #: config/chroot_local-includes/usr/local/bin/gpgApplet:139 msgid "Exit"

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 18 Jun '15

18 Jun '15

commit def8615123b181c2bf52310fb7ed512374c01482 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 18 19:45:50 2015 +0000 Update translations for tor-launcher-properties_completed --- pt_BR/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/torlauncher.properties b/pt_BR/torlauncher.properties index e39ebbb..0c56aff 100644 --- a/pt_BR/torlauncher.properties +++ b/pt_BR/torlauncher.properties @@ -40,7 +40,7 @@ torlauncher.forAssistance=Para assistência, contacte torlauncher.copiedNLogMessages=Cópia concluída. As mensagens %S do Tor log estão prontas para ser copiadas em um editor de texto ou em uma mensagem de e-mail. torlauncher.bootstrapStatus.conn_dir=Conectando a um diretório de retransmissores -torlauncher.bootstrapStatus.handshake_dir=Estabelecendo uma conexão de diretório criptografada +torlauncher.bootstrapStatus.handshake_dir=Estabelecendo uma conexão de diretório criptografado torlauncher.bootstrapStatus.requesting_status=Recebendo estado da rede torlauncher.bootstrapStatus.loading_status=Carregando estado da rede torlauncher.bootstrapStatus.loading_keys=Carregando certificados de autoridade

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 18 Jun '15

18 Jun '15

commit 5153c6fb4dd8b2e1d82bddcbf48ae874c31c8bd1 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 18 19:45:46 2015 +0000 Update translations for tor-launcher-properties --- pt_BR/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/torlauncher.properties b/pt_BR/torlauncher.properties index e39ebbb..0c56aff 100644 --- a/pt_BR/torlauncher.properties +++ b/pt_BR/torlauncher.properties @@ -40,7 +40,7 @@ torlauncher.forAssistance=Para assistência, contacte torlauncher.copiedNLogMessages=Cópia concluída. As mensagens %S do Tor log estão prontas para ser copiadas em um editor de texto ou em uma mensagem de e-mail. torlauncher.bootstrapStatus.conn_dir=Conectando a um diretório de retransmissores -torlauncher.bootstrapStatus.handshake_dir=Estabelecendo uma conexão de diretório criptografada +torlauncher.bootstrapStatus.handshake_dir=Estabelecendo uma conexão de diretório criptografado torlauncher.bootstrapStatus.requesting_status=Recebendo estado da rede torlauncher.bootstrapStatus.loading_status=Carregando estado da rede torlauncher.bootstrapStatus.loading_keys=Carregando certificados de autoridade

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 18 Jun '15

18 Jun '15

commit 9b181d5d47be809c632a6bd2f24bd1e3a485d415 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 18 19:45:39 2015 +0000 Update translations for torbirdy_completed --- pt_BR/torbirdy.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/torbirdy.dtd b/pt_BR/torbirdy.dtd index 52196cf..4c9db8c 100644 --- a/pt_BR/torbirdy.dtd +++ b/pt_BR/torbirdy.dtd @@ -39,7 +39,7 @@ <!ENTITY torbirdy.prefs.startup_folder.key "I"> <!ENTITY torbirdy.prefs.timezone.label "Não definir o fuso horário do Thunderbird como UTC [padrão: definido como UTC]"> <!ENTITY torbirdy.prefs.timezone.key "z"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Não pôr as identidades dos destinatários em mensagens criptografadas [padrão: pôr]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Não incluir as identidades dos destinatários em mensagens criptografadas [padrão: incluir]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!ENTITY torbirdy.prefs.confirmemail.label "Confirmar se Enigmail está ativado antes de enviar um e-mail [padrão: não confirmar]"> <!ENTITY torbirdy.prefs.confirmemail.key "c">

1 0