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

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 23 Feb '16

23 Feb '16

commit 926164c9ed1b3fc6d2efddf4fbc34d5a69a33427 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 23 16:45:41 2016 +0000 Update translations for mat-gui_completed --- el.po | 107 +++++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 56 insertions(+), 51 deletions(-) diff --git a/el.po b/el.po index 407a5f2..58489ca 100644 --- a/el.po +++ b/el.po @@ -6,14 +6,15 @@ # firespin <dartworldgr(a)hotmail.com>, 2014 # dpdt1 <dpdt1(a)espiv.net>, 2013 # kotkotkot <kotakota(a)gmail.com>, 2013 +# TitanJack <titanjack.com(a)gmail.com>, 2016 # Wasilis Mandratzis <inactive+Wasilis(a)transifex.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-31 04:53+0100\n" -"PO-Revision-Date: 2015-08-02 11:33+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2016-02-10 23:06+0100\n" +"PO-Revision-Date: 2016-02-23 16:27+0000\n" +"Last-Translator: TitanJack <titanjack.com(a)gmail.com>\n" "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,167 +22,171 @@ msgstr "" "Language: el\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mat-gui:62 mat-gui:407 mat-gui:430 +#: mat-gui:66 mat-gui:422 mat-gui:445 msgid "Ready" msgstr "Έτοιμο" -#: mat-gui:129 +#: mat-gui:136 msgid "Choose files" msgstr "Επιλογή αρχείων" -#: mat-gui:137 -msgid "All files" -msgstr "Όλα τα αρχεία" - -#: mat-gui:143 +#: mat-gui:144 msgid "Supported files" msgstr "Υποστηριζόμενα αρχεία" -#: mat-gui:160 mat-gui:353 mat-gui:402 mat-gui:426 mat-gui:428 -#: data/mat.glade:172 +#: mat-gui:151 +msgid "All files" +msgstr "Όλα τα αρχεία" + +#: mat-gui:167 mat-gui:366 mat-gui:417 mat-gui:441 mat-gui:443 +#: data/mat.glade:200 msgid "Clean" msgstr "Εκκαθάριση" -#: mat-gui:161 +#: mat-gui:168 msgid "No metadata found" msgstr "Δεν βρέθηκαν μεταδεδομένα" -#: mat-gui:163 mat-gui:404 +#: mat-gui:170 mat-gui:419 msgid "Dirty" msgstr "Βρωμικο" -#: mat-gui:168 +#: mat-gui:176 #, python-format msgid "%s's metadata" msgstr "%s των μεταδεδομένων" -#: mat-gui:179 +#: mat-gui:187 msgid "Trash your meta, keep your data" msgstr "Διαγράψτε τα μεταδεδομένα, κρατήστε τα δεδομένα" -#: mat-gui:184 +#: mat-gui:192 msgid "Website" msgstr "Ιστοσελίδα" -#: mat-gui:210 +#: mat-gui:219 msgid "Preferences" msgstr "Προτιμήσεις" -#: mat-gui:223 +#: mat-gui:232 msgid "Reduce PDF quality" msgstr "Μειωση της ποιοτητας του PDF " -#: mat-gui:226 +#: mat-gui:235 msgid "Reduce the produced PDF size and quality" msgstr "Μειωση του μεγεθους και της ποιοτητας του PDF " -#: mat-gui:229 -msgid "Add unsupported file to archives" -msgstr "Προσθηκη μη υποστηριζομενων αρχειων " +#: mat-gui:238 +msgid "Remove unsupported file from archives" +msgstr "Αφαίρεση μη υποστηριζόμενων αρχείων" -#: mat-gui:232 -msgid "Add non-supported (and so non-anonymised) file to output archive" -msgstr "Προσθήκη μη υποστηριζομενων (οχι ανώνυμων) αρχειων στο αρχείο εξόδου " +#: mat-gui:241 +msgid "Remove non-supported (and so non-anonymised) file from output archive" +msgstr "Αφαίρεση μη-υποστηριζόμενων (και μη ανώνυμων) αρχείων " -#: mat-gui:271 +#: mat-gui:280 msgid "Unknown" msgstr "Άγνωστο" -#: mat-gui:314 +#: mat-gui:325 msgid "Not-supported" msgstr "Μη-υποστηριζόμενο" -#: mat-gui:328 +#: mat-gui:339 msgid "Harmless fileformat" msgstr "Αβλαβής μορφή αρχείου" -#: mat-gui:330 +#: mat-gui:341 +msgid "Cant read file" +msgstr "Το αρχείο δεν μπορεί να διαβαστεί " + +#: mat-gui:343 msgid "Fileformat not supported" msgstr "Η μορφή αρχείου δεν υποστηρίζεται" -#: mat-gui:333 +#: mat-gui:346 msgid "These files can not be processed:" msgstr "Αυτά τα αρχεία δεν μπορούν να επεξεργαστούν:" -#: mat-gui:338 mat-gui:367 data/mat.glade:211 +#: mat-gui:351 mat-gui:380 data/mat.glade:239 msgid "Filename" msgstr "Όνομα αρχείου" -#: mat-gui:340 +#: mat-gui:353 msgid "Reason" msgstr "Λόγος" -#: mat-gui:352 +#: mat-gui:365 msgid "Non-supported files in archive" msgstr "Μη υποστηριζόμενα αρχεία στο αρχείο." -#: mat-gui:366 +#: mat-gui:379 msgid "Include" msgstr "Συμπεριλαμβάνει" -#: mat-gui:382 +#: mat-gui:397 #, python-format msgid "MAT is not able to clean the following files, found in the %s archive" msgstr "Το MAT δεν είναι σε θέση να καθαρίσει τα ακόλουθα αρχεία, που βρέθηκαν στο αρχείο %s" -#: mat-gui:398 +#: mat-gui:413 #, python-format msgid "Checking %s" msgstr "Έλεγχος %s" -#: mat-gui:413 +#: mat-gui:428 #, python-format msgid "Cleaning %s" msgstr "Εκκαθάριση %s" -#: data/mat.glade:33 +#: data/mat.glade:46 msgid "_File" msgstr "_Αρχείο" -#: data/mat.glade:82 +#: data/mat.glade:95 msgid "_Edit" msgstr "_Επεξεργασία" -#: data/mat.glade:115 +#: data/mat.glade:141 msgid "_Help" msgstr "_Βοήθεια" -#: data/mat.glade:159 +#: data/mat.glade:187 msgid "Add" msgstr "Προσθήκη" -#: data/mat.glade:228 +#: data/mat.glade:256 msgid "State" msgstr "Κατάσταση" -#: data/mat.glade:274 data/mat.glade:417 +#: data/mat.glade:294 data/mat.glade:467 msgid "Metadata" msgstr "Μεταδεδομένα" -#: data/mat.glade:306 +#: data/mat.glade:354 msgid "Name" msgstr "Όνομα" -#: data/mat.glade:320 +#: data/mat.glade:368 msgid "Content" msgstr "Περιεχόμενα" -#: data/mat.glade:374 +#: data/mat.glade:398 msgid "Supported formats" msgstr "Υποστηριζόμενα αρχεία" -#: data/mat.glade:406 +#: data/mat.glade:456 msgid "Support" msgstr "Υποστήριξη" -#: data/mat.glade:428 +#: data/mat.glade:478 msgid "Method" msgstr "Μέθοδος" -#: data/mat.glade:439 +#: data/mat.glade:489 msgid "Remaining" msgstr "Υπόλοιπα" -#: data/mat.glade:468 +#: data/mat.glade:518 msgid "Fileformat" msgstr "Τύπος αρχείου"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 23 Feb '16

