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

[ooni-probe/master] Trap errors in importing dnspython
by art＠torproject.org 07 Feb '12

07 Feb '12

commit f63fc45985dae2f23ddf0453945b0f3d228bfbf3 Author: Arturo Filastò <hellais(a)gmail.com> Date: Tue Feb 7 20:46:39 2012 +0100 Trap errors in importing dnspython --- refactor/tests/dnstamper.py | 29 ++++++++++++++++------------- refactor/tests/traceroute.py | 31 +++++++++++++++++-------------- 2 files changed, 33 insertions(+), 27 deletions(-) diff --git a/refactor/tests/dnstamper.py b/refactor/tests/dnstamper.py index e68414d..987a948 100644 --- a/refactor/tests/dnstamper.py +++ b/refactor/tests/dnstamper.py @@ -1,4 +1,7 @@ -from dns import resolver +try: + from dns import resolver +except: + print "Error dnspython is not installed! (http://www.dnspython.org/)" import gevent import os import plugoo @@ -13,27 +16,27 @@ class DNST(Plugoo): res = resolver.Resolver(configure=False) res.nameservers = [ns] answer = res.query(hostname) - - ret = [] - + + ret = [] + for data in answer: ret.append(data.address) - + return ret - - def experiment(self, *a, **kw): + + def experiment(self, *a, **kw): # this is just a dirty hack address = kw['data'][0] ns = kw['data'][1] - + config = self.config - + print "ADDRESS: %s" % address print "NAMESERVER: %s" % ns - + exp = self.lookup(address, ns) control = self.lookup(address, config.tests.dns_control_server) - + if len(set(exp) & set(control)) > 0: print "%s : no tampering on %s" % (address, ns) return (address, ns, False) @@ -46,7 +49,7 @@ def run(ooni): """ config = ooni.config urls = [] - + dns_experiment = DNSTAsset(os.path.join(config.main.assetdir, \ config.tests.dns_experiment)) dns_experiment_dns = DNSTAsset(os.path.join(config.main.assetdir, \ @@ -58,5 +61,5 @@ def run(ooni): ooni.logger.info("starting test") dnstest.run(assets) ooni.logger.info("finished") - + diff --git a/refactor/tests/traceroute.py b/refactor/tests/traceroute.py index 13eb578..69f87e5 100644 --- a/refactor/tests/traceroute.py +++ b/refactor/tests/traceroute.py @@ -1,4 +1,7 @@ -from dns import resolver +try: + from dns import resolver +except: + print "Error dnspython is not installed (http://www.dnspython.org/)" import gevent import os import plugoo @@ -40,52 +43,52 @@ class Traceroute(Plugoo): send_sock.connect((dst, dst_port)) except socket.timeout: pass - + except Exception, e: print "Error doing connect %s" % e else: send_sock.sendto("", (dst, dst_port)) - + curr_addr = None try: print "receiving data..." _, curr_addr = recv_sock.recvfrom(512) curr_addr = curr_addr[0] - + except socket.error, e: print "SOCKET ERROR: %s" % e - + except Exception, e: print "ERROR: %s" % e - + finally: send_sock.close() recv_sock.close() - + if curr_addr is not None: curr_host = "%s" % curr_addr else: curr_host = "*" - + print "%d\t%s" % (ttl, curr_host) if curr_addr == dest_addr or ttl > max_hops: break ttl += 1 - - - def experiment(self, *a, **kw): + + + def experiment(self, *a, **kw): # this is just a dirty hack address = kw['data'][0] - + self.traceroute(address) def run(ooni): """Run the test""" config = ooni.config urls = [] - + traceroute_experiment = TracerouteAsset(os.path.join(config.main.assetdir, \ config.tests.traceroute)) @@ -95,5 +98,5 @@ def run(ooni): ooni.logger.info("starting traceroute test") traceroute.run(assets) ooni.logger.info("finished") - +

1 0

[ooni-probe/master] Add install.txt file
by art＠torproject.org 07 Feb '12

07 Feb '12

