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

[torspec/master] add a note to 250
by nickm＠torproject.org 21 Sep '15

21 Sep '15

commit 887d1c1f849e537bdfd2f25c9077a4b96236600f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 21 13:45:58 2015 -0400 add a note to 250 --- proposals/250-commit-reveal-consensus.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/proposals/250-commit-reveal-consensus.txt b/proposals/250-commit-reveal-consensus.txt index 5861fd9..0415bd8 100644 --- a/proposals/250-commit-reveal-consensus.txt +++ b/proposals/250-commit-reveal-consensus.txt @@ -3,6 +3,7 @@ Title: Random Number Generation During Tor Voting Authors: David Goulet, George Kadianakis Created: 2015-08-03 Status: Draft +Supersedes: 225 1. Introduction

1 0

[torspec/master] Describe most proposals through present
by nickm＠torproject.org 21 Sep '15

21 Sep '15

commit 2a51394655950eea26d6ee5f8a2cc71fc89fbd35 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 21 13:30:10 2015 -0400 Describe most proposals through present --- proposals/proposal-status.txt | 42 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/proposals/proposal-status.txt b/proposals/proposal-status.txt index 7a97d05..6ca1bda 100644 --- a/proposals/proposal-status.txt +++ b/proposals/proposal-status.txt @@ -385,8 +385,6 @@ again to remind me! right, might lead clients to kick themselves off the network out of paranoia. So, this proposal could use more analysis. (2/2015) -TAKE ANOTHER LOOK AT THESE: - 242 Better performance and usability for the MyFamily option [OPEN] Describes a mechanism for using a new ed25519 signature type to @@ -394,12 +392,52 @@ TAKE ANOTHER LOOK AT THESE: family lines. (9/2015) 245 Deprecating and removing the TAP circuit extension protocol [DRAFT] + + Explains a migration path for finally removing all support for the + TAP circuit extension protocol over several Tor versions. (9/2015) + 246 Merging Hidden Service Directories and Introduction Points [OPEN] + + XXXX + 247 Defending Against Guard Discovery Attacks using Vanguards [DRAFT] + + XXXX + 248 Remove all RSA identity keys [DRAFT] + + Explains a migration path for removing RSA1024 identity keys in the + future, once all Tor instances support Ed25519 identity + keys. (9/2015) + 249 Allow CREATE cells with >505 bytes of handshake data [DRAFT] + + Explains how to split CREATE cells (and other stuff) across + multiple RELAY_EXTEND cells. This one will be helpful if we want + to add support for some kind of circuit extension protocol + containing a postquantum forward-secure handshake, like ntru or + ring-lwe. (9/2015) + 250 Random Number Generation During Tor Voting [DRAFT] + + Describes a commit-and-reveal protocol for creating shared + randomness among the authorities during the voting process. Required + for a few other proposals, such as 224. (9/2015) + 251 Padding for netflow record resolution reduction [DRAFT] + + Proposes a periodic "keepalive-like" packet be sent over quiet Tor + connections, so that incidental netflow record collection in + default router configurations reveals less about when flows begin + and end. + 252 Single Onion Services [DRAFT] + + XXXX + 253 Out of Band Circuit HMACs [DRAFT] + Allows participating nodes to authenticate the whole contents of a + circuit point-to-point so as to better resist or detect some kinds + of tagging attacks. (9/2015) +

1 0

[torspec/master] Update many proposal statuses.
by nickm＠torproject.org 21 Sep '15

21 Sep '15