23 Feb '16

commit ed20a9d0b1a6c81185c3469768fbd0d62747fd1d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 23 16:45:37 2016 +0000 Update translations for mat-gui --- el.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/el.po b/el.po index 6685bfa..58489ca 100644 --- a/el.po +++ b/el.po @@ -6,14 +6,15 @@ # firespin <dartworldgr(a)hotmail.com>, 2014 # dpdt1 <dpdt1(a)espiv.net>, 2013 # kotkotkot <kotakota(a)gmail.com>, 2013 +# TitanJack <titanjack.com(a)gmail.com>, 2016 # Wasilis Mandratzis <inactive+Wasilis(a)transifex.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2016-02-11 09:31+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-02-23 16:27+0000\n" +"Last-Translator: TitanJack <titanjack.com(a)gmail.com>\n" "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -77,11 +78,11 @@ msgstr "Μειωση του μεγεθους και της ποιοτητας τ #: mat-gui:238 msgid "Remove unsupported file from archives" -msgstr "" +msgstr "Αφαίρεση μη υποστηριζόμενων αρχείων" #: mat-gui:241 msgid "Remove non-supported (and so non-anonymised) file from output archive" -msgstr "" +msgstr "Αφαίρεση μη-υποστηριζόμενων (και μη ανώνυμων) αρχείων " #: mat-gui:280 msgid "Unknown" @@ -97,7 +98,7 @@ msgstr "Αβλαβής μορφή αρχείου" #: mat-gui:341 msgid "Cant read file" -msgstr "" +msgstr "Το αρχείο δεν μπορεί να διαβαστεί " #: mat-gui:343 msgid "Fileformat not supported"

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 23 Feb '16