commit 3f1c1aacb3e1b9fd71f30eab8a47203664546093 Author: Arturo Filastò <hellais(a)gmail.com> Date: Tue Feb 7 20:29:07 2012 +0100 Add install.txt file --- refactor/install.txt | 4 ++++ refactor/plugoo.py | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/refactor/install.txt b/refactor/install.txt new file mode 100644 index 0000000..8818d47 --- /dev/null +++ b/refactor/install.txt @@ -0,0 +1,4 @@ +install libdnet-1.12 +sudo pip install pylibpcap +sudo pip install pcapy +sudo pip install scapy diff --git a/refactor/plugoo.py b/refactor/plugoo.py index 7606382..9162050 100644 --- a/refactor/plugoo.py +++ b/refactor/plugoo.py @@ -295,7 +295,7 @@ class Plugoo(): # Run the jobs with the selected timeout gevent.joinall(jobs, timeout=timeout) for job in jobs: - print job.value + print "JOB VAL: %s" % job.value self.report(job.value) job.kill() jobs = []

1 0

[torspec/master] Add proposal 193: safe cookie authentication.
by nickm＠torproject.org 07 Feb '12

07 Feb '12

commit bd70d0448684325d9aa0d4f7645affee0aca39fa Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 7 12:39:08 2012 -0500 Add proposal 193: safe cookie authentication. --- proposals/000-index.txt | 2 + proposals/193-safe-cookie-authentication.txt | 144 ++++++++++++++++++++++++++ 2 files changed, 146 insertions(+), 0 deletions(-) diff --git a/proposals/000-index.txt b/proposals/000-index.txt index d539742..73cdd5b 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -113,6 +113,7 @@ Proposals by number: 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 [OPEN] Proposals by status: @@ -147,6 +148,7 @@ Proposals by status: 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] + 193 Safe cookie authentication for Tor controllers ACCEPTED: 117 IPv6 exits [for 0.2.3.x] 140 Provide diffs between consensuses diff --git a/proposals/193-safe-cookie-authentication.txt b/proposals/193-safe-cookie-authentication.txt new file mode 100644 index 0000000..01d8720 --- /dev/null +++ b/proposals/193-safe-cookie-authentication.txt @@ -0,0 +1,144 @@ +Filename: 193-safe-cookie-authentication.txt +Title: Safe cookie authentication for Tor controllers +Author: Robert Ransom +Created: 2012-02-04 +Status: Open + +Overview: + + Not long ago, all Tor controllers which automatically attempted + 'cookie authentication' were vulnerable to an information-disclosure + attack. (See https://bugs.torproject.org/4303 for slightly more + information.) + + Now, some Tor controllers which automatically attempt cookie + authentication are only vulnerable to an information-disclosure + attack on any 32-byte files they can read. But the Ed25519 + signature scheme (among other cryptosystems) has 32-byte secret + keys, and we would like to not worry about Tor controllers leaking + our secret keys to whatever can listen on what the controller thinks + is Tor's control port. + + Additionally, we would like to not have to remodel Tor's innards and + rewrite all of our Tor controllers to use TLS on Tor's control port + this week (or deal with the many design issues which that would + raise). + +Design: + +From af6bf472d59162428a1d7f1d77e6e77bda827414 Mon Sep 17 00:00:00 2001 +From: Robert Ransom <rransom.8774(a)gmail.com> +Date: Sun, 5 Feb 2012 04:02:23 -0800 +Subject: [PATCH] Add SAFECOOKIE control-port authentication method + +--- + control-spec.txt | 59 ++++++++++++++++++++++++++++++++++++++++++++++------- + 1 files changed, 51 insertions(+), 8 deletions(-) + +diff --git a/control-spec.txt b/control-spec.txt +index 66088f7..3651c86 100644 +--- a/control-spec.txt ++++ b/control-spec.txt +@@ -323,11 +323,12 @@ + For information on how the implementation securely stores authentication + information on disk, see section 5.1. + +- Before the client has authenticated, no command other than PROTOCOLINFO, +- AUTHENTICATE, or QUIT is valid. If the controller sends any other command, +- or sends a malformed command, or sends an unsuccessful AUTHENTICATE +- command, or sends PROTOCOLINFO more than once, Tor sends an error reply and +- closes the connection. ++ Before the client has authenticated, no command other than ++ PROTOCOLINFO, AUTHCHALLENGE, AUTHENTICATE, or QUIT is valid. If the ++ controller sends any other command, or sends a malformed command, or ++ sends an unsuccessful AUTHENTICATE command, or sends PROTOCOLINFO or ++ AUTHCHALLENGE more than once, Tor sends an error reply and closes ++ the connection. + + To prevent some cross-protocol attacks, the AUTHENTICATE command is still + required even if all authentication methods in Tor are disabled. In this +@@ -949,6 +950,7 @@ + "NULL" / ; No authentication is required + "HASHEDPASSWORD" / ; A controller must supply the original password + "COOKIE" / ; A controller must supply the contents of a cookie ++ "SAFECOOKIE" ; A controller must prove knowledge of a cookie + + AuthCookieFile = QuotedString + TorVersion = QuotedString +@@ -970,9 +972,9 @@ + methods that Tor currently accepts. + + AuthCookieFile specifies the absolute path and filename of the +- authentication cookie that Tor is expecting and is provided iff +- the METHODS field contains the method "COOKIE". Controllers MUST handle +- escape sequences inside this string. ++ authentication cookie that Tor is expecting and is provided iff the ++ METHODS field contains the method "COOKIE" and/or "SAFECOOKIE". ++ Controllers MUST handle escape sequences inside this string. + + The VERSION line contains the Tor version. + +@@ -1033,6 +1035,47 @@ + + [TAKEOWNERSHIP was added in Tor 0.2.2.28-beta.] + ++3.24. AUTHCHALLENGE ++ ++ The syntax is: ++ "AUTHCHALLENGE" SP "AUTHMETHOD=SAFECOOKIE" ++ SP "COOKIEFILE=" AuthCookieFile ++ SP "CLIENTCHALLENGE=" 2*HEXDIG / QuotedString ++ CRLF ++ ++ The server will reject this command with error code 512, then close ++ the connection, if Tor is not using the file specified in the ++ AuthCookieFile argument as a controller authentication cookie file. ++ ++ If the server accepts the command, the server reply format is: ++ "250-AUTHCHALLENGE" ++ SP "CLIENTRESPONSE=" 64*64HEXDIG ++ SP "SERVERCHALLENGE=" 2*HEXDIG ++ CRLF ++ ++ The CLIENTCHALLENGE, CLIENTRESPONSE, and SERVERCHALLENGE values are ++ encoded/decoded in the same way as the argument passed to the ++ AUTHENTICATE command. ++ ++ The CLIENTRESPONSE value is computed as: ++ HMAC-SHA256(HMAC-SHA256("Tor server-to-controller cookie authenticator", ++ CookieString) ++ ClientChallengeString) ++ (with the HMAC key as its first argument) ++ ++ After a controller sends a successful AUTHCHALLENGE command, the ++ next command sent on the connection must be an AUTHENTICATE command, ++ and the only authentication string which that AUTHENTICATE command ++ will accept is: ++ HMAC-SHA256(HMAC-SHA256("Tor controller-to-server cookie authenticator", ++ CookieString) ++ ServerChallengeString) ++ ++ [Unlike other commands besides AUTHENTICATE, AUTHCHALLENGE may be ++ used (but only once!) before AUTHENTICATE.] ++ ++ [AUTHCHALLENGE was added in Tor FIXME.] ++ + 4. Replies + + Reply codes follow the same 3-character format as used by SMTP, with the +-- +1.7.8.3 + +Rationale: + + The weird inner HMAC was meant to ensure that whatever impersonates + Tor's control port cannot even abuse a secret key meant to be used + with HMAC-SHA256. + + Then I added the server-to-controller challenge-response + authentication step, to ensure that the server can only use a + controller as an HMAC oracle if it already knows the contents of the + cookie file. Now, the inner HMAC is just a not-very-efficient way + to keep controllers from using the server as an oracle for its own + challenges (it could be replaced with a hash function). +

1 0

[ooni-probe/master] Fix bug in timeout
by art＠torproject.org 07 Feb '12

07 Feb '12

commit f0b2a98744d8f098632721648adf6ea40c9489ca Author: Arturo Filastò <hellais(a)gmail.com> Date: Tue Feb 7 19:24:19 2012 +0100 Fix bug in timeout --- refactor/tests/bridget.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/refactor/tests/bridget.py b/refactor/tests/bridget.py index 9ec499f..71d210a 100644 --- a/refactor/tests/bridget.py +++ b/refactor/tests/bridget.py @@ -52,7 +52,7 @@ DataDirectory %s os.mkdir(datadir) return (randomname, datadir) - def connect(self, bridge, timeout): + def connect(self, bridge, timeout=None): if not timeout: timeout = self.timeout torrc, tordir = self.writetorrc(bridge)

1 0

[ooni-probe/master] Fix bug in bridget
by art＠torproject.org 07 Feb '12

07 Feb '12

commit 3ad40791278a53e95d7f327f64a075c77a3a0794 Author: Arturo Filastò <hellais(a)gmail.com> Date: Tue Feb 7 19:22:48 2012 +0100 Fix bug in bridget --- refactor/tests/bridget.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/refactor/tests/bridget.py b/refactor/tests/bridget.py index c3d0055..9ec499f 100644 --- a/refactor/tests/bridget.py +++ b/refactor/tests/bridget.py @@ -52,7 +52,9 @@ DataDirectory %s os.mkdir(datadir) return (randomname, datadir) - def connect(self, bridge, timeout=self.timeout): + def connect(self, bridge, timeout): + if not timeout: + timeout = self.timeout torrc, tordir = self.writetorrc(bridge) cmd = ["tor", "-f", torrc]

1 0

[ooni-probe/master] Add UTF-8 charset to files
by art＠torproject.org 07 Feb '12

07 Feb '12

commit dfd6f74c2d52d2a073ec23b405bf19039848d465 Author: Arturo Filastò <hellais(a)gmail.com> Date: Tue Feb 7 19:20:18 2012 +0100 Add UTF-8 charset to files --- refactor/ooni-probe.py | 3 ++- refactor/plugoo.py | 1 + refactor/tests/bridget.py | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/refactor/ooni-probe.py b/refactor/ooni-probe.py index bb67256..64d35f5 100644 --- a/refactor/ooni-probe.py +++ b/refactor/ooni-probe.py @@ -1,3 +1,4 @@ +# -*- coding: UTF-8 #!/usr/bin/env python """ ooni-probe @@ -11,7 +12,7 @@ The goal of ooni-probe is to collect data about censorship around the world. - :copyright: (c) 2012 by Arturo Filastò. + :copyright: (c) 2012 by Arturo Filastò :license: see LICENSE for more details. """ diff --git a/refactor/plugoo.py b/refactor/plugoo.py index ee3ee0f..7606382 100644 --- a/refactor/plugoo.py +++ b/refactor/plugoo.py @@ -1,3 +1,4 @@ +# -*- coding: UTF-8 """ plugoo ****** diff --git a/refactor/tests/bridget.py b/refactor/tests/bridget.py index 886b7a6..c3d0055 100644 --- a/refactor/tests/bridget.py +++ b/refactor/tests/bridget.py @@ -1,3 +1,4 @@ +# -*- coding: UTF-8 """ bridgeT ******* @@ -5,7 +6,7 @@ an OONI test (we call them Plugoos :P) aimed at detecting if a set of Tor bridges are working or not. - :copyright: (c) 2012 by Arturo Filastò. + :copyright: (c) 2012 by Arturo Filastò :license: BSD, see LICENSE for more details. """ import os

1 0

r25377: {website} tell people to fetch tor from git in a more secure way (website/trunk/docs/en)
by Roger Dingledine 07 Feb '12

07 Feb '12

Author: arma Date: 2012-02-07 14:37:07 +0000 (Tue, 07 Feb 2012) New Revision: 25377 Modified: website/trunk/docs/en/documentation.wml Log: tell people to fetch tor from git in a more secure way Modified: website/trunk/docs/en/documentation.wml =================================================================== --- website/trunk/docs/en/documentation.wml 2012-02-06 22:41:19 UTC (rev 25376) +++ website/trunk/docs/en/documentation.wml 2012-02-07 14:37:07 UTC (rev 25377) @@ -266,7 +266,7 @@ <li><a href="<gitrepo>">Browse the repository's source tree directly</a></li> <li>Git and SVN access: <ul> - <li><kbd>git clone git://git.torproject.org/git/tor</kbd></li> + <li><kbd>git clone https://git.torproject.org/git/tor</kbd></li> <li>The development branch is <kbd>master</kbd>. The active maintenance branches are <kbd>maint-0.2.1</kbd> and <kbd>maint-0.2.2</kbd>.</li> <li><kbd>svn checkout https://svn.torproject.org/svn/website/trunk website</kbd></li> </ul>

1 0

[metrics-web/master] Don't conceal Java warnings in Ant's output.
by karsten＠torproject.org 07 Feb '12

07 Feb '12

commit 00c4cc35bbfd01e1f6e06b85c147e54cf726f529 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Feb 7 12:55:20 2012 +0100 Don't conceal Java warnings in Ant's output. --- run.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/run.sh b/run.sh index e804876..f8ac867 100755 --- a/run.sh +++ b/run.sh @@ -1,5 +1,5 @@ #!/bin/sh # TODO is there a better way to suppress Ant's output? -ant -q | grep -Ev "^$|^BUILD SUCCESSFUL|^Total time: " +ant | grep "\[java\]"

1 0

[metrics-web/master] Warn if torperf data has become stale.
by karsten＠torproject.org 07 Feb '12

07 Feb '12

commit 0002fa2b7e7c180dd4fa3c3ffa949964333e93b0 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Feb 7 13:05:07 2012 +0100 Warn if torperf data has become stale. In theory, this check belongs in metrics-db, not metrics-web. But it's already implemented here, and raising a log level is easier than copying and maintaining the code. As soon as metrics-db uses metrics-lib this is all going to be so much easier... --- .../torproject/ernie/cron/TorperfProcessor.java | 27 ++++++++++++++------ 1 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/org/torproject/ernie/cron/TorperfProcessor.java b/src/org/torproject/ernie/cron/TorperfProcessor.java index 7caccf6..dcd0657 100644 --- a/src/org/torproject/ernie/cron/TorperfProcessor.java +++ b/src/org/torproject/ernie/cron/TorperfProcessor.java @@ -22,6 +22,9 @@ public class TorperfProcessor { SortedMap<String, String> rawObs = new TreeMap<String, String>(); SortedMap<String, String> stats = new TreeMap<String, String>(); int addedRawObs = 0; + SimpleDateFormat formatter = + new SimpleDateFormat("yyyy-MM-dd,HH:mm:ss"); + formatter.setTimeZone(TimeZone.getTimeZone("UTC")); try { if (rawFile.exists()) { logger.fine("Reading file " + rawFile.getAbsolutePath() + "..."); @@ -80,9 +83,6 @@ public class TorperfProcessor { size.length() - "xb.data".length())); BufferedReader br = new BufferedReader(new FileReader(pop)); String line = null; - SimpleDateFormat formatter = - new SimpleDateFormat("yyyy-MM-dd,HH:mm:ss"); - formatter.setTimeZone(TimeZone.getTimeZone("UTC")); while ((line = br.readLine()) != null) { String[] parts = line.split(" "); // remove defective lines as they occurred on gabelmoo @@ -230,22 +230,33 @@ public class TorperfProcessor { + "Last known obserations by source and file size are:"); String lastSource = null; String lastLine = null; + Level logLevel = Level.INFO; + String cutoff = formatter.format(System.currentTimeMillis() + - 12L * 60L * 60L * 1000L).replaceAll(",", " "); for (String s : rawObs.keySet()) { String[] parts = s.split(","); if (lastSource == null) { lastSource = parts[0]; } else if (!parts[0].equals(lastSource)) { - dumpStats.append("\n" + lastSource + " " + lastLine.split(",")[1] - + " " + lastLine.split(",")[2]); + String lastKnownObservation = lastLine.split(",")[1] + " " + + lastLine.split(",")[2]; + dumpStats.append("\n" + lastSource + " " + lastKnownObservation); lastSource = parts[0]; + if (cutoff.compareTo(lastKnownObservation) > 0) { + logLevel = Level.WARNING; + } } lastLine = s; } if (lastSource != null) { - dumpStats.append("\n" + lastSource + " " + lastLine.split(",")[1] - + " " + lastLine.split(",")[2]); + String lastKnownObservation = lastLine.split(",")[1] + " " + + lastLine.split(",")[2]; + dumpStats.append("\n" + lastSource + " " + lastKnownObservation); + if (cutoff.compareTo(lastKnownObservation) > 0) { + logLevel = Level.WARNING; + } } - logger.info(dumpStats.toString()); + logger.log(logLevel, dumpStats.toString()); /* Write results to database. */ if (connectionURL != null) {

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 07 Feb '12

07 Feb '12

commit 94724716e2864c2f58384297aadc27220b530cda Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 7 11:15:21 2012 +0000 Update translations for vidalia_help --- zh_CN/links.po | 12 ++++++++---- zh_CN/server.po | 6 +++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/zh_CN/links.po b/zh_CN/links.po index 0b7b5b2..b9c8b35 100644 --- a/zh_CN/links.po +++ b/zh_CN/links.po @@ -1,13 +1,14 @@ # # Translators: +# <hua5679(a)gmail.com>, 2012. # runasand <runa.sandvik(a)gmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-05-05 20:21+0200\n" -"PO-Revision-Date: 2010-11-30 05:02+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2012-02-07 11:05+0000\n" +"Last-Translator: zhenghua1991 <hua5679(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -47,12 +48,12 @@ msgstr "" #. type: Content of: <html><body><table><tr><td> #: links.html:31 links.html:58 msgid "Wiki and Bugtracker" -msgstr "" +msgstr "Wiki和Bug跟踪" #. type: Content of: <html><body><table><tr><td> #: links.html:33 msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>" -msgstr "" +msgstr "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>" #. type: Content of: <html><body><h3> #: links.html:39 @@ -75,10 +76,13 @@ msgid "" "<a href=\"https://www.torproject.org/docs/faq.html\"> " "https://www.torproject.org/docs/faq.html</a>" msgstr "" +"<a href=\"https://www.torproject.org/docs/faq.html\"> " +"https://www.torproject.org/docs/faq.html</a>" #. type: Content of: <html><body><table><tr><td> #: links.html:60 msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>" msgstr "" +"<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>" diff --git a/zh_CN/server.po b/zh_CN/server.po index cbfe541..bfee5c8 100644 --- a/zh_CN/server.po +++ b/zh_CN/server.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2012-01-14 16:11+0000\n" +"PO-Revision-Date: 2012-02-07 11:06+0000\n" "Last-Translator: zhenghua1991 <hua5679(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -243,7 +243,7 @@ msgstr "" #. type: Content of: <html><body><table><tr><td> #: en/server.html:148 msgid "Secure Websites (SSL)" -msgstr "" +msgstr "安全网站(SSL)" #. type: Content of: <html><body><table><tr><td> #: en/server.html:149 @@ -299,7 +299,7 @@ msgstr "6660-6669, 6697, 7000-7001" #. type: Content of: <html><body><table><tr><td> #: en/server.html:165 msgid "IRC clients and servers" -msgstr "" +msgstr "IRC客户端和服务器" #. type: Content of: <html><body><table><tr><td> #: en/server.html:168

1 0