February 2014 - tor-commits - lists.torproject.org

[bridgedb/master] Improve WebResourceBridges' docstring
by isis＠torproject.org 21 Feb '14

21 Feb '14

commit 46ff7aaf130353abf4d30a2562bce3692ec93f55 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Mon Feb 3 08:23:29 2014 +0000 Improve WebResourceBridges' docstring --- lib/bridgedb/HTTPServer.py | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 610249a..633d903 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -244,9 +244,23 @@ class WebResourceBridges(twisted.web.resource.Resource): def __init__(self, distributor, schedule, N=1, useForwardedHeader=False, includeFingerprints=True, domains=None): """Create a new WebResource. - distributor -- an IPBasedDistributor object - schedule -- an IntervalSchedule object - N -- the number of bridges to hand out per query. + :type distributor: :class:`IPBasedDistributor` + :param distributor: The mechanism to retrieve bridges for + this distributor + :type schedule: :class:`IntervalSchedule` + :param schedule: The time period used to tweak the bridge + selection procedure. + :param int N: The number of bridges to hand out per query. + :param bool useForwardedHeader: Whether or not we should + use the the + X-Forwarded-For header + instead of the source IP + address. + :param bool includeFingerprints: Do we include the + bridge's fingerprint + in the response? + :param list domains: The list of email provider + domain names we support. (unused) """ gettext.install("bridgedb", unicode=True) twisted.web.resource.Resource.__init__(self)

1 0

[bridgedb/master] Merge branch 'testing/tpo-sysrqb/bug9127' into develop
by isis＠torproject.org 21 Feb '14

21 Feb '14

commit aa835c1d9155c5139950a4e35d76bf6cfb295415 Merge: a2aec59 46ff7aa Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Feb 6 05:41:56 2014 +0000 Merge branch 'testing/tpo-sysrqb/bug9127' into develop lib/bridgedb/HTTPServer.py | 55 +++++++++++++++++++++++++++++++---- lib/bridgedb/templates/base.html | 5 ++++ lib/bridgedb/templates/index.html | 11 +++---- lib/bridgedb/templates/options.html | 39 +++++++++++++++++++++++++ 4 files changed, 98 insertions(+), 12 deletions(-)

1 0

[bridgedb/master] Remove Python2.6 testing from .travis.yml.
by isis＠torproject.org 21 Feb '14

21 Feb '14

commit f0c1e6e5484eeab1898f75a2aa4579d95ff7b8ca Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Feb 8 04:39:45 2014 +0000 Remove Python2.6 testing from .travis.yml. [ci skip] --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b4bc299..9858edf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,6 @@ before_install: - sudo apt-get install --no-install-suggests --no-install-recommends python-dev python-setuptools python: - - "2.6" - "2.7" install:

1 0

[bridgedb/master] Prefer to use information from NS rather than descriptor
by isis＠torproject.org 21 Feb '14

21 Feb '14

commit bafeaaa06f5a0f70b922b93f3d14baa2e6ff33fe Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Jan 31 18:12:48 2014 +0000 Prefer to use information from NS rather than descriptor --- lib/bridgedb/Bridges.py | 14 ++++++++++---- lib/bridgedb/Main.py | 5 +++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index 6bf4b2e..c8ecc9f 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -540,6 +540,7 @@ def parseStatusFile(networkstatusFile): logging.debug(" ORAddress: {0}".format(ORaddr)) logging.debug(" ORport: {0}".format(ORport)) logging.debug(" dirport: {0}".format(dirport)) + descDigest = toHex(descDigest) elif ID and line.startswith("a "): try: @@ -556,10 +557,15 @@ def parseStatusFile(networkstatusFile): elif ID and timestamp and line.startswith("s "): running, stable = networkstatus.parseSLine(line) - logging.debug("Bridges.parseStatusFile(): "\ - "yielding %s running=%s stable=%s oraddrs=%s ts=%s" - % (toHex(ID), running, stable, or_addresses, timestamp)) - yield ID, running, stable, or_addresses, timestamp + logging.debug("Bridges.parseStatusFile(): " + "yielding %s nickname=%s descDigest=%s " + "running=%s stable=%s oraddr=%s orport=%s " + "oraddrs=%s ts=%s" + % (toHex(ID), nickname, descDigest, running, + stable, ORaddr, ORport, or_addresses, + timestamp)) + yield (ID, nickname, descDigest, running, stable, ORaddr, ORport, + or_addresses, timestamp) (nickname, ID, descDigest, timestamp, ORaddr, ORport, dirport, addr, portlist) = (None for x in xrange(9)) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 4ab4d02..c3a90ea 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -98,8 +98,9 @@ def load(state, splitter, clear=False): logging.info("Opening network status file: %s" % state.STATUS_FILE) f = open(state.STATUS_FILE, 'r') - for (ID, running, stable, - or_addresses, timestamp) in Bridges.parseStatusFile(f): + for (ID, nickname, descDigest, running, stable, + ORaddr, ORport, or_addresses, + timestamp) in Bridges.parseStatusFile(f): status[ID] = running, stable addresses[ID] = or_addresses

1 0

[bridgedb/master] Fix UnicodeDecodeErrors from unittests for bridgedb.persistent.
by isis＠torproject.org 21 Feb '14

21 Feb '14

commit 1a8fb997ad2a61df32cd633e727401a7fea85d03 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Feb 9 00:35:05 2014 +0000 Fix UnicodeDecodeErrors from unittests for bridgedb.persistent. --- lib/bridgedb/persistent.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/bridgedb/persistent.py b/lib/bridgedb/persistent.py index 311240a..84260f6 100644 --- a/lib/bridgedb/persistent.py +++ b/lib/bridgedb/persistent.py @@ -252,12 +252,16 @@ class State(jelly.Jellyable): if value != self.config.__dict__[key]: setattr(self, key, value) updated.append(key) - logging.debug("Updated %s setting: %r → %r" - % (key, self.config.__dict__[key], value)) + logging.debug("Updated %s setting: %r → %r" % + (key.decode('ascii', 'replace'), + self.config.__dict__[key], + value)) except (KeyError, AttributeError): setattr(self, key, value) new.append(key) - logging.debug("New setting: %s = %r" % (key, value)) + logging.debug("New setting: %s = %r" % + (key.decode('ascii', 'replace'), + value)) logging.info("Updated setting(s): %s" % ' '.join([x for x in updated])) logging.info("New setting(s): %s" % ' '.join([x for x in new]))

1 0

[bridgedb/master] We need to compute the hash digest of the documents during (re)loading
by isis＠torproject.org 21 Feb '14

21 Feb '14

commit e2d15df828ac6f4678ca5b8c132ab6c466465bc4 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Jan 31 18:13:31 2014 +0000 We need to compute the hash digest of the documents during (re)loading --- lib/bridgedb/Bridges.py | 71 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index c8ecc9f..2c1b34e 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -15,6 +15,7 @@ import socket import time import ipaddr import random +import hashlib import bridgedb.Storage import bridgedb.Bucket @@ -23,6 +24,11 @@ import bridgedb.Util as Util from bridgedb.parse import addr from bridgedb.parse import networkstatus +try: + from cStringIO import StringIO +except ImportError: + from io import StringIO + HEX_FP_LEN = 40 ID_LEN = 20 @@ -316,6 +322,71 @@ class Bridge: db = bridgedb.Storage.getDB() return db.getBridgeHistory(self.fingerprint).weightedUptime +def getDescriptorDigests(desc): + """Return the SHA-1 hash hexdigests of all descriptor descs + + :param File desc: A string containing the contents of one + or more bridge descriptors concatenated + together. + :returns: A dict indexed by the SHA-1 hexdigest of the bridge + descriptor, equivalent to that which was published + on the 'r' line of the networkstatus for this bridge. + The value is the bridge's extra-info document digest, + or None, if not provided. + """ + if not desc: return None + + descriptors = {} + sha1hash = hashlib.sha1() + ei_digest = None + + for line in desc: + if line != '-----BEGIN SIGNATURE-----\n': + sha1hash.update(line) + if line.startswith('extra-info-digest'): + parts = line.split() + if len(parts) == 2: + ei_digest = parts[1].lower() + else: + digest = sha1hash.hexdigest().lower() + descriptors[digest] = ei_digest + while line != '-----END SIGNATURE-----\n': + line = next(desc) + sha1hash = hashlib.sha1() + ei_digest = None + return descriptors + +def getExtraInfoDigests(doc): + """Return the SHA-1 hash hexdigests of all extra-info documents + + :param File doc: A string containing the contents of one + or more bridge extra-info documents concatenated + together. + :returns: A dict indexed by the SHA-1 hexdigest of the bridge + extra-info doc, equivalent to that which was published + on the 'extra-info-digest' line of the bridge's + descriptor. The value is the bridge's extra-info document + digest, or None, if not provided. + """ + if not doc: return None + + documents = {} + sha1hash = hashlib.sha1() + document_content = '' + + for line in doc: + if line != '-----BEGIN SIGNATURE-----\n': + sha1hash.update(line) + document_content += line + else: + digest = sha1hash.hexdigest().lower() + documents[digest] = StringIO(document_content) + while line != '-----END SIGNATURE-----\n': + line = next(doc) + sha1hash = hashlib.sha1() + document_content = '' + return documents + def parseDescFile(f, bridge_purpose='bridge'): """Generator. Parses a cached-descriptors file 'f' and yeilds a Bridge object for every entry whose purpose matches bridge_purpose.