23 Feb '16

commit 38ec28500310de44b8aac4d0b1690c14bd744299 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 23 16:45:15 2016 +0000 Update translations for https_everywhere --- el/https-everywhere.dtd | 28 ++++++++++++++-------------- pt_BR/https-everywhere.dtd | 12 ++++++------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/el/https-everywhere.dtd b/el/https-everywhere.dtd index 755085c..86c9c6b 100644 --- a/el/https-everywhere.dtd +++ b/el/https-everywhere.dtd @@ -3,10 +3,10 @@ <!ENTITY https-everywhere.about.ext_description "Κρυπτογραφήστε τον Παγκόσμιο Ιστό! Χρησιμοποιήστε ασφάλεια HTTPS σε πολλούς δικτυακούς τόπους."> <!ENTITY https-everywhere.about.version "Έκδοση"> <!ENTITY https-everywhere.about.created_by "Δημιουργήθηκε από"> -<!ENTITY https-everywhere.about.and ", and"> +<!ENTITY https-everywhere.about.and ", και"> <!ENTITY https-everywhere.about.librarians "Βιβλιοθήκες για κανόνες"> <!ENTITY https-everywhere.about.thanks "Ευχαριστούμε τους"> -<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including"> +<!ENTITY https-everywhere.about.many_contributors "Πολύ συνεργάτες, συμπεριλαμβανομένου"> <!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others. We are grateful for their excellent work!"> <!ENTITY https-everywhere.about.contribute "Αν σας αρέσει το HTTPS Everywhere, δοκιμάστε"> <!ENTITY https-everywhere.about.donate_tor "Δωρίστε στο Tor"> @@ -14,7 +14,7 @@ <!ENTITY https-everywhere.about.or "ή"> <!ENTITY https-everywhere.about.donate_eff "Δωρίστε στο EFF"> -<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF"> +<!ENTITY https-everywhere.menu.donate_eff_imperative "Δωρεά στο EFF"> <!ENTITY https-everywhere.menu.about "Σχετικά με το HTTPS Everywhere"> <!ENTITY https-everywhere.menu.observatory "Προτιμήσεις για το Παρατηρητήριο SSL"> <!ENTITY https-everywhere.menu.globalEnable "Ενεργοποίηση του HTTPS Everywhere"> @@ -38,19 +38,19 @@ <!ENTITY https-everywhere.prefs.reset_default "Επαναφορά προεπιλογών"> <!ENTITY https-everywhere.prefs.view_xml_source "Προβολή του Πηγαίου Κώδικα XML"> -<!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> -<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> +<!ENTITY https-everywhere.chrome.stable_rules "Σταθεροί κανόνες "> +<!ENTITY https-everywhere.chrome.stable_rules_description "Εξαναγκασμένη κρυπτογραφημένη σύνδεση με αυτές τις σελίδες:"> <!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules"> -<!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default."> -<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site"> -<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site"> -<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host"> +<!ENTITY https-everywhere.chrome.experimental_rules_description "Μπορεί να προκαλέσει προειδοποιήσεις ή κατάρευση. Απενεργοποιημένο από προεπιλογή."> +<!ENTITY https-everywhere.chrome.add_rule "Προσθήκη κανόνα για αυτήν την σελίδα "> +<!ENTITY https-everywhere.chrome.add_new_rule "Προσθήκη νέου κανόνα για αυτήν την σελίδα "> +<!ENTITY https-everywhere.chrome.always_https_for_host "Πάντα https για αυτόν τον host"> <!ENTITY https-everywhere.chrome.host "Host:"> -<!ENTITY https-everywhere.chrome.show_advanced "Show advanced"> -<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced"> -<!ENTITY https-everywhere.chrome.rule_name "Rule name"> +<!ENTITY https-everywhere.chrome.show_advanced "Εμφάνιση προχωρημένων "> +<!ENTITY https-everywhere.chrome.hide_advanced "Απόκρυψη προχωρημένων "> +<!ENTITY https-everywhere.chrome.rule_name "Όνομα Κανόνα"> <!ENTITY https-everywhere.chrome.regex "Matching regex"> -<!ENTITY https-everywhere.chrome.redirect_to "Redirect to"> -<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel"> +<!ENTITY https-everywhere.chrome.redirect_to "Ανακατεύθυνση στο "> +<!ENTITY https-everywhere.chrome.status_cancel_button "Ακύρωση "> diff --git a/pt_BR/https-everywhere.dtd b/pt_BR/https-everywhere.dtd index cfb36fc..df58ba9 100644 --- a/pt_BR/https-everywhere.dtd +++ b/pt_BR/https-everywhere.dtd @@ -14,7 +14,7 @@ <!ENTITY https-everywhere.about.or "ou"> <!ENTITY https-everywhere.about.donate_eff "Fazer uma doação ao EFF"> -<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF"> +<!ENTITY https-everywhere.menu.donate_eff_imperative "Doar para EFF"> <!ENTITY https-everywhere.menu.about "Sobre o HTTPS Everywhere"> <!ENTITY https-everywhere.menu.observatory "Preferências do Observatório SSL"> <!ENTITY https-everywhere.menu.globalEnable "Habilitar HTTPS Everywhere"> @@ -44,13 +44,13 @@ <!ENTITY https-everywhere.chrome.experimental_rules_description "Pode causar avisos ou ruptura. Desabilitado por padrão."> <!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site"> <!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site"> -<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host"> -<!ENTITY https-everywhere.chrome.host "Host:"> +<!ENTITY https-everywhere.chrome.always_https_for_host "Sempre usar https para este hospedeiro"> +<!ENTITY https-everywhere.chrome.host "Hospedeiro:"> <!ENTITY https-everywhere.chrome.show_advanced "Show advanced"> -<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced"> +<!ENTITY https-everywhere.chrome.hide_advanced "Ocultar"> <!ENTITY https-everywhere.chrome.rule_name "Rule name"> <!ENTITY https-everywhere.chrome.regex "Matching regex"> -<!ENTITY https-everywhere.chrome.redirect_to "Redirect to"> -<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel"> +<!ENTITY https-everywhere.chrome.redirect_to "Redirecionar para:"> +<!ENTITY https-everywhere.chrome.status_cancel_button "Cancelar">

