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

[translation/tor-messenger-privproperties_completed] Update translations for tor-messenger-privproperties_completed
by translation＠torproject.org 21 Mar '16

21 Mar '16

commit 56fdc33c7699181e82213e80f1ed6d4c09ae2492 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 21 17:28:56 2016 +0000 Update translations for tor-messenger-privproperties_completed --- fr/priv.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/priv.properties b/fr/priv.properties index 72d764e..0567041 100644 --- a/fr/priv.properties +++ b/fr/priv.properties @@ -1,2 +1,2 @@ priv.account=Génération d'une clé privée pour %S (%S) ... -priv.failed=La génération des clés a échoué : %S +priv.failed=Génération de la clé a échoué : %S

1 0

[translation/tor-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd
by translation＠torproject.org 21 Mar '16

21 Mar '16

commit ef5561239f3b4da52c3a0a1a0046dcdbac54ee6c Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 21 17:28:36 2016 +0000 Update translations for tor-messenger-prefsdtd --- az/prefs.dtd | 2 +- cy/prefs.dtd | 2 +- eo/prefs.dtd | 4 ++-- eu/prefs.dtd | 4 ++-- gl/prefs.dtd | 2 +- hr_HR/prefs.dtd | 26 +++++++++++++------------- ia/prefs.dtd | 2 +- is/prefs.dtd | 2 +- km/prefs.dtd | 2 +- ko_KR/prefs.dtd | 4 ++-- ku_IQ/prefs.dtd | 2 +- ky/prefs.dtd | 2 +- lt/prefs.dtd | 2 +- ms_MY/prefs.dtd | 2 +- my/prefs.dtd | 2 +- si_LK/prefs.dtd | 2 +- sk/prefs.dtd | 4 ++-- sk_SK/prefs.dtd | 2 +- sl_SI/prefs.dtd | 2 +- sr/prefs.dtd | 4 ++-- ta/prefs.dtd | 2 +- th/prefs.dtd | 4 ++-- vi/prefs.dtd | 2 +- 23 files changed, 41 insertions(+), 41 deletions(-) diff --git a/az/prefs.dtd b/az/prefs.dtd index 1441b0e..553be58 100644 --- a/az/prefs.dtd +++ b/az/prefs.dtd @@ -3,7 +3,7 @@ <!ENTITY prefs.requireEncryption "Require encryption"> <!ENTITY prefs.otrKeys "My Private Keys"> <!ENTITY prefs.keyForAccount "Key for account:"> -<!ENTITY prefs.fingerprint "Fingerprint:"> +<!ENTITY prefs.fingerprint "Barmaq izi:"> <!ENTITY prefs.knownFingers "Known fingerprints"> <!ENTITY prefs.introFingers "Manage the list of fingerprints you've seen."> <!ENTITY prefs.showFingers "View"> diff --git a/cy/prefs.dtd b/cy/prefs.dtd index a18e302..2c4be01 100644 --- a/cy/prefs.dtd +++ b/cy/prefs.dtd @@ -3,7 +3,7 @@ <!ENTITY prefs.requireEncryption "Angen amgryptio"> <!ENTITY prefs.otrKeys "My Private Keys"> <!ENTITY prefs.keyForAccount "Key for account:"> -<!ENTITY prefs.fingerprint "Fingerprint:"> +<!ENTITY prefs.fingerprint "Olion Bysedd:"> <!ENTITY prefs.knownFingers "Ôl bys gwybyddus"> <!ENTITY prefs.introFingers "Manage the list of fingerprints you've seen."> <!ENTITY prefs.showFingers "View"> diff --git a/eo/prefs.dtd b/eo/prefs.dtd index 1441b0e..81d825f 100644 --- a/eo/prefs.dtd +++ b/eo/prefs.dtd @@ -3,10 +3,10 @@ <!ENTITY prefs.requireEncryption "Require encryption"> <!ENTITY prefs.otrKeys "My Private Keys"> <!ENTITY prefs.keyForAccount "Key for account:"> -<!ENTITY prefs.fingerprint "Fingerprint:"> +<!ENTITY prefs.fingerprint "Fingrospuro:"> <!ENTITY prefs.knownFingers "Known fingerprints"> <!ENTITY prefs.introFingers "Manage the list of fingerprints you've seen."> -<!ENTITY prefs.showFingers "View"> +<!ENTITY prefs.showFingers "Rigardi"> <!ENTITY prefs.introSettings "These settings apply to all one-to-one conversations."> <!ENTITY prefs.verifyNudge "Always nudge to verify your contact's identity"> <!ENTITY prefs.emptyAccountList "No accounts configured"> diff --git a/eu/prefs.dtd b/eu/prefs.dtd index f2153e7..b051cf2 100644 --- a/eu/prefs.dtd +++ b/eu/prefs.dtd @@ -3,10 +3,10 @@ <!ENTITY prefs.requireEncryption "Require encryption"> <!ENTITY prefs.otrKeys "My Private Keys"> <!ENTITY prefs.keyForAccount "Key for account:"> -<!ENTITY prefs.fingerprint "Fingerprint:"> +<!ENTITY prefs.fingerprint "Hatz-marka:"> <!ENTITY prefs.knownFingers "Known fingerprints"> <!ENTITY prefs.introFingers "Manage the list of fingerprints you've seen."> -<!ENTITY prefs.showFingers "View"> +<!ENTITY prefs.showFingers "Ikusi"> <!ENTITY prefs.introSettings "These settings apply to all one-to-one conversations."> <!ENTITY prefs.verifyNudge "Always nudge to verify your contact's identity"> <!ENTITY prefs.emptyAccountList "No accounts configured"> diff --git a/gl/prefs.dtd b/gl/prefs.dtd index 5ab1fc0..aab34c2 100644 --- a/gl/prefs.dtd +++ b/gl/prefs.dtd @@ -6,7 +6,7 @@ <!ENTITY prefs.fingerprint "Pegada Dixital:"> <!ENTITY prefs.knownFingers "Known fingerprints"> <!ENTITY prefs.introFingers "Manage the list of fingerprints you've seen."> -<!ENTITY prefs.showFingers "View"> +<!ENTITY prefs.showFingers "Ver"> <!ENTITY prefs.introSettings "These settings apply to all one-to-one conversations."> <!ENTITY prefs.verifyNudge "Always nudge to verify your contact's identity"> <!ENTITY prefs.emptyAccountList "No accounts configured"> diff --git a/hr_HR/prefs.dtd b/hr_HR/prefs.dtd index 1441b0e..e2bd232 100644 --- a/hr_HR/prefs.dtd +++ b/hr_HR/prefs.dtd @@ -1,13 +1,13 @@ -<!ENTITY prefs.otrPreferences "OTR Preferences"> -<!ENTITY prefs.otrSettings "OTR Settings"> -<!ENTITY prefs.requireEncryption "Require encryption"> -<!ENTITY prefs.otrKeys "My Private Keys"> -<!ENTITY prefs.keyForAccount "Key for account:"> -<!ENTITY prefs.fingerprint "Fingerprint:"> -<!ENTITY prefs.knownFingers "Known fingerprints"> -<!ENTITY prefs.introFingers "Manage the list of fingerprints you've seen."> -<!ENTITY prefs.showFingers "View"> -<!ENTITY prefs.introSettings "These settings apply to all one-to-one conversations."> -<!ENTITY prefs.verifyNudge "Always nudge to verify your contact's identity"> -<!ENTITY prefs.emptyAccountList "No accounts configured"> -<!ENTITY prefs.generate "Generate"> \ No newline at end of file +<!ENTITY prefs.otrPreferences "OTR postavke"> +<!ENTITY prefs.otrSettings "OTR postavke"> +<!ENTITY prefs.requireEncryption "Zahtjevaj enkripciju"> +<!ENTITY prefs.otrKeys "Moji privatni ključevi"> +<!ENTITY prefs.keyForAccount "Ključ za račun:"> +<!ENTITY prefs.fingerprint "Otisak prsta:"> +<!ENTITY prefs.knownFingers "Poznati otisci prstiju"> +<!ENTITY prefs.introFingers "Upravljajte popisom otisaka prstiju koje ste vidjeli."> +<!ENTITY prefs.showFingers "Pogled"> +<!ENTITY prefs.introSettings "Ove postavke se primjenjuju na sve jedan-na-jedan razgovore. "> +<!ENTITY prefs.verifyNudge "Uvijek gurkajte za verifikaciju identiteta Vašeg kontakta"> +<!ENTITY prefs.emptyAccountList "Nema konfiguriranih računa"> +<!ENTITY prefs.generate "Generiraj"> \ No newline at end of file diff --git a/ia/prefs.dtd b/ia/prefs.dtd index 1441b0e..19f577c 100644 --- a/ia/prefs.dtd +++ b/ia/prefs.dtd @@ -6,7 +6,7 @@ <!ENTITY prefs.fingerprint "Fingerprint:"> <!ENTITY prefs.knownFingers "Known fingerprints"> <!ENTITY prefs.introFingers "Manage the list of fingerprints you've seen."> -<!ENTITY prefs.showFingers "View"> +<!ENTITY prefs.showFingers "Vider"> <!ENTITY prefs.introSettings "These settings apply to all one-to-one conversations."> <!ENTITY prefs.verifyNudge "Always nudge to verify your contact's identity"> <!ENTITY prefs.emptyAccountList "No accounts configured"> diff --git a/is/prefs.dtd b/is/prefs.dtd index 1441b0e..bbbf9b5 100644 --- a/is/prefs.dtd +++ b/is/prefs.dtd @@ -6,7 +6,7 @@ <!ENTITY prefs.fingerprint "Fingerprint:"> <!ENTITY prefs.knownFingers "Known fingerprints"> <!ENTITY prefs.introFingers "Manage the list of fingerprints you've seen."> -<!ENTITY prefs.showFingers "View"> +<!ENTITY prefs.showFingers "Sýn"> <!ENTITY prefs.introSettings "These settings apply to all one-to-one conversations."> <!ENTITY prefs.verifyNudge "Always nudge to verify your contact's identity"> <!ENTITY prefs.emptyAccountList "No accounts configured"> diff --git a/km/prefs.dtd b/km/prefs.dtd index 1441b0e..ccce0b0 100644 --- a/km/prefs.dtd +++ b/km/prefs.dtd @@ -3,7 +3,7 @@ <!ENTITY prefs.requireEncryption "Require encryption"> <!ENTITY prefs.otrKeys "My Private Keys"> <!ENTITY prefs.keyForAccount "Key for account:"> -<!ENTITY prefs.fingerprint "Fingerprint:"> +<!ENTITY prefs.fingerprint "ស្នាមម្រាមដៃ៖"> <!ENTITY prefs.knownFingers "Known fingerprints"> <!ENTITY prefs.introFingers "Manage the list of fingerprints you've seen."> <!ENTITY prefs.showFingers "View"> diff --git a/ko_KR/prefs.dtd b/ko_KR/prefs.dtd index 1441b0e..0425efa 100644 --- a/ko_KR/prefs.dtd +++ b/ko_KR/prefs.dtd @@ -3,10 +3,10 @@ <!ENTITY prefs.requireEncryption "Require encryption"> <!ENTITY prefs.otrKeys "My Private Keys"> <!ENTITY prefs.keyForAccount "Key for account:"> -<!ENTITY prefs.fingerprint "Fingerprint:"> +<!ENTITY prefs.fingerprint "지문:"> <!ENTITY prefs.knownFingers "Known fingerprints"> <!ENTITY prefs.introFingers "Manage the list of fingerprints you've seen."> -<!ENTITY prefs.showFingers "View"> +<!ENTITY prefs.showFingers "보기"> <!ENTITY prefs.introSettings "These settings apply to all one-to-one conversations."> <!ENTITY prefs.verifyNudge "Always nudge to verify your contact's identity"> <!ENTITY prefs.emptyAccountList "No accounts configured"> diff --git a/ku_IQ/prefs.dtd b/ku_IQ/prefs.dtd index 1441b0e..f8b36a3 100644 --- a/ku_IQ/prefs.dtd +++ b/ku_IQ/prefs.dtd @@ -3,7 +3,7 @@ <!ENTITY prefs.requireEncryption "Require encryption"> <!ENTITY prefs.otrKeys "My Private Keys"> <!ENTITY prefs.keyForAccount "Key for account:"> -<!ENTITY prefs.fingerprint "Fingerprint:"> +<!ENTITY prefs.fingerprint ":پەنجەمۆر"> <!ENTITY prefs.knownFingers "Known fingerprints"> <!ENTITY prefs.introFingers "Manage the list of fingerprints you've seen."> <!ENTITY prefs.showFingers "View"> diff --git a/ky/prefs.dtd b/ky/prefs.dtd index 1441b0e..1a87a9f 100644 --- a/ky/prefs.dtd +++ b/ky/prefs.dtd @@ -6,7 +6,7 @@ <!ENTITY prefs.fingerprint "Fingerprint:"> <!ENTITY prefs.knownFingers "Known fingerprints"> <!ENTITY prefs.introFingers "Manage the list of fingerprints you've seen."> -<!ENTITY prefs.showFingers "View"> +<!ENTITY prefs.showFingers "Көрүү"> <!ENTITY prefs.introSettings "These settings apply to all one-to-one conversations."> <!ENTITY prefs.verifyNudge "Always nudge to verify your contact's identity"> <!ENTITY prefs.emptyAccountList "No accounts configured"> diff --git a/lt/prefs.dtd b/lt/prefs.dtd index 7e9df5f..05a499d 100644 --- a/lt/prefs.dtd +++ b/lt/prefs.dtd @@ -6,7 +6,7 @@ <!ENTITY prefs.fingerprint "Fingerprint:"> <!ENTITY prefs.knownFingers "Žinomi pirštų anspaudai"> <!ENTITY prefs.introFingers "Manage the list of fingerprints you've seen."> -<!ENTITY prefs.showFingers "View"> +<!ENTITY prefs.showFingers "Rodymas"> <!ENTITY prefs.introSettings "These settings apply to all one-to-one conversations."> <!ENTITY prefs.verifyNudge "Always nudge to verify your contact's identity"> <!ENTITY prefs.emptyAccountList "No accounts configured"> diff --git a/ms_MY/prefs.dtd b/ms_MY/prefs.dtd index 1441b0e..9dc17a7 100644 --- a/ms_MY/prefs.dtd +++ b/ms_MY/prefs.dtd @@ -3,7 +3,7 @@ <!ENTITY prefs.requireEncryption "Require encryption"> <!ENTITY prefs.otrKeys "My Private Keys"> <!ENTITY prefs.keyForAccount "Key for account:"> -<!ENTITY prefs.fingerprint "Fingerprint:"> +<!ENTITY prefs.fingerprint "TandaTangan:"> <!ENTITY prefs.knownFingers "Known fingerprints"> <!ENTITY prefs.introFingers "Manage the list of fingerprints you've seen."> <!ENTITY prefs.showFingers "View"> diff --git a/my/prefs.dtd b/my/prefs.dtd index 1441b0e..f1a392a 100644 --- a/my/prefs.dtd +++ b/my/prefs.dtd @@ -6,7 +6,7 @@ <!ENTITY prefs.fingerprint "Fingerprint:"> <!ENTITY prefs.knownFingers "Known fingerprints"> <!ENTITY prefs.introFingers "Manage the list of fingerprints you've seen."> -<!ENTITY prefs.showFingers "View"> +<!ENTITY prefs.showFingers "ကြည့်ရှုန်"> <!ENTITY prefs.introSettings "These settings apply to all one-to-one conversations."> <!ENTITY prefs.verifyNudge "Always nudge to verify your contact's identity"> <!ENTITY prefs.emptyAccountList "No accounts configured"> diff --git a/si_LK/prefs.dtd b/si_LK/prefs.dtd index 1441b0e..ef38531 100644 --- a/si_LK/prefs.dtd +++ b/si_LK/prefs.dtd @@ -6,7 +6,7 @@ <!ENTITY prefs.fingerprint "Fingerprint:"> <!ENTITY prefs.knownFingers "Known fingerprints"> <!ENTITY prefs.introFingers "Manage the list of fingerprints you've seen."> -<!ENTITY prefs.showFingers "View"> +<!ENTITY prefs.showFingers "දැක්ම"> <!ENTITY prefs.introSettings "These settings apply to all one-to-one conversations."> <!ENTITY prefs.verifyNudge "Always nudge to verify your contact's identity"> <!ENTITY prefs.emptyAccountList "No accounts configured"> diff --git a/sk/prefs.dtd b/sk/prefs.dtd index a320707..050ea6c 100644 --- a/sk/prefs.dtd +++ b/sk/prefs.dtd @@ -3,10 +3,10 @@ <!ENTITY prefs.requireEncryption "Require encryption"> <!ENTITY prefs.otrKeys "My Private Keys"> <!ENTITY prefs.keyForAccount "Key for account:"> -<!ENTITY prefs.fingerprint "Fingerprint:"> +<!ENTITY prefs.fingerprint "Odtlačok:"> <!ENTITY prefs.knownFingers "Známe odtlačky prsta"> <!ENTITY prefs.introFingers "Spravovať zoznam odtlačkov prstov, čo ste videli."> -<!ENTITY prefs.showFingers "View"> +<!ENTITY prefs.showFingers "Zobraziť"> <!ENTITY prefs.introSettings "These settings apply to all one-to-one conversations."> <!ENTITY prefs.verifyNudge "Always nudge to verify your contact's identity"> <!ENTITY prefs.emptyAccountList "No accounts configured"> diff --git a/sk_SK/prefs.dtd b/sk_SK/prefs.dtd index 5864ab6..c1427fd 100644 --- a/sk_SK/prefs.dtd +++ b/sk_SK/prefs.dtd @@ -3,7 +3,7 @@ <!ENTITY prefs.requireEncryption "Require encryption"> <!ENTITY prefs.otrKeys "My Private Keys"> <!ENTITY prefs.keyForAccount "Key for account:"> -<!ENTITY prefs.fingerprint "Fingerprint:"> +<!ENTITY prefs.fingerprint "Odtlačok:"> <!ENTITY prefs.knownFingers "Known fingerprints"> <!ENTITY prefs.introFingers "Manage the list of fingerprints you've seen."> <!ENTITY prefs.showFingers "View"> diff --git a/sl_SI/prefs.dtd b/sl_SI/prefs.dtd index 1441b0e..c3dab81 100644 --- a/sl_SI/prefs.dtd +++ b/sl_SI/prefs.dtd @@ -3,7 +3,7 @@ <!ENTITY prefs.requireEncryption "Require encryption"> <!ENTITY prefs.otrKeys "My Private Keys"> <!ENTITY prefs.keyForAccount "Key for account:"> -<!ENTITY prefs.fingerprint "Fingerprint:"> +<!ENTITY prefs.fingerprint "Prstni odtis:"> <!ENTITY prefs.knownFingers "Known fingerprints"> <!ENTITY prefs.introFingers "Manage the list of fingerprints you've seen."> <!ENTITY prefs.showFingers "View"> diff --git a/sr/prefs.dtd b/sr/prefs.dtd index 1441b0e..fccdb0e 100644 --- a/sr/prefs.dtd +++ b/sr/prefs.dtd @@ -3,10 +3,10 @@ <!ENTITY prefs.requireEncryption "Require encryption"> <!ENTITY prefs.otrKeys "My Private Keys"> <!ENTITY prefs.keyForAccount "Key for account:"> -<!ENTITY prefs.fingerprint "Fingerprint:"> +<!ENTITY prefs.fingerprint "Отисак прста:"> <!ENTITY prefs.knownFingers "Known fingerprints"> <!ENTITY prefs.introFingers "Manage the list of fingerprints you've seen."> -<!ENTITY prefs.showFingers "View"> +<!ENTITY prefs.showFingers "Погледај"> <!ENTITY prefs.introSettings "These settings apply to all one-to-one conversations."> <!ENTITY prefs.verifyNudge "Always nudge to verify your contact's identity"> <!ENTITY prefs.emptyAccountList "No accounts configured"> diff --git a/ta/prefs.dtd b/ta/prefs.dtd index 1441b0e..2dc91f1 100644 --- a/ta/prefs.dtd +++ b/ta/prefs.dtd @@ -3,7 +3,7 @@ <!ENTITY prefs.requireEncryption "Require encryption"> <!ENTITY prefs.otrKeys "My Private Keys"> <!ENTITY prefs.keyForAccount "Key for account:"> -<!ENTITY prefs.fingerprint "Fingerprint:"> +<!ENTITY prefs.fingerprint "கைரேகை:"> <!ENTITY prefs.knownFingers "Known fingerprints"> <!ENTITY prefs.introFingers "Manage the list of fingerprints you've seen."> <!ENTITY prefs.showFingers "View"> diff --git a/th/prefs.dtd b/th/prefs.dtd index 1441b0e..0fb15b1 100644 --- a/th/prefs.dtd +++ b/th/prefs.dtd @@ -3,10 +3,10 @@ <!ENTITY prefs.requireEncryption "Require encryption"> <!ENTITY prefs.otrKeys "My Private Keys"> <!ENTITY prefs.keyForAccount "Key for account:"> -<!ENTITY prefs.fingerprint "Fingerprint:"> +<!ENTITY prefs.fingerprint "ลายนิ้วมือ:"> <!ENTITY prefs.knownFingers "Known fingerprints"> <!ENTITY prefs.introFingers "Manage the list of fingerprints you've seen."> -<!ENTITY prefs.showFingers "View"> +<!ENTITY prefs.showFingers "มองดู"> <!ENTITY prefs.introSettings "These settings apply to all one-to-one conversations."> <!ENTITY prefs.verifyNudge "Always nudge to verify your contact's identity"> <!ENTITY prefs.emptyAccountList "No accounts configured"> diff --git a/vi/prefs.dtd b/vi/prefs.dtd index 896327e..fe9efb2 100644 --- a/vi/prefs.dtd +++ b/vi/prefs.dtd @@ -6,7 +6,7 @@ <!ENTITY prefs.fingerprint "Fingerprint:"> <!ENTITY prefs.knownFingers "Vân tay đã được biết đến"> <!ENTITY prefs.introFingers "Manage the list of fingerprints you've seen."> -<!ENTITY prefs.showFingers "View"> +<!ENTITY prefs.showFingers "Xem"> <!ENTITY prefs.introSettings "These settings apply to all one-to-one conversations."> <!ENTITY prefs.verifyNudge "Always nudge to verify your contact's identity"> <!ENTITY prefs.emptyAccountList "No accounts configured">

1 0

[torspec/master] Document how ed25519 voting actually should work
by nickm＠torproject.org 21 Mar '16

21 Mar '16

commit dc9916048838a1963e4533858cbfbc74c7f8652f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 23 10:03:02 2016 -0500 Document how ed25519 voting actually should work --- dir-spec.txt | 48 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 37 insertions(+), 11 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index 2ab1878..d3e5228 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -1895,6 +1895,8 @@ "HSDir" if the router is considered a v2 hidden service directory. "Named" if the router's identity-nickname mapping is canonical, and this authority binds names. + "NoEdConsensus" if any Ed25519 key in the router's descriptor or + microdesriptor does not reflect authority consensus. "Stable" if the router is suitable for long-lived circuits. "Running" if the router is currently usable. "Unnamed" if another router has bound the name used by this @@ -2156,6 +2158,9 @@ authority believes that it's been up for at least 96 hours (or the current value of MinUptimeHidServDirectoryV2). + "NoEdConsensus" -- authorities should not vote on this flag; it is + produced as part of the consensus for consensus method 22 or later. + Directory server administrators may label some relays or IPs as blacklisted, and elect not to include them in their network-status lists. @@ -2295,11 +2300,14 @@ (Consensus method earlier than 21) * is included according to the rules in section 3.8.0.1 and - 3.8.0.2 below. (Consensus method 21 or later) + 3.8.0.2 below. (Consensus method 22 or later) - * For any given RSA or Ed25519 identity, we include at most + * For any given RSA identity digest, we include at most one router status entry. + * For any given Ed25519 identity, we include at most one router + status entry. + * A router entry has a flag set if that is included by more than half of the authorities who care about that flag. @@ -2379,6 +2387,10 @@ * If consensus method 18 or later is used, authorities include "id" lines in microdescriptors. + * If consensus method 22 or later is used, and the votes do not + produce a majority consensus about Ed25519 key (see 3.8.0.1 below), the + consensus must include a NoEdConsensus flag on the "s" line. + The signatures at the end of a consensus document are sorted in ascending order by identity digest. @@ -2387,24 +2399,35 @@ 3.8.0.1. Deciding which Ids to include. - For each <id-Ed, id-RSA> that is listed by more than half of the total - authorities (not just total votes), include it. (No other <id-Ed, id-RSA'> - can have as many votes.) + This sorting algorithm is used for consensus-method 22 and later. + + First, consider each listing by tuple of <Ed,Rsa> identities, where 'Ed' + may be "None" if the voter included "id ed25519 none" to indicate that + the authority knows what ed25519 identities are, and thinks that the RSA + key doesn't have one. + + For each such <Ed, RSA> tuple that is listed by more than half of the + total authorities (not just total votes), include it. (It is not + possible for any other <id-Ed, id-RSA'> to have as many votes.) If more + than half of the authorities list a single <Ed,Rsa> pair of this type, we + consider that Ed key to be "consensus"; see description of the + NoEdConsensus flag. Log any other id-RSA values corresponding to an id-Ed we included, and any other id-Ed values corresponding to an id-RSA we included. For each <id-RSA> that is not yet included, if it is listed by more than half of the total authorities, and we do not already have it listed with - some <id-Ed>, include it without an id-Ed. + some <id-Ed>, include it, but do not consider its Ed identity canonical. 3.8.0.2 Deciding which descriptors to include Deciding which descriptors to include. A tuple belongs to an <id-RSA, id-Ed> identity if it is a new tuple that - matches both ID parts, or if it is an old tuple that matches the RSA part. - A tuple belongs to an <id-RSA> identity if its RSA identity matches. + matches both ID parts, or if it is an old tuple (one with no Ed opinion) + that matches the RSA part. A tuple belongs to an <id-RSA> identity if its + RSA identity matches. A tuple matches another tuple if all the fields that are present in both tuples are the same. @@ -2414,7 +2437,6 @@ that matches the largest set, breaking ties in favor of the most recently published, and then in favor of the smaller server descriptor digest. - 3.8.1. Forward compatibility Future versions of Tor will need to include new information in the @@ -2444,8 +2466,8 @@ "18" -- Adds 'id' to microdescriptors. "19" -- Adds "package" lines to consensuses "20" -- Adds GuardFraction information to microdescriptors. - "21" -- Adds Ed25519 keys to microdescriptors and to voting - algorithm. + "21" -- Adds Ed25519 keys to microdescriptors. + "22" -- Instantiates Ed25519 voting algorithm correctly. Before generating a consensus, an authority must decide which consensus method to use. To do this, it looks for the highest version number @@ -2464,6 +2486,10 @@ making changes in the contents of consensus; not for making backward-incompatible changes in their format.) +The following methods have incorrect implementations; authorities SHOULD + NOT advertise support for them: + "21" -- Did not correctly enable support for ed25519 key collation. + 3.8.2. Encoding port lists Whether the summary shows the list of accepted ports or the list of