1 0

[translation/tails-iuk_completed] Update translations for tails-iuk_completed
by translation＠torproject.org 21 Feb '14

21 Feb '14

commit 67ff20f44f8f9794e7301aff67c1d8ddd6b8f9e8 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 21 20:45:59 2014 +0000 Update translations for tails-iuk_completed --- it.po | 108 +++++++++++++++++++++++++++-------------------------------------- 1 file changed, 45 insertions(+), 63 deletions(-) diff --git a/it.po b/it.po index 03b7251..b09548c 100644 --- a/it.po +++ b/it.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2014-02-18 19:03+0100\n" -"PO-Revision-Date: 2014-02-20 17:50+0000\n" +"POT-Creation-Date: 2014-02-20 15:49+0100\n" +"PO-Revision-Date: 2014-02-21 20:20+0000\n" "Last-Translator: Francesca Ciceri <madamezou(a)zouish.org>\n" "Language-Team: Italian (http://www.transifex.com/projects/p/torproject/language/it/)\n" "MIME-Version: 1.0\n" @@ -22,24 +22,16 @@ msgstr "" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../lib/Tails/IUK/Frontend.pm:146 ../lib/Tails/IUK/Frontend.pm:657 -#, perl-brace-format -msgid "" -"Debugging information\n" -"exit code: %{exit_code}i\n" -"\n" -"stdout:\n" -"%{stdout}s\n" -"\n" -"stderr:\n" -"%{stderr}s" -msgstr "Informazione di debugging\ncodice d'uscita: %{exit_code}i\n\nstdout:\n%{stdout}s\n\nstderr:\n%{stderr}s" +#: ../lib/Tails/IUK/Frontend.pm:145 ../lib/Tails/IUK/Frontend.pm:505 +#: ../lib/Tails/IUK/Frontend.pm:649 +msgid "For debugging information, see ~/.xsession-errors." +msgstr "Per informazioni di debug, si veda ~/.xsession-errors." -#: ../lib/Tails/IUK/Frontend.pm:214 +#: ../lib/Tails/IUK/Frontend.pm:210 msgid "Error while checking for upgrades" msgstr "Errore durante il controllo degli aggiornamenti" -#: ../lib/Tails/IUK/Frontend.pm:217 +#: ../lib/Tails/IUK/Frontend.pm:213 msgid "" "Could not determine whether an upgrade is available from our website.\n" "\n" @@ -48,64 +40,64 @@ msgid "" "If the problem persists, go to file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" msgstr "Impossibile determinare se è disponibile un aggiornamento dal nostro sito.\n\nControllate la vostra connessione e riavviate Tails per provare ad aggiornare nuovamente.\n\nSe il problema persiste, andare su file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" -#: ../lib/Tails/IUK/Frontend.pm:231 +#: ../lib/Tails/IUK/Frontend.pm:227 msgid "no incremental upgrade is available." msgstr "nessun aggiornamento incrementale disponibile." -#: ../lib/Tails/IUK/Frontend.pm:234 +#: ../lib/Tails/IUK/Frontend.pm:230 msgid "your device was not created using Tails Installer." msgstr "il dispositivo non è stato creato mediante l'installatore Tails." -#: ../lib/Tails/IUK/Frontend.pm:237 +#: ../lib/Tails/IUK/Frontend.pm:233 msgid "your device is not writable." msgstr "il dispositivo non è scrivibile." -#: ../lib/Tails/IUK/Frontend.pm:240 +#: ../lib/Tails/IUK/Frontend.pm:236 msgid "there is not enough free space on your device." msgstr "lo spazio libero sul dispositivo non è sufficiente." -#: ../lib/Tails/IUK/Frontend.pm:243 +#: ../lib/Tails/IUK/Frontend.pm:239 msgid "there is not enough free memory." msgstr "memoria libera insufficiente." -#: ../lib/Tails/IUK/Frontend.pm:248 +#: ../lib/Tails/IUK/Frontend.pm:244 #, perl-brace-format msgid "No explanation available for reason '%{reason}s'." msgstr "Nessuna spiegazione disponibile per '%{reason}s'." -#: ../lib/Tails/IUK/Frontend.pm:268 +#: ../lib/Tails/IUK/Frontend.pm:264 msgid "The system is up-to-date" msgstr "Il sistema è aggiornato" -#: ../lib/Tails/IUK/Frontend.pm:273 +#: ../lib/Tails/IUK/Frontend.pm:269 msgid "This version of Tails is outdated, and may have security issues." msgstr "Questa versione di Tails è obsoleta e potrebbe avere problemi di sicurezza." -#: ../lib/Tails/IUK/Frontend.pm:305 +#: ../lib/Tails/IUK/Frontend.pm:301 #, perl-brace-format msgid "" "The available incremental upgrade requires %{space_needed}s of free space on" " Tails system partition, but only %{free_space}s is available." msgstr "L'aggiornamento incrementale disponibile richiede %{space_needed}s di spazio libero nella partizione di sistema di Tails, ma sono disponibili solo %{free_space}s ." -#: ../lib/Tails/IUK/Frontend.pm:321 +#: ../lib/Tails/IUK/Frontend.pm:317 #, perl-brace-format msgid "" "The available incremental upgrade requires %{memory_needed}s of free memory," " but only %{free_memory}s is available." msgstr "L'aggiornamento incrementale disponibile richiede %{memory_needed}s di memoria libera, ma sono disponibili solo %{free_memory}s ." -#: ../lib/Tails/IUK/Frontend.pm:343 +#: ../lib/Tails/IUK/Frontend.pm:339 msgid "" "An incremental upgrade is available, but no full upgrade is.\n" "This should not happen. Please report a bug." msgstr "Un aggiornamento incrementale è disponibile, ma non un aggiornamento completo.\nQuesto non dovrebbe accadere. Si prega di segnalare l'errore." -#: ../lib/Tails/IUK/Frontend.pm:347 +#: ../lib/Tails/IUK/Frontend.pm:343 msgid "Error while detecting available upgrades" msgstr "Errore durante il rilevamento di aggiornamenti disponibili" -#: ../lib/Tails/IUK/Frontend.pm:357 +#: ../lib/Tails/IUK/Frontend.pm:353 #, perl-brace-format msgid "" "You should upgrade to %{name}s %{version}s.\n" @@ -121,19 +113,19 @@ msgid "" "Do you want to upgrade now?" msgstr "Si dovrebbe aggiornare a %{name}s %{version}s.\n\nPer maggiori informazioni riguardo a questa nuova versione, andare su %{details_url}s.\n\nSi raccomanda di chiudere tutte le applicazioni aperte durante l'aggiornamento.\nScaricare l'aggiornamento potrebbe richidere molto tempo, da alcuni minuti ad alcune ore.\nLa rete sarà disattivata dopo aver scaricato l'aggiornamento.\n\nDimensioni aggiornamento: %{size}s\n\nSi desidera aggiornare ora?" -#: ../lib/Tails/IUK/Frontend.pm:372 +#: ../lib/Tails/IUK/Frontend.pm:368 msgid "Upgrade available" msgstr "Aggiornamento disponibile" -#: ../lib/Tails/IUK/Frontend.pm:373 +#: ../lib/Tails/IUK/Frontend.pm:369 msgid "Upgrade now" msgstr "Aggiorna ora" -#: ../lib/Tails/IUK/Frontend.pm:374 +#: ../lib/Tails/IUK/Frontend.pm:370 msgid "Upgrade later" msgstr "Aggiorna in seguito" -#: ../lib/Tails/IUK/Frontend.pm:382 +#: ../lib/Tails/IUK/Frontend.pm:378 #, perl-brace-format msgid "" "You should do a manual upgrade to %{name}s %{version}s.\n" @@ -145,20 +137,20 @@ msgid "" "To learn how to do a manual upgrade, go to https://tails.boum.org/doc/first_steps/upgrade/#manual" msgstr "È necessario eseguire un aggiornamento manuale a %{name}s %{version}s.\n\nPer maggiori informazioni su questa nuova versione, visita %{details_url}s.\n\nNon è possibile aggiornare automaticamente il dispositivo alla nuova versione: %{explanation}s.\n\nPer informazioni su come eseguire un aggiornamento manuale, visita https://tails.boum.org/doc/first_steps/upgrade/#manual" -#: ../lib/Tails/IUK/Frontend.pm:398 +#: ../lib/Tails/IUK/Frontend.pm:394 msgid "New version available" msgstr "Nuova versione disponibile" -#: ../lib/Tails/IUK/Frontend.pm:454 +#: ../lib/Tails/IUK/Frontend.pm:450 msgid "Downloading upgrade" msgstr "Download dell'aggiornamento" -#: ../lib/Tails/IUK/Frontend.pm:457 +#: ../lib/Tails/IUK/Frontend.pm:453 #, perl-brace-format msgid "Downloading the upgrade to %{name}s %{version}s..." msgstr "Scaricando l'aggiornamento a %{name}s %{version}s..." -#: ../lib/Tails/IUK/Frontend.pm:498 +#: ../lib/Tails/IUK/Frontend.pm:494 msgid "" "The upgrade could not be downloaded.\\n\\nCheck your network " "connection, and restart Tails to try upgrading again.\\n\\nIf the problem " @@ -166,36 +158,26 @@ msgid "" "file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" msgstr "L'aggiornamento non può essere scaricato.\\n\\nControllate la vostra connessione e riavviate Tails per aggiornare nuovamente.\\n\\nSe il problema persiste, andare su file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" -#: ../lib/Tails/IUK/Frontend.pm:510 -#, perl-brace-format -msgid "" -"Debugging information\n" -"exit code: %{exit_code}i\n" -"\n" -"stderr:\n" -"%{stderr}s" -msgstr "Informazione di debugging\ncodice d'uscita:%{exit_code}i\n\nstderr:\n%{stderr}s" - -#: ../lib/Tails/IUK/Frontend.pm:522 ../lib/Tails/IUK/Frontend.pm:536 +#: ../lib/Tails/IUK/Frontend.pm:510 ../lib/Tails/IUK/Frontend.pm:529 msgid "Error while downloading the upgrade" msgstr "Errore durante il download dell'aggiornamento" -#: ../lib/Tails/IUK/Frontend.pm:529 +#: ../lib/Tails/IUK/Frontend.pm:522 #, perl-brace-format msgid "" "Output file '%{output_file}s' does not exist, but tails-iuk-get-target-file " "did not complain. Please report a bug." msgstr "Il file di output '%{output_file}s' non esiste, ma tails-iuk-get-target-file non l'ha segnalato. Si prega di segnalare l'errore." -#: ../lib/Tails/IUK/Frontend.pm:548 +#: ../lib/Tails/IUK/Frontend.pm:541 msgid "Error while creating temporary downloading directory" msgstr "Errore durante la creazione della cartella di download temporanea" -#: ../lib/Tails/IUK/Frontend.pm:551 +#: ../lib/Tails/IUK/Frontend.pm:544 msgid "Failed to create temporary download directory" msgstr "Creazione della cartella di download temporanea fallita" -#: ../lib/Tails/IUK/Frontend.pm:563 +#: ../lib/Tails/IUK/Frontend.pm:556 msgid "" "Your Tails device was successfully upgraded.\n" "\n" @@ -205,46 +187,46 @@ msgid "" "Do you want to restart now?" msgstr "Il vostro dispositivo Tails è stato aggiornato con successo.\n\nAlcune funzioni di sicurezza sono state temporaneamente disabilitate.\nDovresti riavviare Tails con la nuova versione il prima possibile.\n\nVuoi riavviare ora?" -#: ../lib/Tails/IUK/Frontend.pm:568 +#: ../lib/Tails/IUK/Frontend.pm:561 msgid "Restart Tails" msgstr "Riavvia Tails" -#: ../lib/Tails/IUK/Frontend.pm:569 +#: ../lib/Tails/IUK/Frontend.pm:562 msgid "Restart now" msgstr "Riavvia ora" -#: ../lib/Tails/IUK/Frontend.pm:570 +#: ../lib/Tails/IUK/Frontend.pm:563 msgid "Restart later" msgstr "Riavvia in seguito" -#: ../lib/Tails/IUK/Frontend.pm:581 +#: ../lib/Tails/IUK/Frontend.pm:574 msgid "Error while restarting the system" msgstr "Errore nel riavvio del sistema" -#: ../lib/Tails/IUK/Frontend.pm:584 +#: ../lib/Tails/IUK/Frontend.pm:577 msgid "Failed to restart the system" msgstr "Riavvio del sistema fallito" -#: ../lib/Tails/IUK/Frontend.pm:599 +#: ../lib/Tails/IUK/Frontend.pm:592 msgid "Error while shutting down the network" msgstr "Errore durante lo spegnimento della rete" -#: ../lib/Tails/IUK/Frontend.pm:602 +#: ../lib/Tails/IUK/Frontend.pm:595 msgid "Failed to shutdown network" msgstr "Spegnimento della rete fallito" -#: ../lib/Tails/IUK/Frontend.pm:612 +#: ../lib/Tails/IUK/Frontend.pm:605 msgid "Upgrading the system" msgstr "Aggiornamento del sistema" -#: ../lib/Tails/IUK/Frontend.pm:614 +#: ../lib/Tails/IUK/Frontend.pm:607 msgid "" "Your Tails device is being upgraded...\n" "\n" "For security reasons, the networking is now disabled." msgstr "Il tuo dispositivo Tails è in aggiornamento...\n\nPer ragioni di sicurezza, la rete è disabilitata." -#: ../lib/Tails/IUK/Frontend.pm:651 +#: ../lib/Tails/IUK/Frontend.pm:644 msgid "" "An error occured while installing the upgrade.\\n\\nYour Tails device" " needs to be repaired and might be unable to restart.\\n\\nPlease follow the" @@ -252,6 +234,6 @@ msgid "" "file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" msgstr "Si è verificato un errore durante l'installazione dell'aggiornamento.\\n\\nIl vostro dispositivo Tails deve essere riparato e potrebbe non riavviarsi.\\n\\nPer favore seguite le istruzioni a file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" -#: ../lib/Tails/IUK/Frontend.pm:671 +#: ../lib/Tails/IUK/Frontend.pm:654 msgid "Error while installing the upgrade" msgstr "Errore durante l'installazione dell'aggiornamento"

1 0

[translation/tails-iuk] Update translations for tails-iuk
by translation＠torproject.org 21 Feb '14

21 Feb '14

commit 782ca5836f9de71d7f5614c33df1c86002403bdf Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 21 20:45:55 2014 +0000 Update translations for tails-iuk --- it.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/it.po b/it.po index 07b45a7..b09548c 100644 --- a/it.po +++ b/it.po @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-02-20 15:49+0100\n" -"PO-Revision-Date: 2014-02-21 08:18+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-02-21 20:20+0000\n" +"Last-Translator: Francesca Ciceri <madamezou(a)zouish.org>\n" "Language-Team: Italian (http://www.transifex.com/projects/p/torproject/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,7 +25,7 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:145 ../lib/Tails/IUK/Frontend.pm:505 #: ../lib/Tails/IUK/Frontend.pm:649 msgid "For debugging information, see ~/.xsession-errors." -msgstr "" +msgstr "Per informazioni di debug, si veda ~/.xsession-errors." #: ../lib/Tails/IUK/Frontend.pm:210 msgid "Error while checking for upgrades"

1 0

[tor/master] When not an exit node, don't test for DNS hijacking.
by nickm＠torproject.org 21 Feb '14

21 Feb '14

commit 1753975ece98f4054ec65683862db120a3b8f261 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 21 18:04:48 2014 +0000 When not an exit node, don't test for DNS hijacking. Back in 5e762e6a5c0e6729bb7dbb586af2690c087d9ba8, non-exit servers stopped launching DNS requests for users. So there's no need for them to see if their DNS answers are hijacked. Patch from Matt Pagan. I think this is a 965 fix. --- changes/bug965 | 6 ++++++ src/or/main.c | 8 +++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/changes/bug965 b/changes/bug965 new file mode 100644 index 0000000..d0870d0 --- /dev/null +++ b/changes/bug965 @@ -0,0 +1,6 @@ + o Minor bugfixes: + + - Non-exit servers no longer launch mock DNS requests to check for + DNS hijacking. This has been unnecessary since 0.2.1.7-alpha, + when non-exit servers stopped servicing DNS requests. Fixes bug + 965; bugfix on 0.2.1.7-alpha. Patch from Matt Pagan. diff --git a/src/or/main.c b/src/or/main.c index a191d1c..5404e96 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1551,10 +1551,12 @@ run_scheduled_events(time_t now) channel_run_cleanup(); channel_listener_run_cleanup(); - /** 9. and if we're a server, check whether our DNS is telling stories to - * us. */ + /** 9. and if we're an exit node, check whether our DNS is telling stories + * to us. */ if (!net_is_disabled() && - public_server_mode(options) && time_to_check_for_correct_dns < now) { + public_server_mode(options) && + time_to_check_for_correct_dns < now && + ! router_my_exit_policy_is_reject_star()) { if (!time_to_check_for_correct_dns) { time_to_check_for_correct_dns = now + 60 + crypto_rand_int(120); } else {

1 0

[translation/tails-iuk_completed] Update translations for tails-iuk_completed
by translation＠torproject.org 21 Feb '14

21 Feb '14

commit f40bb504e02e3ea837cd2d4f76b343f3adee96aa Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 21 17:45:48 2014 +0000 Update translations for tails-iuk_completed --- ru.po | 108 +++++++++++++++++++++++++++-------------------------------------- 1 file changed, 45 insertions(+), 63 deletions(-) diff --git a/ru.po b/ru.po index ce1c9f6..afd5627 100644 --- a/ru.po +++ b/ru.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2014-02-18 19:03+0100\n" -"PO-Revision-Date: 2014-02-19 17:41+0000\n" +"POT-Creation-Date: 2014-02-20 15:49+0100\n" +"PO-Revision-Date: 2014-02-21 17:41+0000\n" "Last-Translator: oulgocke <beandonlybe(a)yandex.ru>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/torproject/language/ru/)\n" "MIME-Version: 1.0\n" @@ -19,24 +19,16 @@ msgstr "" "Language: ru\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ../lib/Tails/IUK/Frontend.pm:146 ../lib/Tails/IUK/Frontend.pm:657 -#, perl-brace-format -msgid "" -"Debugging information\n" -"exit code: %{exit_code}i\n" -"\n" -"stdout:\n" -"%{stdout}s\n" -"\n" -"stderr:\n" -"%{stderr}s" -msgstr "Отладочная информация\nexit code: %{exit_code}i\n\nstdout:\n%{stdout}s\n\nstderr:\n%{stderr}s" +#: ../lib/Tails/IUK/Frontend.pm:145 ../lib/Tails/IUK/Frontend.pm:505 +#: ../lib/Tails/IUK/Frontend.pm:649 +msgid "For debugging information, see ~/.xsession-errors." +msgstr "Для получения отладочной информации, смотрите ~/.xsession-errors." -#: ../lib/Tails/IUK/Frontend.pm:214 +#: ../lib/Tails/IUK/Frontend.pm:210 msgid "Error while checking for upgrades" msgstr "Ошибка проверки обновлений" -#: ../lib/Tails/IUK/Frontend.pm:217 +#: ../lib/Tails/IUK/Frontend.pm:213 msgid "" "Could not determine whether an upgrade is available from our website.\n" "\n" @@ -45,64 +37,64 @@ msgid "" "If the problem persists, go to file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" msgstr "Не удалось проверить наличие обновлений на нашем сайте.\n\nПроверьте соединение с сетью, и перезапустите Tails для повторной попытки обновления.\n\nЕсли проблема сохранится, смотрите file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" -#: ../lib/Tails/IUK/Frontend.pm:231 +#: ../lib/Tails/IUK/Frontend.pm:227 msgid "no incremental upgrade is available." msgstr "постепенное обновление недоступно." -#: ../lib/Tails/IUK/Frontend.pm:234 +#: ../lib/Tails/IUK/Frontend.pm:230 msgid "your device was not created using Tails Installer." msgstr "ваше устройство не было создано при помощи установщика Tails." -#: ../lib/Tails/IUK/Frontend.pm:237 +#: ../lib/Tails/IUK/Frontend.pm:233 msgid "your device is not writable." msgstr "ваше устройство недоступно для записи." -#: ../lib/Tails/IUK/Frontend.pm:240 +#: ../lib/Tails/IUK/Frontend.pm:236 msgid "there is not enough free space on your device." msgstr "на вашем устройстве недостаточно свободного места." -#: ../lib/Tails/IUK/Frontend.pm:243 +#: ../lib/Tails/IUK/Frontend.pm:239 msgid "there is not enough free memory." msgstr "недостаточно памяти." -#: ../lib/Tails/IUK/Frontend.pm:248 +#: ../lib/Tails/IUK/Frontend.pm:244 #, perl-brace-format msgid "No explanation available for reason '%{reason}s'." msgstr "Для причины '%{reason}s' нет объяснения." -#: ../lib/Tails/IUK/Frontend.pm:268 +#: ../lib/Tails/IUK/Frontend.pm:264 msgid "The system is up-to-date" msgstr "Система соответствует последним обновлениям" -#: ../lib/Tails/IUK/Frontend.pm:273 +#: ../lib/Tails/IUK/Frontend.pm:269 msgid "This version of Tails is outdated, and may have security issues." msgstr "Данная версия Tails устарела, и может иметь иметь проблемы безопасности." -#: ../lib/Tails/IUK/Frontend.pm:305 +#: ../lib/Tails/IUK/Frontend.pm:301 #, perl-brace-format msgid "" "The available incremental upgrade requires %{space_needed}s of free space on" " Tails system partition, but only %{free_space}s is available." msgstr "Имеющееся дополнительное обновление требует %{space_needed}s свободного пространства в системном разделе Tails, но только %{free_space}s доступно." -#: ../lib/Tails/IUK/Frontend.pm:321 +#: ../lib/Tails/IUK/Frontend.pm:317 #, perl-brace-format msgid "" "The available incremental upgrade requires %{memory_needed}s of free memory," " but only %{free_memory}s is available." msgstr "Имеющееся дополнительное обновление требует %{memory_needed}s свободной памяти, но только %{free_memory}s доступно." -#: ../lib/Tails/IUK/Frontend.pm:343 +#: ../lib/Tails/IUK/Frontend.pm:339 msgid "" "An incremental upgrade is available, but no full upgrade is.\n" "This should not happen. Please report a bug." msgstr "Только дополнительное, а не полное обновление доступно. Этого не должно было произойти. Пожалуйста, сообщите об ошибке." -#: ../lib/Tails/IUK/Frontend.pm:347 +#: ../lib/Tails/IUK/Frontend.pm:343 msgid "Error while detecting available upgrades" msgstr "Ошибка при поиске доступных обновлений" -#: ../lib/Tails/IUK/Frontend.pm:357 +#: ../lib/Tails/IUK/Frontend.pm:353 #, perl-brace-format msgid "" "You should upgrade to %{name}s %{version}s.\n" @@ -118,19 +110,19 @@ msgid "" "Do you want to upgrade now?" msgstr "Вы должны установить обновление %{name}s %{version}s.\n\nДля получения дополнительной информации об этой новой версии, смотрите %{details_url}s.\n\nПеред обновлением рекомендуется закрыть все открытые приложения.\nУстановка обновления может занять значительное время: от нескольких минут до нескольких часов.\nСеть будет отключена после загрузки обновления.\n\nРазмер обновления: %{size}s\n\nХотите установить обновление сейчас?" -#: ../lib/Tails/IUK/Frontend.pm:372 +#: ../lib/Tails/IUK/Frontend.pm:368 msgid "Upgrade available" msgstr "Обновление доступно" -#: ../lib/Tails/IUK/Frontend.pm:373 +#: ../lib/Tails/IUK/Frontend.pm:369 msgid "Upgrade now" msgstr "Обновить сейчас" -#: ../lib/Tails/IUK/Frontend.pm:374 +#: ../lib/Tails/IUK/Frontend.pm:370 msgid "Upgrade later" msgstr "Обновить позднее" -#: ../lib/Tails/IUK/Frontend.pm:382 +#: ../lib/Tails/IUK/Frontend.pm:378 #, perl-brace-format msgid "" "You should do a manual upgrade to %{name}s %{version}s.\n" @@ -142,20 +134,20 @@ msgid "" "To learn how to do a manual upgrade, go to https://tails.boum.org/doc/first_steps/upgrade/#manual" msgstr "Вам надо вручную обновиться до %{name}s %{version}s.\n\nДля получения дополнительной информации об этой новой версии, перейдите к %{details_url}s.\n\nОбновить Ваше устройство до новой версии автоматически невозможно: %{explanation}s.\n\nЧтобы узнать, как сделать обновления вручную, перейдите к https://tails.boum.org/doc/first_steps/upgrade/#manual" -#: ../lib/Tails/IUK/Frontend.pm:398 +#: ../lib/Tails/IUK/Frontend.pm:394 msgid "New version available" msgstr "Доступна новая версия" -#: ../lib/Tails/IUK/Frontend.pm:454 +#: ../lib/Tails/IUK/Frontend.pm:450 msgid "Downloading upgrade" msgstr "Идет загрузка обновления" -#: ../lib/Tails/IUK/Frontend.pm:457 +#: ../lib/Tails/IUK/Frontend.pm:453 #, perl-brace-format msgid "Downloading the upgrade to %{name}s %{version}s..." msgstr "Загрузка обновления %{name}s %{version}s..." -#: ../lib/Tails/IUK/Frontend.pm:498 +#: ../lib/Tails/IUK/Frontend.pm:494 msgid "" "The upgrade could not be downloaded.\\n\\nCheck your network " "connection, and restart Tails to try upgrading again.\\n\\nIf the problem " @@ -163,36 +155,26 @@ msgid "" "file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" msgstr "Обновление не может быть загружено.\\n\\nПроверьте сеть, и перезапустите Tails, чтобы попытаться обновить еще раз.\\n\\nЕсли проблема сохранится, смотрите file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" -#: ../lib/Tails/IUK/Frontend.pm:510 -#, perl-brace-format -msgid "" -"Debugging information\n" -"exit code: %{exit_code}i\n" -"\n" -"stderr:\n" -"%{stderr}s" -msgstr "Отладочная информация\nexit code: %{exit_code}i\n\nstderr:\n%{stderr}s" - -#: ../lib/Tails/IUK/Frontend.pm:522 ../lib/Tails/IUK/Frontend.pm:536 +#: ../lib/Tails/IUK/Frontend.pm:510 ../lib/Tails/IUK/Frontend.pm:529 msgid "Error while downloading the upgrade" msgstr "Ошибка загрузки обновления" -#: ../lib/Tails/IUK/Frontend.pm:529 +#: ../lib/Tails/IUK/Frontend.pm:522 #, perl-brace-format msgid "" "Output file '%{output_file}s' does not exist, but tails-iuk-get-target-file " "did not complain. Please report a bug." msgstr "Выходного файла '%{output_file}s' не существует, но tails-iuk-get-target-file не сообщил о проблеме. Пожалуйста, сообщите об ошибке." -#: ../lib/Tails/IUK/Frontend.pm:548 +#: ../lib/Tails/IUK/Frontend.pm:541 msgid "Error while creating temporary downloading directory" msgstr "Ошибка создания временной папки для загрузки" -#: ../lib/Tails/IUK/Frontend.pm:551 +#: ../lib/Tails/IUK/Frontend.pm:544 msgid "Failed to create temporary download directory" msgstr "Создать временную папку для загрузки не удалось" -#: ../lib/Tails/IUK/Frontend.pm:563 +#: ../lib/Tails/IUK/Frontend.pm:556 msgid "" "Your Tails device was successfully upgraded.\n" "\n" @@ -202,46 +184,46 @@ msgid "" "Do you want to restart now?" msgstr "Ваше Tails-устройство было успешно обновлено.\n\nНекоторые настройки безопасности были временно отключены.\nВы должны перезапустить новую версию Tails как можно скорее.\n\nХотите перезапустить сейчас?" -#: ../lib/Tails/IUK/Frontend.pm:568 +#: ../lib/Tails/IUK/Frontend.pm:561 msgid "Restart Tails" msgstr "Перезапустить Tails" -#: ../lib/Tails/IUK/Frontend.pm:569 +#: ../lib/Tails/IUK/Frontend.pm:562 msgid "Restart now" msgstr "Перезапустить сейчас" -#: ../lib/Tails/IUK/Frontend.pm:570 +#: ../lib/Tails/IUK/Frontend.pm:563 msgid "Restart later" msgstr "Перезапустить позднее" -#: ../lib/Tails/IUK/Frontend.pm:581 +#: ../lib/Tails/IUK/Frontend.pm:574 msgid "Error while restarting the system" msgstr "Ошибка при перезапуске системы" -#: ../lib/Tails/IUK/Frontend.pm:584 +#: ../lib/Tails/IUK/Frontend.pm:577 msgid "Failed to restart the system" msgstr "Не удалось перезапустить систему" -#: ../lib/Tails/IUK/Frontend.pm:599 +#: ../lib/Tails/IUK/Frontend.pm:592 msgid "Error while shutting down the network" msgstr "Ошибка при отключении сети" -#: ../lib/Tails/IUK/Frontend.pm:602 +#: ../lib/Tails/IUK/Frontend.pm:595 msgid "Failed to shutdown network" msgstr "Не удалось отключить сеть" -#: ../lib/Tails/IUK/Frontend.pm:612 +#: ../lib/Tails/IUK/Frontend.pm:605 msgid "Upgrading the system" msgstr "Идет обновление системы" -#: ../lib/Tails/IUK/Frontend.pm:614 +#: ../lib/Tails/IUK/Frontend.pm:607 msgid "" "Your Tails device is being upgraded...\n" "\n" "For security reasons, the networking is now disabled." msgstr "Устанавливается обновление на ваше Tails-устройство...\n\nВ целях безопасности сеть отключена." -#: ../lib/Tails/IUK/Frontend.pm:651 +#: ../lib/Tails/IUK/Frontend.pm:644 msgid "" "An error occured while installing the upgrade.\\n\\nYour Tails device" " needs to be repaired and might be unable to restart.\\n\\nPlease follow the" @@ -249,6 +231,6 @@ msgid "" "file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" msgstr "В процессе установки обновления произошла ошибка.\\n\\nВаше Tails-устройство нуждается в восстановлении, и, возможно, не сможет запуститься вновь.\\n\\nПожалуйста, следуйте инструкциям по ссылке file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" -#: ../lib/Tails/IUK/Frontend.pm:671 +#: ../lib/Tails/IUK/Frontend.pm:654 msgid "Error while installing the upgrade" msgstr "Ошибка установки обновления"

1 0