1 0

[onionoo/master] Flush cached hostname when a relay's IP changes.
by karsten＠torproject.org 23 Feb '16

23 Feb '16

commit eedbcbe52160d0250d31bb4f6ee7644815fd989d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Feb 10 19:48:19 2016 +0100 Flush cached hostname when a relay's IP changes. When reading a node status from disk, only remember the last lookup time if the address has not changed. Otherwise we'll want to do a fresh lookup. Implements #18270. --- .../org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java index b9552bf..d282ab8 100644 --- a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java +++ b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java @@ -446,6 +446,12 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, if (this.knownNodes.containsKey(fingerprint)) { updatedNodeStatus = this.knownNodes.get(fingerprint); String address = nodeStatus.getAddress(); + if (address.equals(updatedNodeStatus.getAddress())) { + /* Only remember the last lookup time if the address has not + * changed. Otherwise we'll want to do a fresh lookup. */ + updatedNodeStatus.setLastRdnsLookup( + nodeStatus.getLastRdnsLookup()); + } int orPort = nodeStatus.getOrPort(); int dirPort = nodeStatus.getDirPort(); SortedSet<String> orAddressesAndPorts = @@ -478,8 +484,6 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, updatedNodeStatus.setFirstSeenMillis( nodeStatus.getFirstSeenMillis()); } - updatedNodeStatus.setLastRdnsLookup( - nodeStatus.getLastRdnsLookup()); updatedNodeStatus.setDeclaredFamily( nodeStatus.getDeclaredFamily()); updatedNodeStatus.setEffectiveFamily(