1 0

[torspec/master] Clarify NoEdConsensus flag a bit harder.
by nickm＠torproject.org 21 Mar '16

21 Mar '16

commit 313eff650d3aa7d4a221ea2f21074eb7cc7d5c52 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 15 10:52:23 2016 -0400 Clarify NoEdConsensus flag a bit harder. (Note that no corresponding tor change is needed, since we don't actually use these keys yet.) Resolves 17668.{S1,T1} --- dir-spec.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index d3e5228..57188eb 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -1401,6 +1401,10 @@ The node's master Ed25519 identity key, base64 encoded, without trailing =s. + All implementations MUST ignore this key for any microdescriptor + whose corresponding entry in the consensus includes the + 'NoEdConsensus' flag. + (Only included when generating microdescriptors for consensus-method 21 or later.) @@ -2388,8 +2392,10 @@ "id" lines in microdescriptors. * If consensus method 22 or later is used, and the votes do not - produce a majority consensus about Ed25519 key (see 3.8.0.1 below), the - consensus must include a NoEdConsensus flag on the "s" line. + produce a majority consensus about a relay's Ed25519 key (see + 3.8.0.1 below), the consensus must include a NoEdConsensus flag on + the "s" line for every relay whose listed Ed key does not reflect + consensus. The signatures at the end of a consensus document are sorted in ascending order by identity digest.

1 0

[torspec/master] Merge remote-tracking branch 'public/ed25519_voting_again'
by nickm＠torproject.org 21 Mar '16

21 Mar '16

commit a5d0978a833a610d5f1ed4f5424eca563deba65e Merge: 2a9f49b 313eff6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 21 13:28:17 2016 -0400 Merge remote-tracking branch 'public/ed25519_voting_again' dir-spec.txt | 54 +++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 43 insertions(+), 11 deletions(-)

1 0

[translation/tor-messenger-loggerproperties] Update translations for tor-messenger-loggerproperties
by translation＠torproject.org 21 Mar '16

21 Mar '16

commit 8cc09b60e44d80107a24fe93a66a0b8b12afd917 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 21 17:27:40 2016 +0000 Update translations for tor-messenger-loggerproperties --- hr_HR/logger.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hr_HR/logger.properties b/hr_HR/logger.properties index 2228c50..e296406 100644 --- a/hr_HR/logger.properties +++ b/hr_HR/logger.properties @@ -4,4 +4,4 @@ # LOCALIZATION NOTE (badLogfile): # %S is the filename of the log file. -badLogfile=Empty or corrupt log file: %S +badLogfile=Prazna ili korumpirana datoteka zapisa o događajima: %S

1 0

[tor/release-0.2.7] Fix log message subjects in networkstatus_parse_vote_from_string()
by nickm＠torproject.org 21 Mar '16

21 Mar '16

commit c20e34e1894bed07982fe64d60a1b3fe9403d269 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 22 10:59:27 2016 -0500 Fix log message subjects in networkstatus_parse_vote_from_string() Some of these messages called the thing being parsed a "vote" whether it is a vote or a consensus. Fixes bug 18368. --- changes/bug18368 | 5 +++++ src/or/routerparse.c | 25 ++++++++++++------------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/changes/bug18368 b/changes/bug18368 new file mode 100644 index 0000000..17218d4 --- /dev/null +++ b/changes/bug18368 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - When logging information about an unparseable networkstatus vote or + consensus, do not say "vote" when we mean consensus. Fixes bug + 18368; bugfix on 0.2.0.8-alpha. + diff --git a/src/or/routerparse.c b/src/or/routerparse.c index f898ef8..6b6e21d 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -2862,7 +2862,7 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out, (ns_type == NS_TYPE_CONSENSUS) ? networkstatus_consensus_token_table : networkstatus_token_table, 0)) { - log_warn(LD_DIR, "Error tokenizing network-status vote header"); + log_warn(LD_DIR, "Error tokenizing network-status header"); goto err; } @@ -3085,7 +3085,7 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out, base16_decode(voter->identity_digest, sizeof(voter->identity_digest), tok->args[1], HEX_DIGEST_LEN) < 0) { log_warn(LD_DIR, "Error decoding identity digest %s in " - "network-status vote.", escaped(tok->args[1])); + "network-status document.", escaped(tok->args[1])); goto err; } if (ns->type != NS_TYPE_CONSENSUS && @@ -3144,7 +3144,7 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out, voter = NULL; } if (smartlist_len(ns->voters) == 0) { - log_warn(LD_DIR, "Missing dir-source elements in a vote networkstatus."); + log_warn(LD_DIR, "Missing dir-source elements in a networkstatus."); goto err; } else if (ns->type != NS_TYPE_CONSENSUS && smartlist_len(ns->voters) != 1) { log_warn(LD_DIR, "Too many dir-source elements in a vote networkstatus."); @@ -3205,8 +3205,7 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out, } if (fast_memcmp(rs1->identity_digest, rs2->identity_digest, DIGEST_LEN) >= 0) { - log_warn(LD_DIR, "Vote networkstatus entries not sorted by identity " - "digest"); + log_warn(LD_DIR, "Networkstatus entries not sorted by identity digest"); goto err; } } @@ -3319,12 +3318,12 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out, base16_decode(declared_identity, sizeof(declared_identity), id_hexdigest, HEX_DIGEST_LEN) < 0) { log_warn(LD_DIR, "Error decoding declared identity %s in " - "network-status vote.", escaped(id_hexdigest)); + "network-status document.", escaped(id_hexdigest)); goto err; } if (!(v = networkstatus_get_voter_by_id(ns, declared_identity))) { - log_warn(LD_DIR, "ID on signature on network-status vote does not match " - "any declared directory source."); + log_warn(LD_DIR, "ID on signature on network-status document does " + "not match any declared directory source."); goto err; } sig = tor_malloc_zero(sizeof(document_signature_t)); @@ -3334,7 +3333,7 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out, base16_decode(sig->signing_key_digest, sizeof(sig->signing_key_digest), sk_hexdigest, HEX_DIGEST_LEN) < 0) { log_warn(LD_DIR, "Error decoding declared signing key digest %s in " - "network-status vote.", escaped(sk_hexdigest)); + "network-status document.", escaped(sk_hexdigest)); tor_free(sig); goto err; } @@ -3353,8 +3352,8 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out, /* We already parsed a vote with this algorithm from this voter. Use the first one. */ log_fn(LOG_PROTOCOL_WARN, LD_DIR, "We received a networkstatus " - "that contains two votes from the same voter with the same " - "algorithm. Ignoring the second vote."); + "that contains two signatures from the same voter with the same " + "algorithm. Ignoring the second signature."); tor_free(sig); continue; } @@ -3362,7 +3361,7 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out, if (ns->type != NS_TYPE_CONSENSUS) { if (check_signature_token(ns_digests.d[DIGEST_SHA1], DIGEST_LEN, tok, ns->cert->signing_key, 0, - "network-status vote")) { + "network-status document")) { tor_free(sig); goto err; } @@ -3381,7 +3380,7 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out, } SMARTLIST_FOREACH_END(_tok); if (! n_signatures) { - log_warn(LD_DIR, "No signatures on networkstatus vote."); + log_warn(LD_DIR, "No signatures on networkstatus document."); goto err; } else if (ns->type == NS_TYPE_VOTE && n_signatures != 1) { log_warn(LD_DIR, "Received more than one signature on a "

1 0

[tor/release-0.2.7] Document has_ed25519_listing
by nickm＠torproject.org 21 Mar '16

21 Mar '16

commit 60ca3f358f80930778b12c9fcc8e3cf562b64e8e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 23 08:13:39 2016 -0500 Document has_ed25519_listing --- src/or/or.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/or/or.h b/src/or/or.h index b6d6ec0..b24b6a8 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2377,7 +2377,9 @@ typedef struct vote_routerstatus_t { char *version; /**< The version that the authority says this router is * running. */ unsigned int has_measured_bw:1; /**< The vote had a measured bw */ - unsigned int has_ed25519_listing:1; /** DOCDOC */ + /** True iff the vote included an entry for ed25519 ID, or included + * "id ed25519 none" to indicate that there was no ed25519 ID. */ + unsigned int has_ed25519_listing:1; unsigned int ed25519_reflects_consensus:1; /** DOCDOC */ uint32_t measured_bw_kb; /**< Measured bandwidth (capacity) of the router */ /** The hash or hashes that the authority claims this microdesc has. */

1 0

[tor/release-0.2.7] Never vote for an ed key twice.
by nickm＠torproject.org 21 Mar '16

21 Mar '16

commit 13a31e72db1b009623aa55bd52ffe7390a22623d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 22 11:43:59 2016 -0500 Never vote for an ed key twice. When generating a vote, and we have two routerinfos with the same ed key, omit the one published earlier. This was supposed to have been solved by key pinning, but when I made key pinning optional, I didn't realize that this would jump up and bite us. It is part of bug 18318, and the root cause of 17668. --- changes/bug18318_ed | 7 +++++++ src/or/dirserv.c | 39 +++++++++++++++++++++++++++++++++++++++ src/or/or.h | 4 ++++ 3 files changed, 50 insertions(+) diff --git a/changes/bug18318_ed b/changes/bug18318_ed new file mode 100644 index 0000000..af39234 --- /dev/null +++ b/changes/bug18318_ed @@ -0,0 +1,7 @@ + o Major bugfixes: + - When generating a vote with keypinning disabled, never include two + entries for the same ed25519 identity. This bug was causing + authorities to generate votes that they could not parse when a router + violated key pinning by changing its RSA identity but keeping its + Ed25519 identity. Fixes bug 17668; fixes part of bug 18318. Bugfix on + 0.2.7.2-alpha. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 8d9f166..016514f 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2126,6 +2126,44 @@ get_possible_sybil_list(const smartlist_t *routers) return omit_as_sybil; } +/** If there are entries in routers with exactly the same ed25519 keys, + * remove the older one. May alter the order of the list. */ +static void +routers_make_ed_keys_unique(smartlist_t *routers) +{ + routerinfo_t *ri2; + digest256map_t *by_ed_key = digest256map_new(); + + SMARTLIST_FOREACH_BEGIN(routers, routerinfo_t *, ri) { + ri->omit_from_vote = 0; + if (ri->signing_key_cert == NULL) + continue; /* No ed key */ + const uint8_t *pk = ri->signing_key_cert->signing_key.pubkey; + if ((ri2 = digest256map_get(by_ed_key, pk))) { + /* Duplicate; must omit one. Set the omit_from_vote flag in whichever + * one has the earlier published_on. */ + if (ri2->cache_info.published_on < ri->cache_info.published_on) { + digest256map_set(by_ed_key, pk, ri); + ri2->omit_from_vote = 1; + } else { + ri->omit_from_vote = 1; + } + } else { + /* Add to map */ + digest256map_set(by_ed_key, pk, ri); + } + } SMARTLIST_FOREACH_END(ri); + + digest256map_free(by_ed_key, NULL); + + /* Now remove every router where the omit_from_vote flag got set. */ + SMARTLIST_FOREACH_BEGIN(routers, const routerinfo_t *, ri) { + if (ri->omit_from_vote) { + SMARTLIST_DEL_CURRENT(routers, ri); + } + } SMARTLIST_FOREACH_END(ri); +} + /** Extract status information from ri and from other authority * functions and store it in rs>. * @@ -2815,6 +2853,7 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, routers = smartlist_new(); smartlist_add_all(routers, rl->routers); + routers_make_ed_keys_unique(routers); routers_sort_by_identity(routers); omit_as_sybil = get_possible_sybil_list(routers); diff --git a/src/or/or.h b/src/or/or.h index 4496cbc..b6d6ec0 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2081,6 +2081,10 @@ typedef struct { * tests for it. */ unsigned int needs_retest_if_added:1; + /** Used during voting to indicate that we should not include an entry for + * this routerinfo. Used only during voting. */ + unsigned int omit_from_vote:1; + /** Tor can use this router for general positions in circuits; we got it * from a directory server as usual, or we're an authority and a server * uploaded it. */

1 0

[tor/release-0.2.7] Fix another case of 17668: Add NoEdConsensus
by nickm＠torproject.org 21 Mar '16

21 Mar '16

commit fa07c60c67d69ff25c4e64172e3a38b29a2e6143 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 23 09:31:23 2016 -0500 Fix another case of 17668: Add NoEdConsensus I had a half-built mechanism to track, during the voting process, whether the Ed25519 value (or lack thereof) reflected a true consensus among the authorities. But we never actually inserted this field in the consensus. The key idea here is that we first attempt to match up votes by pairs of <Ed,RSA>, where <Ed> can be NULL if we're told that there is no Ed key. If this succeeds, then we can treat all those votes as 'a consensus for Ed'. And we can include all other votes with a matching RSA key and no statement about Ed keys as being "also about the same relay." After that, we look for RSA keys we haven't actually found an entry for yet, and see if there are enough votes for them, NOT considering Ed keys. If there are, we match them as before, but we treat them as "not a consensus about ed". When we include an entry in a consensus, if it does not reflect a consensus about ed keys, then we include a new NoEdConsensus flag on it. This is all only for consensus method 22 or later. Also see corresponding dir-spec patch. --- changes/bug17668 | 5 +++++ src/or/dircollate.c | 4 +++- src/or/dirvote.c | 28 ++++++++++++++++++++++++++++ src/or/or.h | 5 ++++- 4 files changed, 40 insertions(+), 2 deletions(-) diff --git a/changes/bug17668 b/changes/bug17668 new file mode 100644 index 0000000..fa5c1c8 --- /dev/null +++ b/changes/bug17668 @@ -0,0 +1,5 @@ + o Major bugfixes (voting): + - When collating votes by Ed25519 identities, authorities now + include a "NoEdConsensus" flag if the ed25519 value (or lack thereof) + for a server does not reflect the majority consensus. Related to bug + 17668; bugfix on 0.2.7.2-alpha. diff --git a/src/or/dircollate.c b/src/or/dircollate.c index eeb0c24..ca8b7ca 100644 --- a/src/or/dircollate.c +++ b/src/or/dircollate.c @@ -81,6 +81,8 @@ dircollator_add_routerstatus(dircollator_t *dc, { const char *id = vrs->status.identity_digest; + vrs->ed25519_reflects_consensus = 0; + (void) vote; vote_routerstatus_t **vrs_lst = digestmap_get(dc->by_rsa_sha1, id); if (NULL == vrs_lst) { @@ -92,7 +94,7 @@ dircollator_add_routerstatus(dircollator_t *dc, const uint8_t *ed = vrs->ed25519_id; - if (tor_mem_is_zero((char*)ed, DIGEST256_LEN)) + if (! vrs->has_ed25519_listing) return; ddmap_entry_t search, *found; diff --git a/src/or/dirvote.c b/src/or/dirvote.c index be0635d..654d461 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -1242,6 +1242,9 @@ networkstatus_compute_consensus(smartlist_t *votes, smartlist_free(combined_server_versions); smartlist_free(combined_client_versions); + if (consensus_method >= MIN_METHOD_FOR_ED25519_ID_VOTING) + smartlist_add(flags, tor_strdup("NoEdConsensus")); + smartlist_sort_strings(flags); smartlist_uniq_strings(flags); @@ -1539,6 +1542,8 @@ networkstatus_compute_consensus(smartlist_t *votes, num_bandwidths = 0; num_mbws = 0; num_guardfraction_inputs = 0; + int ed_consensus = 0; + const uint8_t *ed_consensus_val = NULL; /* Okay, go through all the entries for this digest. */ for (int voter_idx = 0; voter_idx < smartlist_len(votes); ++voter_idx) { @@ -1580,6 +1585,17 @@ networkstatus_compute_consensus(smartlist_t *votes, if (rs->status.has_bandwidth) bandwidths_kb[num_bandwidths++] = rs->status.bandwidth_kb; + + /* Count number for which ed25519 is canonical. */ + if (rs->ed25519_reflects_consensus) { + ++ed_consensus; + if (ed_consensus_val) { + tor_assert(fast_memeq(ed_consensus_val, rs->ed25519_id, + ED25519_PUBKEY_LEN)); + } else { + ed_consensus_val = rs->ed25519_id; + } + } } /* We don't include this router at all unless more than half of @@ -1587,6 +1603,14 @@ networkstatus_compute_consensus(smartlist_t *votes, if (n_listing <= total_authorities/2) continue; + if (ed_consensus > 0) { + tor_assert(consensus_method >= MIN_METHOD_FOR_ED25519_ID_VOTING); + if (ed_consensus <= total_authorities / 2) { + log_warn(LD_BUG, "Not enough entries had ed_consensus set; how " + "can we have a consensus of %d?", ed_consensus); + } + } + /* The clangalyzer can't figure out that this will never be NULL * if n_listing is at least 1 */ tor_assert(current_rsa_id); @@ -1640,6 +1664,10 @@ networkstatus_compute_consensus(smartlist_t *votes, } else if (!strcmp(fl, "Unnamed")) { if (is_unnamed) smartlist_add(chosen_flags, (char*)fl); + } else if (!strcmp(fl, "NoEdConsensus") && + consensus_method >= MIN_METHOD_FOR_ED25519_ID_VOTING) { + if (ed_consensus <= total_authorities/2) + smartlist_add(chosen_flags, (char*)fl); } else { if (flag_counts[fl_sl_idx] > n_flag_voters[fl_sl_idx]/2) { smartlist_add(chosen_flags, (char*)fl); diff --git a/src/or/or.h b/src/or/or.h index b24b6a8..431927c 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2380,7 +2380,10 @@ typedef struct vote_routerstatus_t { /** True iff the vote included an entry for ed25519 ID, or included * "id ed25519 none" to indicate that there was no ed25519 ID. */ unsigned int has_ed25519_listing:1; - unsigned int ed25519_reflects_consensus:1; /** DOCDOC */ + /** True if the Ed25519 listing here is the consensus-opinion for the + * Ed25519 listing; false if there was no consensus on Ed25519 key status, + * or if this VRS doesn't reflect it. */ + unsigned int ed25519_reflects_consensus:1; uint32_t measured_bw_kb; /**< Measured bandwidth (capacity) of the router */ /** The hash or hashes that the authority claims this microdesc has. */ vote_microdesc_hash_t *microdesc;

1 0