commit ab9cf8322b82ee8f387482f7938c7f1953abea91 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 21 13:23:38 2015 -0400 Update many proposal statuses. Now I've updated the status of everything in my proposal-status list. --- proposals/000-index.txt | 68 +++---- proposals/143-distributed-storage-improvements.txt | 2 +- proposals/175-automatic-node-promotion.txt | 2 +- proposals/182-creditbucket.txt | 2 +- proposals/185-dir-without-dirport.txt | 3 +- proposals/188-bridge-guards.txt | 2 +- proposals/194-mnemonic-urls.txt | 2 +- proposals/196-transport-control-ports.txt | 2 +- proposals/219-expanded-dns.txt | 2 +- proposals/220-ecc-id-keys.txt | 2 +- proposals/223-ace-handshake.txt | 2 +- proposals/225-strawman-shared-rand.txt | 3 +- proposals/229-further-socks5-extensions.txt | 2 +- proposals/237-directory-servers-for-all.txt | 1 + proposals/238-hs-relay-stats.txt | 2 +- proposals/243-hsdir-flag-need-stable.txt | 3 +- proposals/244-use-rfc5705-for-tls-binding.txt | 2 +- proposals/proposal-status.txt | 197 +------------------- 18 files changed, 62 insertions(+), 237 deletions(-) diff --git a/proposals/000-index.txt b/proposals/000-index.txt index 96d3436..0460e87 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -63,7 +63,7 @@ Proposals by number: 140 Provide diffs between consensuses [ACCEPTED] 141 Download server descriptors on demand [OBSOLETE] 142 Combine Introduction and Rendezvous Points [DEAD] -143 Improvements of Distributed Storage for Tor Hidden Service Descriptors [OPEN] +143 Improvements of Distributed Storage for Tor Hidden Service Descriptors [SUPERSEDED] 144 Increase the diversity of circuits by detecting nodes belonging the same provider [OBSOLETE] 145 Separate "suitable as a guard" from "suitable as a new guard" [SUPERSEDED] 146 Add new flag to reflect long-term stability [SUPERSEDED] @@ -95,31 +95,31 @@ Proposals by number: 172 GETINFO controller option for circuit information [ACCEPTED] 173 GETINFO Option Expansion [ACCEPTED] 174 Optimistic Data for Tor: Server Side [CLOSED] -175 Automatically promoting Tor clients to nodes [DRAFT] +175 Automatically promoting Tor clients to nodes [REJECTED] 176 Proposed version-3 link handshake for Tor [CLOSED] 177 Abstaining from votes on individual flags [OPEN] 178 Require majority of authorities to vote for consensus parameters [CLOSED] 179 TLS certificate and parameter normalization [CLOSED] 180 Pluggable transports for circumvention [CLOSED] 181 Optimistic Data for Tor: Client Side [CLOSED] -182 Credit Bucket [DRAFT] +182 Credit Bucket [OPEN] 183 Refill Intervals [CLOSED] 184 Miscellaneous changes for a v3 Tor link protocol [CLOSED] -185 Directory caches without DirPort [OPEN] +185 Directory caches without DirPort [SUPERSEDED] 186 Multiple addresses for one OR or bridge [CLOSED] 187 Reserve a cell type to allow client authorization [CLOSED] -188 Bridge Guards and other anti-enumeration defenses [OPEN] +188 Bridge Guards and other anti-enumeration defenses [ACCEPTED] 189 AUTHORIZE and AUTHORIZED cells [OPEN] 190 Bridge Client Authorization Based on a Shared Secret [NEEDS-REVISION] 191 Bridge Detection Resistance against MITM-capable Adversaries [OPEN] 192 Automatically retrieve and store information about bridges [OPEN] 193 Safe cookie authentication for Tor controllers [CLOSED] -194 Mnemonic .onion URLs [OPEN] +194 Mnemonic .onion URLs [SUPERSEDED] 195 TLS certificate normalization for Tor 0.2.4.x [DRAFT] -196 Extended ORPort and TransportControlPort [OPEN] -197 Message-based Inter-Controller IPC Channel [OPEN] +196 Extended ORPort and TransportControlPort [FINISHED] +197 Message-based Inter-Controller IPC Channel [REJECTED] 198 Restore semantics of TLS ClientHello [CLOSED] -199 Integration of BridgeFinder and BridgeFinderHelper [OPEN] +199 Integration of BridgeFinder and BridgeFinderHelper [OBSOLETE] 200 Adding new, extensible CREATE, EXTEND, and related cells [CLOSED] 201 Make bridges report statistics on daily v3 network status requests [OPEN] 202 Two improved relay encryption protocols for Tor cells [OPEN] @@ -139,17 +139,17 @@ Proposals by number: 216 Improved circuit-creation key exchange [CLOSED] 217 Tor Extended ORPort Authentication [FINISHED] 218 Controller events to better understand connection/circuit usage [CLOSED] -219 Support for full DNS and DNSSEC resolution in Tor [DRAFT] -220 Migrate server identity keys to Ed25519 [OPEN] +219 Support for full DNS and DNSSEC resolution in Tor [OPEN] +220 Migrate server identity keys to Ed25519 [ACCEPTED] 221 Stop using CREATE_FAST [CLOSED] 222 Stop sending client timestamps [CLOSED] -223 Ace: Improved circuit-creation key exchange [OPEN] +223 Ace: Improved circuit-creation key exchange [RESERVE] 224 Next-Generation Hidden Services in Tor [DRAFT] -225 Strawman proposal: commit-and-reveal shared rng [DRAFT] +225 Strawman proposal: commit-and-reveal shared rng [SUPERSEDED] 226 "Scalability and Stability Improvements to BridgeDB: Switching to a Distributed Database System and RDBMS" [OPEN] 227 Include package fingerprints in consensus documents [CLOSED] 228 Cross-certifying identity keys with onion keys [CLOSED] -229 Further SOCKS5 extensions [DRAFT] +229 Further SOCKS5 extensions [OPEN] 230 How to change RSA1024 relay identity keys [DRAFT] 231 Migrating authority RSA1024 identity keys [DRAFT] 232 Pluggable Transport through SOCKS proxy [FINISHED] @@ -158,13 +158,13 @@ Proposals by number: 235 Stop assigning (and eventually supporting) the Named flag [FINISHED] 236 The move to a single guard node [OPEN] 237 All relays are directory servers [OPEN] -238 Better hidden service stats from Tor relays [DRAFT] +238 Better hidden service stats from Tor relays [CLOSED] 239 Consensus Hash Chaining [DRAFT] 240 Early signing key revocation for directory authorities [DRAFT] 241 Resisting guard-turnover attacks [DRAFT] 242 Better performance and usability for the MyFamily option [OPEN] -243 Give out HSDir flag only to relays with Stable flag [OPEN] -244 Use RFC5705 Key Exporting in our AUTHENTICATE calls [DRAFT] +243 Give out HSDir flag only to relays with Stable flag [CLOSED] +244 Use RFC5705 Key Exporting in our AUTHENTICATE calls [ACCEPTED] 245 Deprecating and removing the TAP circuit extension protocol [DRAFT] 246 Merging Hidden Service Directories and Introduction Points [OPEN] 247 Defending Against Guard Discovery Attacks using Vanguards [DRAFT] @@ -179,21 +179,14 @@ Proposals by number: Proposals by status: DRAFT: - 175 Automatically promoting Tor clients to nodes - 182 Credit Bucket 195 TLS certificate normalization for Tor 0.2.4.x [for 0.2.4.x] 203 Avoiding censorship by impersonating an HTTPS server - 219 Support for full DNS and DNSSEC resolution in Tor [for 0.2.5.x] 224 Next-Generation Hidden Services in Tor - 225 Strawman proposal: commit-and-reveal shared rng - 229 Further SOCKS5 extensions 230 How to change RSA1024 relay identity keys [for 0.2.?] 231 Migrating authority RSA1024 identity keys [for 0.2.?] - 238 Better hidden service stats from Tor relays 239 Consensus Hash Chaining 240 Early signing key revocation for directory authorities 241 Resisting guard-turnover attacks - 244 Use RFC5705 Key Exporting in our AUTHENTICATE calls 245 Deprecating and removing the TAP circuit extension protocol 247 Defending Against Guard Discovery Attacks using Vanguards 248 Remove all RSA identity keys @@ -205,39 +198,35 @@ Proposals by status: NEEDS-REVISION: 190 Bridge Client Authorization Based on a Shared Secret OPEN: - 143 Improvements of Distributed Storage for Tor Hidden Service Descriptors 164 Reporting the status of server votes 165 Easy migration for voting authority sets 168 Reduce default circuit window 177 Abstaining from votes on individual flags [for 0.2.4.x] - 185 Directory caches without DirPort - 188 Bridge Guards and other anti-enumeration defenses + 182 Credit Bucket 189 AUTHORIZE and AUTHORIZED cells 191 Bridge Detection Resistance against MITM-capable Adversaries 192 Automatically retrieve and store information about bridges [for 0.2.[45].x] - 194 Mnemonic .onion URLs - 196 Extended ORPort and TransportControlPort [for 0.2.4.x] - 197 Message-based Inter-Controller IPC Channel [for 0.2.4.x] - 199 Integration of BridgeFinder and BridgeFinderHelper [for 0.2.4.x+] 201 Make bridges report statistics on daily v3 network status requests [for 0.2.4.x] 202 Two improved relay encryption protocols for Tor cells 209 Tuning the Parameters for the Path Bias Defense [for 0.2.4.x+] 210 Faster Headless Consensus Bootstrapping [for 0.2.4.x+] 212 Increase Acceptable Consensus Age [for 0.2.4.x+] - 220 Migrate server identity keys to Ed25519 [for 0.2.x.x] - 223 Ace: Improved circuit-creation key exchange + 219 Support for full DNS and DNSSEC resolution in Tor [for 0.2.5.x] 226 "Scalability and Stability Improvements to BridgeDB: Switching to a Distributed Database System and RDBMS" + 229 Further SOCKS5 extensions 233 Making Tor2Web mode faster 234 Adding remittance field to directory specification 236 The move to a single guard node 237 All relays are directory servers [for 0.2.7.x] 242 Better performance and usability for the MyFamily option - 243 Give out HSDir flag only to relays with Stable flag 246 Merging Hidden Service Directories and Introduction Points ACCEPTED: 140 Provide diffs between consensuses 172 GETINFO controller option for circuit information 173 GETINFO Option Expansion + 188 Bridge Guards and other anti-enumeration defenses + 220 Migrate server identity keys to Ed25519 [for 0.2.x.x] + 244 Use RFC5705 Key Exporting in our AUTHENTICATE calls META: 000 Index of Tor Proposals 001 The Tor Proposal Process @@ -251,6 +240,7 @@ Proposals by status: 160 Authorities vote for bandwidth offsets in consensus [for 0.2.1.x] 161 Computing Bandwidth Adjustments [for 0.2.1.x] 162 Publish the consensus in multiple flavors [in 0.2.3.1-alpha] + 196 Extended ORPort and TransportControlPort [for 0.2.4.x] 204 Subdomain support for Hidden Service addresses 217 Tor Extended ORPort Authentication [for 0.2.5.x] 232 Pluggable Transport through SOCKS proxy [in 0.2.6] @@ -313,11 +303,14 @@ Proposals by status: 222 Stop sending client timestamps [in 0.2.4.18] 227 Include package fingerprints in consensus documents [in 0.2.6.3-alpha] 228 Cross-certifying identity keys with onion keys + 238 Better hidden service stats from Tor relays + 243 Give out HSDir flag only to relays with Stable flag SUPERSEDED: 112 Bring Back Pathlen Coin Weight 113 Simplifying directory authority administration 118 Advertising multiple ORPorts at once 124 Blocking resistant TLS certificate usage + 143 Improvements of Distributed Storage for Tor Hidden Service Descriptors 145 Separate "suitable as a guard" from "suitable as a new guard" 146 Add new flag to reflect long-term stability 149 Using data from NETINFO cells @@ -327,6 +320,9 @@ Proposals by status: 163 Detecting whether a connection comes from a client 169 Eliminate TLS renegotiation for the Tor connection handshake 170 Configuration options regarding circuit building + 185 Directory caches without DirPort + 194 Mnemonic .onion URLs + 225 Strawman proposal: commit-and-reveal shared rng DEAD: 100 Tor Unreliable Datagram Extension Proposal 115 Two Hop Paths @@ -338,14 +334,18 @@ Proposals by status: REJECTED: 134 More robust consensus voting with diverse authority sets 147 Eliminate the need for v2 directories in generating v3 directories [for 0.2.4.x] + 175 Automatically promoting Tor clients to nodes + 197 Message-based Inter-Controller IPC Channel OBSOLETE: 127 Relaying dirport requests to Tor download site / website 131 Help users to verify they are using Tor 132 A Tor Web Service For Verifying Correct Browser Configuration 141 Download server descriptors on demand 144 Increase the diversity of circuits by detecting nodes belonging the same provider + 199 Integration of BridgeFinder and BridgeFinderHelper RESERVE: 133 Incorporate Unreachable ORs into the Tor Network 211 Internal Mapaddress for Tor Configuration Testing [for 0.2.4.x+] + 223 Ace: Improved circuit-creation key exchange INFORMATIONAL: 159 Exit Scanning diff --git a/proposals/143-distributed-storage-improvements.txt b/proposals/143-distributed-storage-improvements.txt index fcd0773..ce3f781 100644 --- a/proposals/143-distributed-storage-improvements.txt +++ b/proposals/143-distributed-storage-improvements.txt @@ -2,7 +2,7 @@ Filename: 143-distributed-storage-improvements.txt Title: Improvements of Distributed Storage for Tor Hidden Service Descriptors Author: Karsten Loesing Created: 28-Jun-2008 -Status: Open +Status: Superseded Change history: diff --git a/proposals/175-automatic-node-promotion.txt b/proposals/175-automatic-node-promotion.txt index f97cec0..d6d86a6 100644 --- a/proposals/175-automatic-node-promotion.txt +++ b/proposals/175-automatic-node-promotion.txt @@ -2,7 +2,7 @@ Filename: 175-automatic-node-promotion.txt Title: Automatically promoting Tor clients to nodes Author: Steven Murdoch Created: 12-Mar-2010 -Status: Draft +Status: Rejected 1. Overview diff --git a/proposals/182-creditbucket.txt b/proposals/182-creditbucket.txt index 8796bd1..e18949a 100644 --- a/proposals/182-creditbucket.txt +++ b/proposals/182-creditbucket.txt @@ -2,7 +2,7 @@ Filename: 182-creditbucket.txt Title: Credit Bucket Author: Florian Tschorsch and Björn Scheuermann Created: 22 Jun 2011 -Status: Draft +Status: Open Overview: diff --git a/proposals/185-dir-without-dirport.txt b/proposals/185-dir-without-dirport.txt index 7302e75..65cfd43 100644 --- a/proposals/185-dir-without-dirport.txt +++ b/proposals/185-dir-without-dirport.txt @@ -2,7 +2,8 @@ Filename: 185-dir-without-dirport.txt Title: Directory caches without DirPort Author: Nick Mathewson Created: 20-Sep-2011 -Status: Open +Status: Superseded +Superseded-by: 237 Overview: diff --git a/proposals/188-bridge-guards.txt b/proposals/188-bridge-guards.txt index c4d354f..4303937 100644 --- a/proposals/188-bridge-guards.txt +++ b/proposals/188-bridge-guards.txt @@ -3,7 +3,7 @@ Title: Bridge Guards and other anti-enumeration defenses Author: Nick Mathewson, Isis Lovecruft Created: 14 Oct 2011 Modified: 10 Sep 2015 -Status: Open +Status: Accepted 1. Overview diff --git a/proposals/194-mnemonic-urls.txt b/proposals/194-mnemonic-urls.txt index 7d66196..aeae092 100644 --- a/proposals/194-mnemonic-urls.txt +++ b/proposals/194-mnemonic-urls.txt @@ -2,7 +2,7 @@ Filename: 194-mnemonic-urls.txt Title: Mnemonic .onion URLs Author: Sai, Alex Fink Created: 29-Feb-2012 -Status: Open +Status: Superseded 1. Overview diff --git a/proposals/196-transport-control-ports.txt b/proposals/196-transport-control-ports.txt index 4bb8a40..c90ad8c 100644 --- a/proposals/196-transport-control-ports.txt +++ b/proposals/196-transport-control-ports.txt @@ -2,7 +2,7 @@ Filename: 196-transport-control-ports.txt Title: Extended ORPort and TransportControlPort Author: George Kadianakis, Nick Mathewson Created: 14 Mar 2012 -Status: Open +Status: Finished Target: 0.2.4.x 1. Overview diff --git a/proposals/219-expanded-dns.txt b/proposals/219-expanded-dns.txt index 76e7987..a521a9c 100644 --- a/proposals/219-expanded-dns.txt +++ b/proposals/219-expanded-dns.txt @@ -4,7 +4,7 @@ Authors: Ondrej Mikle Created: 4 February 2012 Modified: 2 August 2013 Target: 0.2.5.x -Status: Draft +Status: Open 0. Overview diff --git a/proposals/220-ecc-id-keys.txt b/proposals/220-ecc-id-keys.txt index 165f3cc..c41aa23 100644 --- a/proposals/220-ecc-id-keys.txt +++ b/proposals/220-ecc-id-keys.txt @@ -3,7 +3,7 @@ Title: Migrate server identity keys to Ed25519 Authors: Nick Mathewson Created: 12 August 2013 Target: 0.2.x.x -Status: Open +Status: Accepted [Note: This is a draft proposal; I've probably made some important mistakes, and there are parts that need more thinking. I'm diff --git a/proposals/223-ace-handshake.txt b/proposals/223-ace-handshake.txt index 7887725..5e333bb 100644 --- a/proposals/223-ace-handshake.txt +++ b/proposals/223-ace-handshake.txt @@ -2,7 +2,7 @@ Filename: 223-ace-handshake.txt Title: Ace: Improved circuit-creation key exchange Author: Esfandiar Mohammadi, Aniket Kate, Michael Backes Created: 22-July-2013 -Status: Open +Status: Reserve History: diff --git a/proposals/225-strawman-shared-rand.txt b/proposals/225-strawman-shared-rand.txt index 4062ef1..f124174 100644 --- a/proposals/225-strawman-shared-rand.txt +++ b/proposals/225-strawman-shared-rand.txt @@ -2,7 +2,8 @@ Filename: 225-strawman-shared-rand.txt Title: Strawman proposal: commit-and-reveal shared rng Author: Nick Mathewson Created: 2013-11-29 -Status: Draft +Status: Superseded +Superseded-by: 250 1. Introduction diff --git a/proposals/229-further-socks5-extensions.txt b/proposals/229-further-socks5-extensions.txt index 0574751..43666d0 100644 --- a/proposals/229-further-socks5-extensions.txt +++ b/proposals/229-further-socks5-extensions.txt @@ -2,7 +2,7 @@ Filename: 229-further-socks5-extensions.txt Title: Further SOCKS5 extensions Author: Yawning Angel Created: 25-Feb-2014 -Status: Draft +Status: Open 0. Abstract diff --git a/proposals/237-directory-servers-for-all.txt b/proposals/237-directory-servers-for-all.txt index 0ce9296..1ad05d1 100644 --- a/proposals/237-directory-servers-for-all.txt +++ b/proposals/237-directory-servers-for-all.txt @@ -4,6 +4,7 @@ Author: Matthew Finkel Created: 29-Jul-2014 Status: Open Target: 0.2.7.x +Supersedes: 185 Overview: diff --git a/proposals/238-hs-relay-stats.txt b/proposals/238-hs-relay-stats.txt index e113785..9134003 100644 --- a/proposals/238-hs-relay-stats.txt +++ b/proposals/238-hs-relay-stats.txt @@ -2,7 +2,7 @@ Filename: 238-hs-relay-stats.txt Title: Better hidden service stats from Tor relays Author: George Kadianakis, David Goulet, Karsten Loesing, Aaron Johnson Created: 2014-11-17 -Status: Draft +Status: Closed 0. Motivation diff --git a/proposals/243-hsdir-flag-need-stable.txt b/proposals/243-hsdir-flag-need-stable.txt index e1807d5..035550b 100644 --- a/proposals/243-hsdir-flag-need-stable.txt +++ b/proposals/243-hsdir-flag-need-stable.txt @@ -2,7 +2,8 @@ Filename: 243-hsdir-flag-need-stable.txt Title: Give out HSDir flag only to relays with Stable flag Author: George Kadianakis Created: 2015-03-23 -Status: Open +Status: Closed +Implemented-in: 0.2.7 1. Introduction diff --git a/proposals/244-use-rfc5705-for-tls-binding.txt b/proposals/244-use-rfc5705-for-tls-binding.txt index 66b8e09..d1a51fe 100644 --- a/proposals/244-use-rfc5705-for-tls-binding.txt +++ b/proposals/244-use-rfc5705-for-tls-binding.txt @@ -2,7 +2,7 @@ Filename: 244-use-rfc5705-for-tls-binding.txt Title: Use RFC5705 Key Exporting in our AUTHENTICATE calls Author: Nick Mathewson Created: 2015-05-14 -Status: Draft +Status: Accepted 1. Proposal diff --git a/proposals/proposal-status.txt b/proposals/proposal-status.txt index 29e8f3c..7a97d05 100644 --- a/proposals/proposal-status.txt +++ b/proposals/proposal-status.txt @@ -55,20 +55,6 @@ again to remind me! revised the paragraph. -133 Incorporate Unreachable ORs into the Tor Network [RESERVE] - - This proposal had an idea for letting ORs that can only make - outgoing connections still relay data usefully in the network. - It's something we should keep in mind, and it's a pretty neat - idea, but it radically changes the network topology. Anybody - who wants to analyze new network topologies should definitely - have a look. (5/2011) - - For this I have introduced a new proposal status, "RESERVE". A - proposal is "in reserve" if we're not currently planning to - implement it, but we might someday want to do so if we decide that - what it provides is a great idea. (9/2015) - 140 Provide diffs between consensuses [ACCEPTED] This proposal describes a way to transmit less directory @@ -77,28 +63,6 @@ again to remind me! GSoC project last summer; it is still under revision and on target for merge into 0.2.8. (See ticket #13339) (9/2015) -143 Improvements of Distributed Storage for Tor Hidden Service - Descriptors - - Here's a proposal from Karsten about making the hidden - service DHT more reliable and secure to use. It could use - more discussion and analysis. We should look into it as part - of efforts to improve designs for the next generation of - hidden services. - - One problem with the analysis here, though, is that it - assumes a fixed set of servers that doesn't change. One - reason that we upload to N servers at each chosen point in - the ring is that the hidden service host and the hidden - service client may have different views of which servers - exist. We need to re-do the analysis with some fraction of - recent consensuses. - - This is probably superseded by proposal 224; we should close it - IMO. (2/2014) - - Time to mark this as SUPERSEDED. (9/2015) - 156 Tracking blocked ports on the client side This proposal provides a way for clients to learn which ports @@ -126,7 +90,6 @@ again to remind me! This is likely also to be relevant for the ideas of proposal 241, and maybe superseded by some version of that proposal. (2/2015) ------ 164 Reporting the status of server votes This proposal explains a way for authorities to provide a @@ -138,8 +101,6 @@ again to remind me! implement, and would be a fine project for somebody who wants to get to know the directory code. (5/2011) - Mark as RESERVE. (9/2015) - 165 Easy migration for voting authority sets This is a design for how to change the set of authorities without @@ -161,28 +122,16 @@ again to remind me! Should update Tor-spec, should close this. (9/2015) -172 GETINFO controller option for circuit information -173 GETINFO Option Expansion + Actually, wait, did we ever implement this? Ugh. (9/2015) + +172 GETINFO controller option for circuit information [accepted] +173 GETINFO Option Expansion [accepted] These would help controllers (particularly arm) provide more useful information about a running Tor process. They're accepted and some parts of 173 are even implemented: somebody just needs to implement the rest. (5/2011) - Should mark as ACCEPTED; should open tickets for them; should - consider whether they're needed, though. (9/2015) - -175 Automatically promoting Tor clients to nodes - - Here's Steven's proposal for adding a mode between "client - mode" and "relay mode" for "self-test to see if you would be a - good relay, and if so become one." It didn't get enough - attention when it was posted to the list; more people should - review it. (5/2011) - - Mark as REJECTED. I don't see us doing this any time soon. - (9/2015) - 177 Abstaining from votes on individual flags Here's my proposal for letting authorities have opinions about some @@ -191,9 +140,6 @@ again to remind me! right. With more discussion and review, somebody could/should build it, I think. (11/2013) - Mark as RESERVE. I still love this idea, but nobody else seems - to think it's necessary (9/2015) - 182 Credit Bucket This proposal suggests an alternative approach to our current @@ -201,26 +147,11 @@ again to remind me! performance, less buffering insanity, and a possible end to double-gating issues. (6/2012) -185 Directory caches without DirPort - - The old HTTP directory port feature is no longer used by - clients and relays under most circumstances. The proposal - explains how we can get rid of the requirement that non-bridge - directories have an open directory port. (6/2012) - - Mark as ACCEPTED, after updating it to match in-progress work for - "everybody is a directory", which is ontrack for 0.2.8. Or maybe - that work is closer to 237? (9/2015) - 188 Bridge Guards and other anti-enumeration defenses This proposal suggests some ways to make it harder for a relay on the Tor network to enumerate a list of Tor bridges. Worth investigating and possibly implementing. (6/2012) - - Update and then mark as ACCEPTED; isis has code for this for 0.2.8. - (9/2015) - 189 AUTHORIZE and AUTHORIZED cells 190 Bridge Client Authorization Based on a Shared Secret [NEEDS-REVISION] 191 Bridge Detection Resistance against MITM-capable Adversaries @@ -232,7 +163,7 @@ again to remind me! Number 190 needs revision, since its protocol isn't actually so great. (11/2013) - Mark as RESERVE. (9/2015) + Mark as RESERVE? (9/2015) 192 Automatically retrieve and store information about bridges @@ -243,17 +174,6 @@ again to remind me! Mark as RESERVE? Do we still even want this? (9/2015) -194 Mnemonic .onion URLs - - Here's one of several competing "let's make .onion URLs - human-usable" proposals. This one makes sentences using a - fixed map. This kind of approach is likely to obsoleted if - we go ahead with current plans for hidden services that - would make .onion addresses much longer, though. (11/2013) - - We're not going to do this like this, I think. Mark as - SUPERSEDED. (9/2015) - 195 TLS certificate normalization for Tor 0.2.4.x Here's the followup to proposal 179, containing all the parts @@ -271,17 +191,7 @@ again to remind me! I think we should take a pass over this, pick the parts we still think are relevant, and call them ACCEPTED. (9/2015) -196 Extended ORPort and TransportControlPort - - Here are some remaining pieces of the pluggable transport - protocol that give Tor finer control over the behavior of - its transports. Much of this is implemented in 0.2.5 - now; we should figure out what's left, and whether we want - to build that. (11/2013) - - I think we should mark this FINISHED. We're not going to do more - than we have now, afaik. (9/2015) - +--- 201 Make bridges report statistics on daily v3 network status requests Here's a proposal for bridges to better estimate the number of @@ -322,16 +232,6 @@ again to remind me! This needs an update; it's a pretty good idea, and Mike and Roger like it. It goes will with FallbackDirSource stuff. (9/2015) -211 Internal Mapaddress for Tor Configuration Testing [RESERVE] - - Here, the idea is to serve an XML document over HTTP that - would let the know when it's using Tor. The XML document - would be returned when you make a request over Tor for a - magic address in 127.0.0.0/8. I think we need to do - _something_to solve this problem, but I'm not thrilled with - the idea of having any more magical addresses like this; we - got rid of .noconnect for a reason, after all. (9/2015) - 212 Increase Acceptable Consensus Age This proposal suggests that we increase the maximum age of a @@ -357,36 +257,6 @@ again to remind me! done with reasonable confidence, and figure out the client side once more servers have upgraded. (12/2013) - Mark as NEEDS-REVISION? (9/2015) - -220 Migrate server identity keys to Ed25519 - - This one is a design to migrate server identity keys to - Ed25519 for improved security margin. It needs more analysis of - long-term migration to other signing key types -- what do we do - if we want to add support for EdDSA over Curve3617 or something? - Can we make it easier than this? And it also needs analysis to - make sure it enables us to eventually drop RSA1024 keys - entirely. - - I've started building this in #12498, though, so we'd better figure - out out fairly soon. Other proposals, like 224, depend on this - one. (2/2015) - - Mark as ACCEPTED. Some is implemented in 0.2.7; the rest is - in-progress. (9/2015) - -223 Ace: Improved circuit-creation key exchange - - Here's an interesting one. It proposes a replacement for the - ntor handshake, using the multi-exponentiation optimization, to - run a bit faster at an equivalent security level. - - Assuming that more cryptographers like the security proof, and - that the ntor handshake winds up being critical-path in profiles - as more clients upgrade to 0.2.4 or 0.2.5, this is something we - should consider. (12/2013) - 224 Next-Generation Hidden Services in Tor This proposal outlines a more or less completely revised version @@ -400,22 +270,6 @@ again to remind me! of attention and improvements to get it done right. I hope to implement this over the course of 2015-2016. (2/2015) -225 Strawman proposal: commit-and-reveal shared rng - - Proposal 224's solutions for bug #8244 require that authorities - regularly agree upon a shared random value which none of them - could have influenced or predicted in advance. This proposal - outlines a simple one that isn't perfect (it's vulnerable to DOS - and to limited influence by one or more collaborating hostile - authorities), but it's quite simple, and it's meant to start - discussion. - - I hope that we never build this, but instead replace it with - something better. Some alternatives have already been discussed - on tor-dev; more work is needed, though. (12/2013) - - Mark as SUPERSEDED by proposal 250. (9/2015) - 226 Scalability and Stability Improvements to BridgeDB: Switching to a Distributed Database System and RDBMS @@ -424,16 +278,6 @@ again to remind me! I should find out if Isis has a status update for this. (9/2015) -228 Cross-certifying identity keys with onion keys - - This proposal signs each server's identity key with its onion - keys, to prove onion key ownership in the router descriptor. - It's not clear that this actually improves security, but it - fixes an annoying gap in our key authentication. I have it coded - up in my #12498 branch, targetting 0.2.7. (2/2015) - - Implemented; should mark as CLOSED. (9/2015) - 229 Further SOCKS5 extensions Here's a nice idea for how we can support a new SOCKS5 protocol @@ -507,17 +351,6 @@ again to remind me! Compare to proposal 185; it may supersede that one. Review again and mark as accepted maybe? (9/2015) -238 Better hidden service stats from Tor relays [DRAFT] - - Here's an important one that needs many eyes. George Kadianakis, - David Goulet, Karsten Loesing, and Aaron Johnson wrote this to - describe a mechanism for the tor network to securely produce - aggregate hidden service usage statistics without exposing - sensitive intermediate results. This has an implementation in - 0.2.6 and should probably be marked closed. (2/2015) - - Indeed, mark as closed. (9/2015) - 239 Consensus Hash Chaining [DRAFT] Here's the start of a good idea that Andrea Shepard wrote up (with @@ -552,17 +385,13 @@ again to remind me! right, might lead clients to kick themselves off the network out of paranoia. So, this proposal could use more analysis. (2/2015) - TAKE ANOTHER LOOK AT THESE: 242 Better performance and usability for the MyFamily option [OPEN] -243 Give out HSDir flag only to relays with Stable flag [OPEN] - (I think we impleented this one! Mark as FINISHED?) - -244 Use RFC5705 Key Exporting in our AUTHENTICATE calls [DRAFT] - - (Mark as ACCEPTED?) + Describes a mechanism for using a new ed25519 signature type to + reduce the complexity of adding nodes to a family and the size of + family lines. (9/2015) 245 Deprecating and removing the TAP circuit extension protocol [DRAFT] 246 Merging Hidden Service Directories and Introduction Points [OPEN] @@ -574,11 +403,3 @@ TAKE ANOTHER LOOK AT THESE: 252 Single Onion Services [DRAFT] 253 Out of Band Circuit HMACs [DRAFT] - -Since last time: - - Proposal 197 has been marked as rejected. - - Proposal 199 is now obsolete. - - Proposal 253 is new.

1 0

[stem/master] Normalizing CRLF line endings when reading descriptors on Windows
by atagar＠torproject.org 21 Sep '15

21 Sep '15

commit 3ba84bb3d296a431c9262c7b51c2960ece26d6d9 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 21 10:10:48 2015 -0700 Normalizing CRLF line endings when reading descriptors on Windows Nice catch from trodun. On Windows cached descriptor files use the platform's newlines. For Windows this means CRLF line endings. Providing an option to normalize these, and making it the default when reading a data directory on Windows. https://trac.torproject.org/projects/tor/ticket/17051 --- docs/change_log.rst | 1 + stem/descriptor/__init__.py | 34 ++++- ...ached-microdesc-consensus_with_carriage_returns | 140 ++++++++++++++++++++ test/unit/descriptor/reader.py | 2 +- test/unit/descriptor/router_status_entry.py | 19 +++ 5 files changed, 194 insertions(+), 2 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 273dc26..b36e143 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -57,6 +57,7 @@ The following are only available within Stem's `git repository * Server descriptor validation fails with 'extra-info-digest line had an invalid value' from additions in proposal 228 (:trac:`16227`) * :class:`~stem.descriptor.server_descriptor.BridgeDescriptor` now has 'ntor_onion_key' like its unsanitized counterparts * Replaced the :class:`~stem.descriptor.microdescriptor.Microdescriptor` identifier and identifier_type attributes with an identifiers hash since it can now appear multiple times (:spec:`09ff9e2`) + * Unable to read descriptors from data directories on Windows due to their CRLF newlines (:trac:`17051`) * TypeError under python3 when using 'use_mirrors = True' (:trac:`17083`) * **Website** diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 719ee84..f829239 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -85,7 +85,7 @@ DocumentHandler = stem.util.enum.UppercaseEnum( ) -def parse_file(descriptor_file, descriptor_type = None, validate = False, document_handler = DocumentHandler.ENTRIES, **kwargs): +def parse_file(descriptor_file, descriptor_type = None, validate = False, document_handler = DocumentHandler.ENTRIES, normalize_newlines = False, **kwargs): """ Simple function to read the descriptor contents from a file, providing an iterator for its :class:`~stem.descriptor.__init__.Descriptor` contents. @@ -143,6 +143,8 @@ def parse_file(descriptor_file, descriptor_type = None, validate = False, docume **True**, skips these checks otherwise :param stem.descriptor.__init__.DocumentHandler document_handler: method in which to parse the :class:`~stem.descriptor.networkstatus.NetworkStatusDocument` + :param bool normalize_newlines: converts windows newlines (CRLF), this is the + default when reading data directories on windows :param dict kwargs: additional arguments for the descriptor constructor :returns: iterator for :class:`~stem.descriptor.__init__.Descriptor` instances in the file @@ -204,6 +206,8 @@ def parse_file(descriptor_file, descriptor_type = None, validate = False, docume else: # Cached descriptor handling. These contain multiple descriptors per file. + normalize_newlines |= stem.util.system.is_windows() + if filename == 'cached-descriptors' or filename == 'cached-descriptors.new': file_parser = lambda f: stem.descriptor.server_descriptor._parse_file(f, validate = validate, **kwargs) elif filename == 'cached-extrainfo' or filename == 'cached-extrainfo.new': @@ -215,6 +219,9 @@ def parse_file(descriptor_file, descriptor_type = None, validate = False, docume elif filename == 'cached-microdesc-consensus': file_parser = lambda f: stem.descriptor.networkstatus._parse_file(f, is_microdescriptor = True, validate = validate, document_handler = document_handler, **kwargs) + if normalize_newlines: + descriptor_file = NewlineNormalizer(descriptor_file) + if file_parser: for desc in file_parser(descriptor_file): if descriptor_path is not None: @@ -623,6 +630,31 @@ class Descriptor(object): return self._raw_contents +class NewlineNormalizer(object): + """ + File wrapper that normalizes CRLF line endings. + """ + + def __init__(self, wrapped_file): + self._wrapped_file = wrapped_file + self.name = getattr(wrapped_file, 'name', None) + + def read(self, *args): + return self._wrapped_file.read(*args).replace('\r\n', '\n') + + def readline(self, *args): + return self._wrapped_file.readline(*args).replace('\r\n', '\n') + + def readlines(self, *args): + return [line.rstrip('\r') for line in self._wrapped_file.readlines(*args)] + + def seek(self, *args): + return self._wrapped_file.seek(*args) + + def tell(self, *args): + return self._wrapped_file.tell(*args) + + def _read_until_keywords(keywords, descriptor_file, inclusive = False, ignore_first = False, skip = False, end_position = None, include_ending_keyword = False): """ Reads from the descriptor file until we get to one of the given keywords or reach the diff --git a/test/unit/descriptor/data/cached-microdesc-consensus_with_carriage_returns b/test/unit/descriptor/data/cached-microdesc-consensus_with_carriage_returns new file mode 100644 index 0000000..7fd7d3f --- /dev/null +++ b/test/unit/descriptor/data/cached-microdesc-consensus_with_carriage_returns @@ -0,0 +1,140 @@ +network-status-version 3 microdesc +vote-status consensus +consensus-method 20 +valid-after 2015-09-15 18:00:00 +fresh-until 2015-09-15 19:00:00 +valid-until 2015-09-15 21:00:00 +voting-delay 300 300 +client-versions 0.2.4.23,0.2.4.24,0.2.4.25,0.2.4.26,0.2.4.27,0.2.5.8-rc,0.2.5.9-rc,0.2.5.10,0.2.5.11,0.2.5.12,0.2.6.5-rc,0.2.6.6,0.2.6.7,0.2.6.8,0.2.6.9,0.2.6.10,0.2.7.1-alpha,0.2.7.2-alpha +server-versions 0.2.4.23,0.2.4.24,0.2.4.25,0.2.4.26,0.2.4.27,0.2.5.8-rc,0.2.5.9-rc,0.2.5.10,0.2.5.11,0.2.5.12,0.2.6.5-rc,0.2.6.6,0.2.6.7,0.2.6.8,0.2.6.9,0.2.6.10,0.2.7.1-alpha,0.2.7.2-alpha +known-flags Authority BadExit Exit Fast Guard HSDir Running Stable V2Dir Valid +params CircuitPriorityHalflifeMsec=30000 NumDirectoryGuards=3 NumEntryGuards=1 NumNTorsPerTAP=100 Support022HiddenServices=0 UseNTorHandshake=1 UseOptimisticData=1 bwauthpid=1 cbttestfreq=1000 pb_disablepct=0 usecreatefast=0 +dir-source tor26 14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 86.59.21.38 86.59.21.38 80 443 +contact Peter Palfrader +vote-digest 7DD2661BBBA3E600CB9D641CFFF27D14D77EDCCE +dir-source longclaw 23D15D965BC35114467363C165C4F724B64B4F66 longclaw.riseup.net 199.254.238.52 80 443 +contact Riseup Networks <collective at riseup dot net> - 1nNzekuHGGzBYRzyjfjFEfeisNvxkn4RT +vote-digest 2EBB0C5EFEFE51ECE8C630A45F607201491D7E09 +dir-source maatuska 49015F787433103580E3B66A1707A00E60F2D15B 171.25.193.9 171.25.193.9 443 80 +contact 4096R/23291265 Linus Nordberg <linus(a)nordberg.se> +vote-digest 7FC1487C8D7C810C6FA8037AE6EC81ACECC408B8 +dir-source dannenberg 585769C78764D58426B8B52B6651A5A71137189A dannenberg.torauth.de 193.23.244.244 80 443 +contact Andreas Lehner <ops(a)torauth.de> +vote-digest 32F82FE133ADAAED686A7360297C56B327994799 +dir-source urras 80550987E1D626E3EBA5E5E75A458DE0626D088C 208.83.223.34 208.83.223.34 443 80 +contact 4096R/D255D3F5C868227F Jacob Appelbaum <jacob(a)appelbaum.net> +vote-digest 86348CCEC68457D5C1777978D1043B211FA44010 +dir-source moria1 D586D18309DED4CD6D57C18FDB97EFA96D330566 128.31.0.34 128.31.0.34 9131 9101 +contact 1024D/28988BF5 arma mit edu +vote-digest 9D18B15C2C039CB0B18B51496F8ACBDA2836DE19 +dir-source dizum E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 194.109.206.212 194.109.206.212 80 443 +contact 1024R/8D56913D Alex de Joode <adejoode(a)sabotage.org> +vote-digest 5473986DC071B8840F9E8C72AED3251B71A8244F +dir-source gabelmoo ED03BB616EB2F60BEC80151114BB25CEF515B226 131.188.40.189 131.188.40.189 80 443 +contact 4096R/261C5FBE77285F88FB0C343266C8C2D7C5AA446D Sebastian Hahn <tor(a)sebastianhahn.net> - 12NbRAjAG5U3LLWETSF7fSTcdaz32Mu5CN +vote-digest 6EF25161284DB1AD19411EBF52E96927DFD66F0C +dir-source Faravahar EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 154.35.175.225 154.35.175.225 80 443 +contact 0x0B47D56D Sina Rabbani (inf0) <sina redteam net> +vote-digest 76466BEF6525FCEE0B9FDDB205B527CBB89FAB17 +r PDrelay1 AAFJ5u9xAqrKlpDW6N0pMhJLlKs 2015-09-15 04:53:47 95.215.44.189 8080 0 +m iH2s4cVPTmThmmx1phnjDd6oGpHAEP7FDK38AFYRV74 +s Fast Running Stable Valid +v Tor 0.2.7.2-alpha-dev +w Bandwidth=456 +r seele AAoQ1DAR6kkoo19hBAX5K0QztNw 2015-09-15 04:43:45 73.15.150.172 9001 0 +m LqTE9J4jxtMVm2IPDxmUKYyrzajcjqwYqLkX6JNOEpY +s Fast Running Stable Valid +v Tor 0.2.6.10 +w Bandwidth=15 +r TorNinurtaName AA8YrCza5McQugiY3J4h5y4BF9g 2015-09-15 17:06:16 151.236.6.198 443 80 +m YxghdOEPO/uPv0N1GZV+6gCuYR5NZPaDseU45R/Yyns +s Fast HSDir Running Stable V2Dir Valid +v Tor 0.2.6.10 +w Bandwidth=1750 +r CalyxInstitute14 ABG9JIWtRdmE7EFZyI/AZuXjMA4 2015-09-15 16:12:03 162.247.72.201 443 80 +m 6PnpSoAVS1oaJCqs4uk8y706JSZ6rdN8uUM78Oohgo0 +s Exit Fast Guard HSDir Running Stable V2Dir Valid +v Tor 0.2.6.10 +w Bandwidth=11400 +directory-footer +bandwidth-weights Wbd=0 Wbe=0 Wbg=3944 Wbm=10000 Wdb=10000 Web=10000 Wed=10000 Wee=10000 Weg=10000 Wem=10000 Wgb=10000 Wgd=0 Wgg=6056 Wgm=6056 Wmb=10000 Wmd=0 Wme=0 Wmg=3944 Wmm=10000 +directory-signature sha256 14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 0B49FD2F55D02B630E7A500E34FD5B6F98FDA9D2 +-----BEGIN SIGNATURE----- +OYThM95E2Pcj4RWZeND9+llOUlyHLwGtHqF+n92xKTsZdc7ogigEosdqVEB1GaeJ +D/GWSESN9VLEiiw5VKBG4UVvZUaFVRUnZSJVS4gNgckH5LD0VUJb0C/tIeBHJ7ea +cTOwsb0vHau/W8hkAciEWLfjmAtcWutdT6lljSJ65NWyZynDPHTmtKnsB65kKT+2 +p5W9GBxnMUH+Pnt2JkFqyKAsE8GgppMuk4O+AX+BtQgzK4K+pTcKFko6e/NmrBh3 +W6AV/fR9/PdSUNYb6+uH/LsUhVePFVbke44u6bBN39LkvxWErQdd3yA91lUdqwz8 +zR/uAngvj05Bt1zmH9eG1Kd02dgL4PqNmTI0VKZjWamf4k/xMmecU0xfrHLv52Rw +/hync6FsEIrfI+B942sjIEGfv+T6UuIMNoMvkwrby6nw6WL7lAoJJq5pyBYLzlFj +xLW6e567FFjqf4siHpGCzWCHoXUU+NmygDSakh0orgGoHdVW6JcKbs0QieUyUu+X +-----END SIGNATURE----- +directory-signature sha256 23D15D965BC35114467363C165C4F724B64B4F66 3C12B8EE0B3DC3AEDD8CD27CCB02C564281BE765 +-----BEGIN SIGNATURE----- +doESbeqw4jQagxP8o0Yr6VVUdB2Hnmct4F5sH1pBntPYOqIeT3GbYuFT1TdYr9SG +xSpI5+aRcbSQrKryvF+qSgOJS4131YuCmL7zlwhQrQcFtltyRS8UTopubrLbvAJ1 +njJt05lM8NWg6NN3uZ4Zy4L/qzn9qZB9l8WbxKZJnxott6+Rp1H19tsl77ENB4GJ +Bfhc9C46LOKUfmV5IB0f+0nFOO3PDhbRFEcDw5EEGPx6xLk+EH9YHvP98VIY/YPi +vtYN9G5G2PplvqG4hyIhGAYy/hm3ZTHf9eIsKvsBgHadBeFCupA/l6tf36nK94Ts +d68QhqPo8QhrjM5FTddGOA== +-----END SIGNATURE----- +directory-signature sha256 49015F787433103580E3B66A1707A00E60F2D15B 2467B90267EEEDDD614694F16A523B0E6EBF6FAA +-----BEGIN SIGNATURE----- +NVXfCo512TGvfHr+9XB7nVTDMRurSlwrz/vHfXjSzmJ/6dbIK6PA98lBgvX3i83N +2AZoUcIc5wasYjUleRrP4k2jn5sBArCr3g64FsZ4/RJMLg2pWxEw4xDY2DLjKpyZ +BfndyOG5KSEtIszXw0szS0kkTyz7oI76L1vu016Mh35YjaeqK0Vu+P2gxJtKxNyt +pLPZwTWVQfjqLAebtXD2Bi5Csty7TSAhsNe9KE5pUB7+DyzvbamuJzyhUFbuOgii +Y1nguoknHVgHnrlVGNaF1T3x2QFb3SR5Q4v8p2u1j0zqktkYTZ693gHYzkjWuyGk +W/MyhtG1cE7knxu/no+HBw== +-----END SIGNATURE----- +directory-signature sha256 585769C78764D58426B8B52B6651A5A71137189A 02958C9BE542EEA43130E54FE6634B6E874B196D +-----BEGIN SIGNATURE----- +XAZPIaIQSTj+8QWZm5dAtiQz2CnEeuM7WMcJikol7CL53n1ewG6k6vYgtFPCJ5uh +EDGTM4eojUB0VXNpc+jeOv207Y5z2r6tjAknr1eMxPX65z2BT4WkeBZLnc68RRrM +LUAe2IbOVeaqTnQmPAtSejO8xxIkJhfZAssrxdLtvagCpkcBYwAbHiVtYWv/G+r0 +pyqVzvxIaEoEFShe77bJqfjOnlLOgcTsxdmU3qcDad/5k8ewXfLVcqR8YsjoNF9D +9xbHyqkBZs0EfcNoDhqWsbuq184zMjlSH0Q3QElK/0ZoQQ1y6vlSicKM9rl8vxmf +hRx2hnKyx+yhBT4fpL22ew== +-----END SIGNATURE----- +directory-signature sha256 80550987E1D626E3EBA5E5E75A458DE0626D088C 7C5D0700D9C266B7D3F93E7C904A62FEC6B30A60 +-----BEGIN SIGNATURE----- +WwrdpjcjuzxmV+E1ULuuFo98nMiN0iMw6MLAs7+kuOdjbW+ayKzizZvnDPjlMv1p +2cJM7qAwnD6aSxzn1wpc0ecdaVae1cMYqEnP3BxFFY9Xh4dxu8JdlNhB7W3rlIva +lptekvZQnRBb2J4ULws4455AP6oNTCO9x3UpGNd5tbc= +-----END SIGNATURE----- +directory-signature sha256 D586D18309DED4CD6D57C18FDB97EFA96D330566 F1E67374A96F51A0BB4C8C24748200885EFF8645 +-----BEGIN SIGNATURE----- +fgn1RZSa2xtYrOiG9YUtQdPl9RMZ8YQsxImg7D53AoXrctC8Ul48CNnIz/JWdIts +qcczwUtSSixuEDD5gqBcFn0Fi7S1E2F8VcmCUAh7AMBtVSn5vUKkmaQcSy+zG0N+ +ospb0wQYbJ2DcsVTqL9z4TLpNB09BLN0kOzS64MJAqH9thE/1GHGNeXRFHupYgTO +PERdyFvFEAmS9XnSxSRitgf6ptG5sAlFbzQrueKmnlrVe51gJBTEZNgVb1wFTjEw +7nHTvTz9c0AQfgW5if1nIh2RdQ9AeOo3FxCbFMeT53QzHiEZWSDsCZebE/EHf/lz +od6P497tWLK6TIxctbWAXw== +-----END SIGNATURE----- +directory-signature sha256 E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 292252D59020B903943C025D96134575E1245ADF +-----BEGIN SIGNATURE----- +LzZynAMcx4EWSAqaXRaL2iHCET9T+T8e15kDiPyefxTc5U00Ko6ASKJPpmaHHHAI +SsYQm54TauFX7AOb7Q+9Fx8ujxA0AR85DglLXftAicM27L48E4d9E3qFtzi+0ZHs +At0Wp9odW7ZeFcBNHWFGB/KfqOwHYkukRvqR3vBlKG8nvQ7cC+9o9aXhl4CLoA8X +ViigiEINXCC1BFibg/XA/XZqDB7uxoeazririKp0qZTTZPp8sLSQBnrSvA3OL1I5 +c0m4xogooiG+YhGBC7N+MR+hDA9nyV+njVABpy/89/6Zy+y4iydqqO0qSRWXio9W +3T36ECUvEQ9l+FONnfk0cQ== +-----END SIGNATURE----- +directory-signature sha256 ED03BB616EB2F60BEC80151114BB25CEF515B226 5E04DFE1E5E0852F56E524B7C81D1E5FAFDBA650 +-----BEGIN SIGNATURE----- +UtcSi7Qb7CijqBhpMsFeqlhRxMTOGqldmdiDCp8ZLJFOCQGIHA9m9c62mlTIleDH +iz/LdCn7RdGm7VoX7+jd3FfU86dajnyREDcwvvTHZ8eIUx6Bz+Q7zmv6yRBctmNL +hqYcK0WHxmELYxwICljLPeu6QOaRE+4Ku1YbNoEFL/YJ4GmgAPODxxy35N+t3uRr +MzWK7N+Ssdo0cRvz47cMBZqRQOKzn3a5/KMnRcBmZbhmJbhi5O9C3tZVA+XFa3fF +jRGbtUir/OE23WmykdXKGmsymXX3b/io+w6UQjBUVzGHQtJLszMTKNE24eUnVOFD +9Yc8aj5LgGkmJbNxyiF0mQ== +-----END SIGNATURE----- +directory-signature sha256 EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 F22B7C6FB4E6DA30A3C63D265A1D4AB374CB34E3 +-----BEGIN SIGNATURE----- +uh/7AVwA+T8EWm9GgQxYzPPBibvb2/FP5Ny6p9x95oJRWjWeKEM77hnojJ540N6u +IyyIJTUB5JgUrsN2BXEnyUqZu0+OWB9hYxFIzVjwUxtuL2uaPeBfXqv5iJNEqG9w +Gl1ubnFUbVZXM83e61ClgwaswhvVPzfgirqpmD+L9m/DaZj+EmzZtoquqaBNtv1g +qU/yZgFG4AFApjvSaP6kkttZ8EYTVtGMq6muIxLeBDlVRP2dmC+R5FwGmsbj92is +uxaCO4raz5BM6yyDS44vzJwFePOyQhiYNV52g8dod/xtrhZOlWQtCbX3jXxv4ofV +nfX9MJA9VJ5WbLSpwU1p/w== +-----END SIGNATURE----- diff --git a/test/unit/descriptor/reader.py b/test/unit/descriptor/reader.py index eaea7ea..8f617f9 100644 --- a/test/unit/descriptor/reader.py +++ b/test/unit/descriptor/reader.py @@ -466,7 +466,7 @@ class TestDescriptorReader(unittest.TestCase): reader = stem.descriptor.reader.DescriptorReader(DESCRIPTOR_TEST_DATA) reader.register_skip_listener(skip_listener.listener) - expected_skip_files = ('riddle', 'tiny.png', 'vote', 'new_metrics_type') + expected_skip_files = ('riddle', 'tiny.png', 'vote', 'new_metrics_type', 'cached-microdesc-consensus_with_carriage_returns') with reader: list(reader) # iterates over all of the descriptors diff --git a/test/unit/descriptor/router_status_entry.py b/test/unit/descriptor/router_status_entry.py index 774a3e4..73cda28 100644 --- a/test/unit/descriptor/router_status_entry.py +++ b/test/unit/descriptor/router_status_entry.py @@ -5,11 +5,15 @@ Unit tests for stem.descriptor.router_status_entry. import datetime import unittest +import stem.descriptor + from stem import Flag from stem.descriptor.router_status_entry import RouterStatusEntryV3, _base64_to_hex from stem.exit_policy import MicroExitPolicy from stem.version import Version +from test.unit.descriptor import get_resource + from test.mocking import ( get_router_status_entry_v2, get_router_status_entry_v3, @@ -613,6 +617,21 @@ class TestRouterStatusEntry(unittest.TestCase): content = get_router_status_entry_v3({'m': m_line}, content = True) self.assertRaises(ValueError, RouterStatusEntryV3, content, True, vote_document()) + def test_with_carriage_returns(self): + """ + Read a descriptor file with windows newlines (CRLF). + """ + + descriptor_path = get_resource('cached-microdesc-consensus_with_carriage_returns') + + with open(descriptor_path, 'rb') as descriptor_file: + descriptors = stem.descriptor.parse_file(descriptor_file, 'network-status-microdesc-consensus-3 1.0', normalize_newlines = True) + + # if we didn't strip \r then it would be part of the last flag + + router = next(descriptors) + self.assertEqual([Flag.FAST, Flag.RUNNING, Flag.STABLE, Flag.VALID], router.flags) + def _expect_invalid_attr(self, content, attr = None, expected_value = None): """ Asserts that construction will fail due to content having a malformed

1 0

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

21 Sep '15

commit 5d90915b3e2f5da19dce17dd744ed8e006f825d3 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 21 15:15:44 2015 +0000 Update translations for tails-misc_completed --- de.po | 30 +++++++++++++++--------------- es.po | 26 +++++++++++++------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/de.po b/de.po index f328c45..0461ee1 100644 --- a/de.po +++ b/de.po @@ -8,7 +8,7 @@ # trantor <clucko3(a)gmail.com>, 2014 # DoKnGH26" 21 <dokngh2621(a)gmail.com>, 2015 # D P, 2015 -# Ettore Atalan <atalanttore(a)googlemail.com>, 2014 +# Ettore Atalan <atalanttore(a)googlemail.com>, 2014-2015 # gerhard <listmember(a)rinnberger.de>, 2013 # Larson März <lmaerz(a)emailn.de>, 2013 # Mario Baier <mario.baier26(a)gmx.de>, 2013 @@ -24,9 +24,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-28 01:49+0200\n" -"PO-Revision-Date: 2015-09-02 20:51+0000\n" -"Last-Translator: try once <lh-account-a(a)use.startmail.com>\n" +"POT-Creation-Date: 2015-09-20 19:32+0200\n" +"PO-Revision-Date: 2015-09-21 15:11+0000\n" +"Last-Translator: Ettore Atalan <atalanttore(a)googlemail.com>\n" "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -322,23 +322,23 @@ msgstr "Es scheint so, als wären Sie vom Netzwerk blockiert. Das könnte an der msgid "This version of Tails has known security issues:" msgstr "Diese Tails-Version weist Sicherheitslücken auf:" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:37 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:45 #, sh-format msgid "Network card ${nic} disabled" msgstr "Netzwerkkarte ${nic} deaktiviert" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:38 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:46 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}) so it is temporarily disabled.\n" "You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." msgstr "Bei folgender Netzwerkkarte schlug die MAC-Manipulation fehl: ${nic_name} (${nic}). Deshalb ist es jetzt temporär deaktiviert.\nSie sollten eventuell MAC-Manipulation deaktivieren und Tails neu starten. Bitte die <a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.de.html'>Dokumentation</a> ansehen." -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:47 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:55 msgid "All networking disabled" msgstr "Alle Netzwerke deaktiviert" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:48 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:56 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n" @@ -484,8 +484,8 @@ msgid "I2P's router console is ready" msgstr "I2P-Routerkonsole ist bereit" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:44 -msgid "You can now access I2P's router console on http://127.0.0.1:7657." -msgstr "Sie können nun hier auf die I2P-Routerkonsole zugreifen: http://127.0.0.1:7657." +msgid "You can now access I2P's router console in the I2P Browser." +msgstr "Sie können nun auf die I2P-Routerkonsole im I2P-Browser zugreifen." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:49 msgid "I2P is not ready" @@ -493,10 +493,10 @@ msgstr "I2P ist nicht bereit" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:50 msgid "" -"Eepsite tunnel not built within six minutes. Check the router console at " -"http://127.0.0.1:7657/logs or the logs in /var/log/i2p for more information." -" Reconnect to the network to try again." -msgstr "Der Eepsite-Tunnel wurde nicht innerhalb von sechs Minuten gebaut. Überprüfen Sie die Routerkonsole auf http://127.0.0.1:7657/logs oder die Protokolle in /var/log/i2p für mehr Informationen. Verbinden Sie sich wieder mit dem Netzwerk, um es erneut zu versuchen." +"Eepsite tunnel not built within six minutes. Check the router console in the" +" I2P Browser or the logs in /var/log/i2p for more information. Reconnect to " +"the network to try again." +msgstr "Der Eepsite-Tunnel wurde nicht innerhalb von sechs Minuten gebaut. Überprüfen Sie die Routerkonsole im I2P-Browser oder die Protokolle in /var/log/i2p für mehr Informationen. Verbinden Sie sich wieder mit dem Netzwerk, um es erneut zu versuchen." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 msgid "I2P is ready" @@ -525,7 +525,7 @@ msgstr "Anonymer überlagernder Netzwerknavigator" #: ../config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in.h:2 msgid "I2P Browser" -msgstr "I2P-Webbrowser" +msgstr "I2P-Browser" #: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:2 msgid "Learn more about Tails" diff --git a/es.po b/es.po index 01b7f68..861ae91 100644 --- a/es.po +++ b/es.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-10 18:53+0200\n" -"PO-Revision-Date: 2015-08-20 09:41+0000\n" -"Last-Translator: Emma Peel\n" +"POT-Creation-Date: 2015-09-20 19:32+0200\n" +"PO-Revision-Date: 2015-09-21 15:10+0000\n" +"Last-Translator: strel\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -311,23 +311,23 @@ msgstr "Parece como si estuviera bloqueado desde la red. Esto puede estar relaci msgid "This version of Tails has known security issues:" msgstr "Esta versión de Tails tiene problemas de seguridad conocidos:" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:37 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:45 #, sh-format msgid "Network card ${nic} disabled" msgstr "Tarjeta de red ${nic} deshabilitada" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:38 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:46 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}) so it is temporarily disabled.\n" "You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." msgstr "La simulación de la MAC falló para la tarjeta de red ${nic_name} (${nic}) así que será deshabilitada temporalmente.\nPuede que prefiera reiniciar Tails y deshabilitar la simulación de la MAC. Vea la <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.es.html'>documentación</a>." -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:47 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:55 msgid "All networking disabled" msgstr "Se deshabilitaron todas las redes" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:48 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:56 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n" @@ -473,8 +473,8 @@ msgid "I2P's router console is ready" msgstr "La consola de router I2P esta listo" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:44 -msgid "You can now access I2P's router console on http://127.0.0.1:7657." -msgstr "Ahora puedes acceder la consola de router I2P en http://127.0.0.1:7657." +msgid "You can now access I2P's router console in the I2P Browser." +msgstr "Ahora puede acceder a la consola del router I2P en el Navegador I2P." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:49 msgid "I2P is not ready" @@ -482,10 +482,10 @@ msgstr "I2P no esta listo" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:50 msgid "" -"Eepsite tunnel not built within six minutes. Check the router console at " -"http://127.0.0.1:7657/logs or the logs in /var/log/i2p for more information." -" Reconnect to the network to try again." -msgstr "Tunel Eepsite no creado en los últimos 6 meses. Revisar la consola de router en http://127.0.0.1:7657/logs o los registros en /var/logs/i2p para mayor información. Reconectar a la red para intentar nuevamente." +"Eepsite tunnel not built within six minutes. Check the router console in the" +" I2P Browser or the logs in /var/log/i2p for more information. Reconnect to " +"the network to try again." +msgstr "El túnel del eepsite (sitio web en I2P) no se estableció en seis minutos. Revise la consola del router I2P en el Navegador I2P o los registros en /var/log/i2p para más información. Reconecte a la red para intentarlo de nuevo." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 msgid "I2P is ready"

1 0

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

21 Sep '15

commit 93af096050ddc2fc00a62b4a4943472a016c87c0 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 21 15:15:40 2015 +0000 Update translations for tails-misc --- de.po | 12 ++++++------ es.po | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/de.po b/de.po index b21e46e..0461ee1 100644 --- a/de.po +++ b/de.po @@ -8,7 +8,7 @@ # trantor <clucko3(a)gmail.com>, 2014 # DoKnGH26" 21 <dokngh2621(a)gmail.com>, 2015 # D P, 2015 -# Ettore Atalan <atalanttore(a)googlemail.com>, 2014 +# Ettore Atalan <atalanttore(a)googlemail.com>, 2014-2015 # gerhard <listmember(a)rinnberger.de>, 2013 # Larson März <lmaerz(a)emailn.de>, 2013 # Mario Baier <mario.baier26(a)gmx.de>, 2013 @@ -25,8 +25,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-20 19:32+0200\n" -"PO-Revision-Date: 2015-09-21 09:20+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2015-09-21 15:11+0000\n" +"Last-Translator: Ettore Atalan <atalanttore(a)googlemail.com>\n" "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -485,7 +485,7 @@ msgstr "I2P-Routerkonsole ist bereit" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:44 msgid "You can now access I2P's router console in the I2P Browser." -msgstr "" +msgstr "Sie können nun auf die I2P-Routerkonsole im I2P-Browser zugreifen." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:49 msgid "I2P is not ready" @@ -496,7 +496,7 @@ msgid "" "Eepsite tunnel not built within six minutes. Check the router console in the" " I2P Browser or the logs in /var/log/i2p for more information. Reconnect to " "the network to try again." -msgstr "" +msgstr "Der Eepsite-Tunnel wurde nicht innerhalb von sechs Minuten gebaut. Überprüfen Sie die Routerkonsole im I2P-Browser oder die Protokolle in /var/log/i2p für mehr Informationen. Verbinden Sie sich wieder mit dem Netzwerk, um es erneut zu versuchen." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 msgid "I2P is ready" @@ -525,7 +525,7 @@ msgstr "Anonymer überlagernder Netzwerknavigator" #: ../config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in.h:2 msgid "I2P Browser" -msgstr "I2P-Webbrowser" +msgstr "I2P-Browser" #: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:2 msgid "Learn more about Tails" diff --git a/es.po b/es.po index 8af8086..861ae91 100644 --- a/es.po +++ b/es.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-20 19:32+0200\n" -"PO-Revision-Date: 2015-09-21 14:00+0000\n" +"PO-Revision-Date: 2015-09-21 15:10+0000\n" "Last-Translator: strel\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -485,7 +485,7 @@ msgid "" "Eepsite tunnel not built within six minutes. Check the router console in the" " I2P Browser or the logs in /var/log/i2p for more information. Reconnect to " "the network to try again." -msgstr "" +msgstr "El túnel del eepsite (sitio web en I2P) no se estableció en seis minutos. Revise la consola del router I2P en el Navegador I2P o los registros en /var/log/i2p para más información. Reconecte a la red para intentarlo de nuevo." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 msgid "I2P is ready"

1 0

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

21 Sep '15

commit c199765531517f0a606a9a1cbebe100c8467bcff Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 21 14:15:41 2015 +0000 Update translations for tails-misc --- es.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/es.po b/es.po index 743df54..8af8086 100644 --- a/es.po +++ b/es.po @@ -14,8 +14,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-20 19:32+0200\n" -"PO-Revision-Date: 2015-09-21 09:20+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2015-09-21 14:00+0000\n" +"Last-Translator: strel\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -474,7 +474,7 @@ msgstr "La consola de router I2P esta listo" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:44 msgid "You can now access I2P's router console in the I2P Browser." -msgstr "" +msgstr "Ahora puede acceder a la consola del router I2P en el Navegador I2P." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:49 msgid "I2P is not ready"

1 0

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

21 Sep '15

commit e7bb83b9ac130377c90e18ec018e5277991afa11 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 21 12:15:44 2015 +0000 Update translations for tails-misc_completed --- tr.po | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tr.po b/tr.po index 4ff3769..ab91b36 100644 --- a/tr.po +++ b/tr.po @@ -24,8 +24,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-28 01:49+0200\n" -"PO-Revision-Date: 2015-08-31 13:25+0000\n" +"POT-Creation-Date: 2015-09-20 19:32+0200\n" +"PO-Revision-Date: 2015-09-21 12:02+0000\n" "Last-Translator: Ozancan Karataş <ozancankaratas96(a)outlook.com>\n" "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n" "MIME-Version: 1.0\n" @@ -322,23 +322,23 @@ msgstr "Ağı bağlantınız engellemiş gibi görünüyor. Bu durum MAC aldatma msgid "This version of Tails has known security issues:" msgstr "Bu Tails sürümünde bilinen bazı güvenlik sorunları var: " -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:37 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:45 #, sh-format msgid "Network card ${nic} disabled" msgstr "${nic} ağ kartı devre dışı" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:38 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:46 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}) so it is temporarily disabled.\n" "You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." msgstr "${nic_name} (${nic}) ağ kartı için MAC aldatması yapılamadığından bu kart geçici olarak \ndevre dışı bırakıldı. MAC aldatmayı devre dışı bırakarak Tails yazılımını yeniden başlatmak isteyebilirsiniz. Ayrıntılı bilgi almak için <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>belgelere</a> bakın." -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:47 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:55 msgid "All networking disabled" msgstr "Tüm ağ devre dışı" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:48 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:56 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n" @@ -484,8 +484,8 @@ msgid "I2P's router console is ready" msgstr "I2P yöneltici konsolu hazır" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:44 -msgid "You can now access I2P's router console on http://127.0.0.1:7657." -msgstr "I2P yöneltici konsoluna http://127.0.0.1:7657 adresinden erişebilirsiniz." +msgid "You can now access I2P's router console in the I2P Browser." +msgstr "Artık I2P yönlendirici konsoluna I2P Browser içerisinden erişebilirsiniz." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:49 msgid "I2P is not ready" @@ -493,10 +493,10 @@ msgstr "I2P hazır değil" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:50 msgid "" -"Eepsite tunnel not built within six minutes. Check the router console at " -"http://127.0.0.1:7657/logs or the logs in /var/log/i2p for more information." -" Reconnect to the network to try again." -msgstr "Eepsite tüneli altı dakika içerisinde derlenemedi. Ayrıntılı bilgi almak için http://127.0.0.1:7657/logs ya da /var/log/i2p üzerindeki günlüklere bakın. Ağa yeniden bağlanıp, yeniden deneyin." +"Eepsite tunnel not built within six minutes. Check the router console in the" +" I2P Browser or the logs in /var/log/i2p for more information. Reconnect to " +"the network to try again." +msgstr "Eepsite tüneli altı dakika içinde oluşturulmamış. Daha fazla bilgi için I2P Browser içerisinden yönlendirici konsolunu ya da /var/log/i2p dizininden günlükleri denetleyin. Ağa bağlanmayı yeniden deneyin." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 msgid "I2P is ready"

1 0

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

21 Sep '15

commit 33aa32638089260aa426150e402dfb2ecdfe321f Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 21 12:15:39 2015 +0000 Update translations for tails-misc --- tr.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tr.po b/tr.po index e670a50..ab91b36 100644 --- a/tr.po +++ b/tr.po @@ -25,8 +25,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-20 19:32+0200\n" -"PO-Revision-Date: 2015-09-21 09:20+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2015-09-21 12:02+0000\n" +"Last-Translator: Ozancan Karataş <ozancankaratas96(a)outlook.com>\n" "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -485,7 +485,7 @@ msgstr "I2P yöneltici konsolu hazır" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:44 msgid "You can now access I2P's router console in the I2P Browser." -msgstr "" +msgstr "Artık I2P yönlendirici konsoluna I2P Browser içerisinden erişebilirsiniz." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:49 msgid "I2P is not ready" @@ -496,7 +496,7 @@ msgid "" "Eepsite tunnel not built within six minutes. Check the router console in the" " I2P Browser or the logs in /var/log/i2p for more information. Reconnect to " "the network to try again." -msgstr "" +msgstr "Eepsite tüneli altı dakika içinde oluşturulmamış. Daha fazla bilgi için I2P Browser içerisinden yönlendirici konsolunu ya da /var/log/i2p dizininden günlükleri denetleyin. Ağa bağlanmayı yeniden deneyin." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 msgid "I2P is ready"

1 0

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

21 Sep '15

commit acf27157502bcb113c24abb0bf927bc323bdbcdf Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 21 10:45:42 2015 +0000 Update translations for tails-misc_completed --- zh_CN.po | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/zh_CN.po b/zh_CN.po index 150f5bb..9a35865 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-10 18:53+0200\n" -"PO-Revision-Date: 2015-08-20 10:14+0000\n" +"POT-Creation-Date: 2015-09-20 19:32+0200\n" +"PO-Revision-Date: 2015-09-21 10:36+0000\n" "Last-Translator: YF <yfdyh000(a)gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -310,23 +310,23 @@ msgstr "看起来你的网络连接存在障碍。这可能涉及到 MAC 欺骗 msgid "This version of Tails has known security issues:" msgstr "该版本 Tails 的已知安全问题：" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:37 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:45 #, sh-format msgid "Network card ${nic} disabled" msgstr "网卡 ${nic} 已禁用" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:38 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:46 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}) so it is temporarily disabled.\n" "You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." msgstr "MAC 欺骗失败，网卡 ${nic_name} (${nic}) 已暂时禁用。\n您可能宁愿重启 Tails 并禁用 MAC 欺骗。参见<a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>相关文档</a>。" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:47 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:55 msgid "All networking disabled" msgstr "所有网络已禁用" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:48 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:56 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n" @@ -472,8 +472,8 @@ msgid "I2P's router console is ready" msgstr "I2P 路由控制台就绪。" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:44 -msgid "You can now access I2P's router console on http://127.0.0.1:7657." -msgstr "你现在可以通过 http://127.0.0.1:7657 访问 I2P 路由控制台。" +msgid "You can now access I2P's router console in the I2P Browser." +msgstr "你现在可以在 I2P 浏览器中访问 I2P 路由控制台。" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:49 msgid "I2P is not ready" @@ -481,10 +481,10 @@ msgstr "I2P 未就绪。" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:50 msgid "" -"Eepsite tunnel not built within six minutes. Check the router console at " -"http://127.0.0.1:7657/logs or the logs in /var/log/i2p for more information." -" Reconnect to the network to try again." -msgstr "eepSite 隧道未在6分钟内创建成功。请在 http://127.0.0.1:7657/logs 检查路由控制台或 /var/log/i2p 中查看日志以了解更多。然后再次尝试连接。" +"Eepsite tunnel not built within six minutes. Check the router console in the" +" I2P Browser or the logs in /var/log/i2p for more information. Reconnect to " +"the network to try again." +msgstr "eepSite 隧道未在6分钟内创建成功。请在 I2P 浏览器的路由控制台中检查，或者查看 /var/log/i2p 中的日志以了解更多。重连网络以重试。" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 msgid "I2P is ready"

1 0