1 0

[tor/master] Document required autotools versions
by nickm＠torproject.org 23 Feb '16

23 Feb '16

commit 31c7a65d894c144647a2364bcad337ee5ae020ff Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 23 11:08:04 2016 -0500 Document required autotools versions CentOS 6 is roughly the oldest thing we care about developers still using, and it has autoconf 2.63 / automake 1.11. These are both older than openssl 1.0.0, so anybody who can't upgrade past those probably can't upgrade to a modern openssl either. And since only people building from git or editing configure.ac/Makefile.am need to use autotools, I'm not totally enthused about keeping support for old ones anyway. Closes ticket 17732. --- Makefile.am | 5 +++-- changes/bug17732 | 10 ++++++++++ configure.ac | 1 + 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1333f36..fe6f64b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,8 +4,9 @@ # See LICENSE for licensing information # "foreign" means we don't follow GNU package layout standards -# 1.9 means we require automake vesion 1.9 -AUTOMAKE_OPTIONS = foreign 1.9 subdir-objects +# 1.11 means we require automake vesion 1.11 +# "subdir-objects" means put .o files in the same directory as the .c files +AUTOMAKE_OPTIONS = foreign 1.11 subdir-objects ACLOCAL_AMFLAGS = -I m4 diff --git a/changes/bug17732 b/changes/bug17732 new file mode 100644 index 0000000..010645d --- /dev/null +++ b/changes/bug17732 @@ -0,0 +1,10 @@ + o Minor features (compilation): + - Note our minimum required autoconf/automake versions in the + appropriate locations. Closes ticket 17732. + + o Dependency updates: + - Tor now uses Autoconf version 2.63 or later, and Automake 1.11 or later + (released in 2008 and 2009 respectively). If you are building Tor from + the git repository instead of from the source distribution, and your + tools are older than this, you will need to upgrade. + Closes ticket 17732. diff --git a/configure.ac b/configure.ac index aa757be..a4581e5 100644 --- a/configure.ac +++ b/configure.ac @@ -3,6 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information +AC_PREREQ([2.63]) AC_INIT([tor],[0.2.8.1-alpha-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4])

1 0

[tor/master] new microdescs mean progress towards bootstrapping
by nickm＠torproject.org 23 Feb '16

23 Feb '16

commit c6952f65ef535b3b59dd07b947315e1ac1116c8e Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Feb 22 02:47:57 2016 -0500 new microdescs mean progress towards bootstrapping Now, when a user who has set EntryNodes finishes bootstrapping, Tor automatically repopulates the guard set based on this new directory information. Fixes bug 16825; bugfix on 0.2.3.1-alpha. --- changes/bug16825 | 7 +++++++ src/or/directory.c | 2 ++ 2 files changed, 9 insertions(+) diff --git a/changes/bug16825 b/changes/bug16825 new file mode 100644 index 0000000..75c5627 --- /dev/null +++ b/changes/bug16825 @@ -0,0 +1,7 @@ + o Minor bugfixes: + - Count receipt of new microdescriptors as progress towards + bootstrapping. Now, when a user who has set EntryNodes finishes + bootstrapping, Tor automatically repopulates the guard set based + on this new directory information. Fixes bug 16825; bugfix on + 0.2.3.1-alpha. + diff --git a/src/or/directory.c b/src/or/directory.c index ecf6da8..b3af6f9 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2168,6 +2168,8 @@ connection_dir_client_reached_eof(dir_connection_t *conn) } control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_DESCRIPTORS, count_loading_descriptors_progress()); + if (mds && smartlist_len(mds)) + directory_info_has_arrived(now, 0); SMARTLIST_FOREACH(which, char *, cp, tor_free(cp)); smartlist_free(which); smartlist_free(mds);

1 0

[tor/master] refactor directory_info_has_arrived so we can quiet the logs
by nickm＠torproject.org 23 Feb '16

23 Feb '16

commit 43193ec888cbc15689b6db784d59c45c34a1e7f1 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Feb 22 02:54:32 2016 -0500 refactor directory_info_has_arrived so we can quiet the logs no actual behavior changes --- src/or/directory.c | 8 ++++---- src/or/main.c | 6 +++--- src/or/main.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index b3af6f9..b686286 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1965,7 +1965,7 @@ connection_dir_client_reached_eof(dir_connection_t *conn) routers_update_all_from_networkstatus(now, 3); update_microdescs_from_networkstatus(now); update_microdesc_downloads(now); - directory_info_has_arrived(now, 0); + directory_info_has_arrived(now, 0, 0); log_info(LD_DIR, "Successfully loaded consensus."); } @@ -2001,7 +2001,7 @@ connection_dir_client_reached_eof(dir_connection_t *conn) * ones got flushed to disk so it's safe to call this on them */ connection_dir_download_cert_failed(conn, status_code); } else { - directory_info_has_arrived(now, 0); + directory_info_has_arrived(now, 0, 0); log_info(LD_DIR, "Successfully loaded certificates from fetch."); } } else { @@ -2115,7 +2115,7 @@ connection_dir_client_reached_eof(dir_connection_t *conn) if (load_downloaded_routers(body, which, descriptor_digests, conn->router_purpose, conn->base_.address)) - directory_info_has_arrived(now, 0); + directory_info_has_arrived(now, 0, 0); } } if (which) { /* mark remaining ones as failed */ @@ -2169,7 +2169,7 @@ connection_dir_client_reached_eof(dir_connection_t *conn) control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_DESCRIPTORS, count_loading_descriptors_progress()); if (mds && smartlist_len(mds)) - directory_info_has_arrived(now, 0); + directory_info_has_arrived(now, 0, 0); SMARTLIST_FOREACH(which, char *, cp, tor_free(cp)); smartlist_free(which); smartlist_free(mds); diff --git a/src/or/main.c b/src/or/main.c index 408f244..96a56fc 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1002,12 +1002,12 @@ directory_all_unreachable(time_t now) /** This function is called whenever we successfully pull down some new * network statuses or server descriptors. */ void -directory_info_has_arrived(time_t now, int from_cache) +directory_info_has_arrived(time_t now, int from_cache, int suppress_logs) { const or_options_t *options = get_options(); if (!router_have_minimum_dir_info()) { - int quiet = from_cache || + int quiet = suppress_logs || from_cache || directory_too_idle_to_fetch_descriptors(options, now); tor_log(quiet ? LOG_INFO : LOG_NOTICE, LD_DIR, "I learned some more directory information, but not enough to " @@ -2391,7 +2391,7 @@ do_main_loop(void) * appropriate.) */ now = time(NULL); - directory_info_has_arrived(now, 1); + directory_info_has_arrived(now, 1, 0); if (server_mode(get_options())) { /* launch cpuworkers. Need to do this *after* we've read the onion key. */ diff --git a/src/or/main.h b/src/or/main.h index 37e93d7..7407116 100644 --- a/src/or/main.h +++ b/src/or/main.h @@ -48,7 +48,7 @@ MOCK_DECL(void,connection_start_writing,(connection_t *conn)); void connection_stop_reading_from_linked_conn(connection_t *conn); void directory_all_unreachable(time_t now); -void directory_info_has_arrived(time_t now, int from_cache); +void directory_info_has_arrived(time_t now, int from_cache, int suppress_logs); void ip_address_changed(int at_interface); void dns_servers_relaunch_checks(void);

1 0

[tor/master] avoid extra LOG_NOTICE for every new microdesc batch
by nickm＠torproject.org 23 Feb '16

23 Feb '16

commit 56c5e282a733912776f6dacbe4f5df66b4fb9606 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Feb 22 02:55:42 2016 -0500 avoid extra LOG_NOTICE for every new microdesc batch We already write out bootstrapping progress (see bug 9927) per new microdesc batch. There's no need to do a full "I learned some more directory information, but not enough to..." line each time too. --- src/or/directory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/directory.c b/src/or/directory.c index b686286..7c3bfe5 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2169,7 +2169,7 @@ connection_dir_client_reached_eof(dir_connection_t *conn) control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_DESCRIPTORS, count_loading_descriptors_progress()); if (mds && smartlist_len(mds)) - directory_info_has_arrived(now, 0, 0); + directory_info_has_arrived(now, 0, 1); SMARTLIST_FOREACH(which, char *, cp, tor_free(cp)); smartlist_free(which); smartlist_free(mds);

1 0

[tor/master] avoid redundant bootstrap events if the number of descs we just fetched is 0
by nickm＠torproject.org 23 Feb '16

23 Feb '16

commit e3eaee1d2cbd0bc03a40e374376ca72195a9d64d Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Feb 22 03:02:01 2016 -0500 avoid redundant bootstrap events if the number of descs we just fetched is 0 --- src/or/directory.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 7c3bfe5..964b159 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1764,7 +1764,7 @@ load_downloaded_routers(const char *body, smartlist_t *which, added = router_load_routers_from_string(body, NULL, SAVED_NOWHERE, which, descriptor_digests, buf); - if (general) + if (added && general) control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_DESCRIPTORS, count_loading_descriptors_progress()); return added; @@ -2166,10 +2166,11 @@ connection_dir_client_reached_eof(dir_connection_t *conn) /* Mark remaining ones as failed. */ dir_microdesc_download_failed(which, status_code); } - control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_DESCRIPTORS, - count_loading_descriptors_progress()); - if (mds && smartlist_len(mds)) + if (mds && smartlist_len(mds)) { + control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_DESCRIPTORS, + count_loading_descriptors_progress()); directory_info_has_arrived(now, 0, 1); + } SMARTLIST_FOREACH(which, char *, cp, tor_free(cp)); smartlist_free(which); smartlist_free(mds);

1 0

[tor/master] Merge remote-tracking branch 'arma/bug16825'
by nickm＠torproject.org 23 Feb '16

23 Feb '16

commit d3af4f4e43267f79239d116fd2c35e0ca9632f8b Merge: e88686c e3eaee1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 23 10:45:39 2016 -0500 Merge remote-tracking branch 'arma/bug16825' changes/bug16825 | 7 +++++++ src/or/directory.c | 15 +++++++++------ src/or/main.c | 6 +++--- src/or/main.h | 2 +- 4 files changed, 20 insertions(+), 10 deletions(-)

1 0