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

r26079: {website} ... and changed the question in the TOC (website/trunk/docs/en)
by Moritz Bartl 06 Mar '13

06 Mar '13

Author: moritz Date: 2013-03-06 11:04:52 +0000 (Wed, 06 Mar 2013) New Revision: 26079 Modified: website/trunk/docs/en/faq.wml Log: ... and changed the question in the TOC Modified: website/trunk/docs/en/faq.wml =================================================================== --- website/trunk/docs/en/faq.wml 2013-03-06 11:03:11 UTC (rev 26078) +++ website/trunk/docs/en/faq.wml 2013-03-06 11:04:52 UTC (rev 26079) @@ -56,9 +56,9 @@ <li><a href="#TBBFlash">Why can't I view videos on YouTube and other Flash-based sites?</a></li> - <li><a href="#TBBSocksPort">I'm on OSX or Linux and I want to + <li><a href="#TBBSocksPort">I want to run another application through the Tor launched by Tor Browser - Bundle. How do I predict my Socks port?</a></li> + Bundle.</a></li> <li><a href="#TBBPolipo">I need an HTTP proxy. Where did Polipo go?</a></li> <li><a href="#TBBOtherExtensions">Can I install other Firefox

1 0

r26078: {website} ... and changed the question (website/trunk/docs/en)
by Moritz Bartl 06 Mar '13

06 Mar '13

Author: moritz Date: 2013-03-06 11:03:11 +0000 (Wed, 06 Mar 2013) New Revision: 26078 Modified: website/trunk/docs/en/faq.wml Log: ... and changed the question Modified: website/trunk/docs/en/faq.wml =================================================================== --- website/trunk/docs/en/faq.wml 2013-03-06 11:01:46 UTC (rev 26077) +++ website/trunk/docs/en/faq.wml 2013-03-06 11:03:11 UTC (rev 26078) @@ -950,9 +950,9 @@ <hr> <a id="TBBSocksPort"></a> -<h3><a class="anchor" href="#TBBSocksPort">I'm on OSX or Linux and +<h3><a class="anchor" href="#TBBSocksPort"> I want to run another application through the Tor launched by Tor -Browser Bundle. How do I predict my Socks port?</a></h3> +Browser Bundle.</a></h3> <p> Typically Tor listens for Socks connections on port 9050. TBB listens

1 0

r26077: {website} TBB uses 9150 now, removed info about auto port selection (website/trunk/docs/en)
by Moritz Bartl 06 Mar '13

06 Mar '13

Author: moritz Date: 2013-03-06 11:01:46 +0000 (Wed, 06 Mar 2013) New Revision: 26077 Modified: website/trunk/docs/en/faq.wml Log: TBB uses 9150 now, removed info about auto port selection Modified: website/trunk/docs/en/faq.wml =================================================================== --- website/trunk/docs/en/faq.wml 2013-03-05 21:49:41 UTC (rev 26076) +++ website/trunk/docs/en/faq.wml 2013-03-06 11:01:46 UTC (rev 26077) @@ -955,24 +955,15 @@ Browser Bundle. How do I predict my Socks port?</a></h3> <p> -Typically Tor listens for Socks connections on port 9050. TBB -on OSX and Linux has an experimental feature where Tor listens -on random unused ports rather than a fixed port each time. The -goal is to avoid conflicting with a "system" Tor install, +Typically Tor listens for Socks connections on port 9050. TBB listens +on port 9150. +The goal is to avoid conflicting with a "system" Tor install, so you can run a system Tor and TBB at the same time. We're <a href="https://trac.torproject.org/projects/tor/ticket/3948">working on a feature</a> where Tor will try the usual ports first and then back -off to a random choice if they're already in use. Until then, if you -want to configure some other application to use Tor as a Socks proxy, -here's a workaround: +off to a random choice if they're already in use. </p> -<p> -In Vidalia, go to Settings->Advanced and uncheck the box that says -'Configure ControlPort automatically'. Click OK and restart TBB. Your -Socks port will then be on 9050. -</p> - <hr> <a id="TBBPolipo"></a>

1 0

[flashproxy/master] Provide a custom usage function for websocket-server.
by dcf＠torproject.org 06 Mar '13

06 Mar '13

commit b52bd95e0563a45b58b699a32bc14f4b6fe697d2 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Mar 5 20:00:24 2013 -0800 Provide a custom usage function for websocket-server. --- websocket-transport/websocket-server.go | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/websocket-transport/websocket-server.go b/websocket-transport/websocket-server.go index 56c4b5b..aa4fe57 100644 --- a/websocket-transport/websocket-server.go +++ b/websocket-transport/websocket-server.go @@ -29,6 +29,16 @@ var handlerChan = make(chan int) var logMutex sync.Mutex +func usage() { + fmt.Printf("Usage: %s [OPTIONS]\n", os.Args[0]) + fmt.Printf("WebSocket server pluggable transport for Tor.\n") + fmt.Printf("Works only as a managed proxy.\n") + fmt.Printf("\n") + fmt.Printf(" -h, --help show this help.\n") + fmt.Printf(" --log FILE log messages to FILE (default stderr).\n") + fmt.Printf(" --port PORT listen on PORT (overrides Tor's requested port).\n") +} + func Log(format string, v ...interface{}) { dateStr := time.Now().Format("2006-01-02 15:04:05") logMutex.Lock() @@ -187,6 +197,7 @@ func main() { var defaultPort int var logFilename string + flag.Usage = usage flag.IntVar(&defaultPort, "port", 0, "port to listen on if unspecified by Tor") flag.StringVar(&logFilename, "log", "", "log file to write to") flag.Parse()

1 0

r26076: {website} Rephrase the volunteer entry on fuzzing a bit. (website/trunk/getinvolved/en)
by George Kadianakis 05 Mar '13

05 Mar '13

Author: asn Date: 2013-03-05 21:49:41 +0000 (Tue, 05 Mar 2013) New Revision: 26076 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Rephrase the volunteer entry on fuzzing a bit. Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2013-03-05 19:31:10 UTC (rev 26075) +++ website/trunk/getinvolved/en/volunteer.wml 2013-03-05 21:49:41 UTC (rev 26076) @@ -2068,9 +2068,10 @@ performance analysis, and optimally, code fixes to OpenSSL and Tor if needed.</li> - <li>Perform a security analysis of Tor with <a - href="https://secure.wikimedia.org/wikipedia/en/wiki/Fuzz_testing">"fuzz"</a>. Determine - if there are good fuzzing libraries out there for what we want. Win fame by + <li>Write a <a + href="https://secure.wikimedia.org/wikipedia/en/wiki/Fuzz_testing">fuzzer</a> + for Tor to discover security vulnerabilities. Determine if there + are good fuzzing frameworks out there for what we want. Win fame by getting credit when we put out a new release because of you!</li> <li>Tor uses TCP for transport and TLS for link

1 0

r26075: {website} update mirror status, add a new one. (in website/trunk: . include)
by Andrew Lewman 05 Mar '13

05 Mar '13

Author: phobos Date: 2013-03-05 19:31:10 +0000 (Tue, 05 Mar 2013) New Revision: 26075 Modified: website/trunk/include/mirrors-table.wmi website/trunk/update-mirrors.pl Log: update mirror status, add a new one. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2013-03-05 18:07:31 UTC (rev 26074) +++ website/trunk/include/mirrors-table.wmi 2013-03-05 19:31:10 UTC (rev 26075) @@ -1,15 +1,15 @@ <tr> - <td>CZ</td> + <td>IS</td> - <td>Lightning-bolt.net</td> + <td>torproject.is</td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.lightning-bolt.net/dist/">http</a></td> - <td><a href="http://torproject.lightning-bolt.net/">http</a></td> + <td><a href="http://torproject.is/dist/">http</a></td> + <td><a href="http://torproject.is/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -18,32 +18,32 @@ <tr> - <td>TN</td> + <td>AT</td> <td></td> <td>Up to date</td> <td> - </td> + <td><a href="http://torproject.ph3x.at/dist/">http</a></td> + <td><a href="http://torproject.ph3x.at/">http</a></td> <td> - </td> - <td><a href="http://torproject.antagonism.org/">http</a></td> <td> - </td> - <td><a href="https://torproject.antagonism.org/">https</a></td> <td> - </td> <td> - </td> </tr> <tr> - <td>NL</td> + <td>US</td> - <td>Amorphis</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.amorphis.eu/dist/">http</a></td> - <td><a href="http://tor.amorphis.eu/">http</a></td> + <td><a href="http://tor.minibofh.org/dist/">http</a></td> + <td><a href="http://tor.minibofh.org/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -52,15 +52,15 @@ <tr> - <td>NL</td> + <td>AT</td> - <td>CCC</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.ccc.de/dist/">http</a></td> - <td><a href="http://tor.ccc.de/">http</a></td> + <td><a href="http://tor.dont-know-me.at/dist/">http</a></td> + <td><a href="http://tor.dont-know-me.at/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -69,49 +69,49 @@ <tr> - <td>DK</td> + <td>DE</td> - <td>Zentrum der Gesundheit</td> + <td>torservers</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.idnr.ws/dist/">http</a></td> - <td><a href="http://tor.idnr.ws/">http</a></td> + <td><a href="http://www.torservers.net/mirrors/torproject.org/dist/">http</a></td> + <td><a href="http://www.torservers.net/mirrors/torproject.org/">http</a></td> + <td><a href="https://www.torservers.net/mirrors/torproject.org/dist/">https</a></td> + <td><a href="https://www.torservers.net/mirrors/torproject.org/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>EE</td> + <td>DE</td> - <td>CyberSIDE</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://cyberside.net.ee/tor/">http</a></td> - <td><a href="http://cyberside.planet.ee/tor/">http</a></td> + <td><a href="http://tor.dev-random.de/dist/">http</a></td> + <td><a href="http://tor.dev-random.de/">http</a></td> + <td><a href="https://tor.dev-random.de/dist/">https</a></td> + <td><a href="https://tor.dev-random.de/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>IS</td> + <td>DE</td> - <td>torproject.is</td> + <td>chaos darmstadt</td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.is/dist/">http</a></td> - <td><a href="http://torproject.is/">http</a></td> + <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/dist/">http</a></td> + <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -120,15 +120,15 @@ <tr> - <td>AT</td> + <td>US</td> <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.ph3x.at/dist/">http</a></td> - <td><a href="http://torproject.ph3x.at/">http</a></td> + <td><a href="http://tor.onthegetgo.com/dist/">http</a></td> + <td><a href="http://tor.onthegetgo.com/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -139,47 +139,47 @@ <td>US</td> - <td>BarkerJr</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.torproject.us/dist/">http</a></td> - <td><a href="http://www.torproject.us/">http</a></td> - <td><a href="https://www.torproject.us/dist/">https</a></td> - <td><a href="https://www.torproject.us/">https</a></td> + <td><a href="http://199.175.55.215/dist/">http</a></td> + <td><a href="http://199.175.55.215/">http</a></td> <td> - </td> - <td><a href="rsync://rsync.torproject.us/tor">rsync</a></td> + <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>US</td> + <td>DE</td> - <td></td> + <td>beme it</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.minibofh.org/dist/">http</a></td> - <td><a href="http://tor.minibofh.org/">http</a></td> + <td><a href="http://tor.beme-it.de/dist/">http</a></td> + <td><a href="http://tor.beme-it.de/">http</a></td> + <td><a href="https://tor.beme-it.de/dist/">https</a></td> + <td><a href="https://tor.beme-it.de/">https</a></td> <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> + <td><a href="rsync://tor.beme-it.de/tor">rsync</a></td> </tr> <tr> - <td>AT</td> + <td>DE</td> - <td></td> + <td>borgmann.tv</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.dont-know-me.at/dist/">http</a></td> - <td><a href="http://tor.dont-know-me.at/">http</a></td> + <td><a href="http://tor.borgmann.tv/dist/">http</a></td> + <td><a href="http://tor.borgmann.tv/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -188,83 +188,83 @@ <tr> - <td>DE</td> + <td>US</td> - <td>torservers</td> + <td>AskApache</td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.torservers.net/mirrors/torproject.org/dist/">http</a></td> - <td><a href="http://www.torservers.net/mirrors/torproject.org/">http</a></td> - <td><a href="https://www.torservers.net/mirrors/torproject.org/dist/">https</a></td> - <td><a href="https://www.torservers.net/mirrors/torproject.org/">https</a></td> + <td><a href="http://tor.askapache.com/dist/">http</a></td> + <td><a href="http://tor.askapache.com/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> <td>IS</td> - <td>myRL.net</td> + <td>TheOnionRouter</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.myrl.net/dist/">http</a></td> - <td><a href="http://tor.myrl.net/">http</a></td> - <td><a href="https://tor.myrl.net/dist/">https</a></td> - <td><a href="https://tor.myrl.net/">https</a></td> + <td><a href="http://theonionrouter.com/dist/">http</a></td> + <td><a href="http://theonionrouter.com/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>US</td> + <td>GB</td> - <td>hessmo</td> + <td>torland</td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirror.hessmo.com/tor/dist/">http</a></td> - <td><a href="http://mirror.hessmo.com/tor/">http</a></td> + <td><a href="http://mirror.torland.me/torproject.org/dist/">http</a></td> + <td><a href="http://mirror.torland.me/torproject.org/">http</a></td> + <td><a href="https://mirror.torland.me/torproject.org/dist/">https</a></td> + <td><a href="https://mirror.torland.me/torproject.org/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>DE</td> + <td>INT</td> - <td></td> + <td>CoralCDN</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.linuxlounge.net/dist/">http</a></td> - <td><a href="http://tor.linuxlounge.net/">http</a></td> - <td><a href="https://tor.linuxlounge.net/dist/">https</a></td> - <td><a href="https://tor.linuxlounge.net/">https</a></td> + <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> + <td><a href="http://www.torproject.org.nyud.net/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>RO</td> + <td>CZ</td> - <td>me0w.cc</td> + <td>Lightning-bolt.net</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.me0w.cc/dist/">http</a></td> - <td><a href="http://tor.me0w.cc/">http</a></td> + <td><a href="http://torproject.lightning-bolt.net/dist/">http</a></td> + <td><a href="http://torproject.lightning-bolt.net/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -273,32 +273,32 @@ <tr> - <td>CH</td> + <td>TN</td> <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.pillo-srv.ch/dist/">http</a></td> - <td><a href="http://torproject.pillo-srv.ch/">http</a></td> - <td><a href="https://torproject.pillo-srv.ch/dist/">https</a></td> - <td><a href="https://torproject.pillo-srv.ch/">https</a></td> <td> - </td> + <td><a href="http://torproject.antagonism.org/">http</a></td> <td> - </td> + <td><a href="https://torproject.antagonism.org/">https</a></td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>LT</td> + <td>NL</td> - <td></td> + <td>Amorphis</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.vesta.nu/dist/">http</a></td> - <td><a href="http://tor.vesta.nu/">http</a></td> + <td><a href="http://tor.amorphis.eu/dist/">http</a></td> + <td><a href="http://tor.amorphis.eu/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -307,49 +307,49 @@ <tr> - <td>EE</td> + <td>NL</td> - <td></td> + <td>CCC</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.li/dist/">http</a></td> - <td><a href="http://tor.li/">http</a></td> - <td><a href="https://tor.li/dist/">https</a></td> - <td><a href="https://tor.li/">https</a></td> + <td><a href="http://tor.ccc.de/dist/">http</a></td> + <td><a href="http://tor.ccc.de/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>DE</td> + <td>DK</td> - <td></td> + <td>Zentrum der Gesundheit</td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.cryptowars.info/dist/">http</a></td> - <td><a href="http://torproject.cryptowars.info/">http</a></td> - <td><a href="https://torproject.cryptowars.info/dist/">https</a></td> - <td><a href="https://torproject.cryptowars.info/">https</a></td> + <td><a href="http://tor.idnr.ws/dist/">http</a></td> + <td><a href="http://tor.idnr.ws/">http</a></td> <td> - </td> - <td><a href="rsync://torproject.cryptowars.info/">rsync</a></td> + <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>UK</td> + <td>EE</td> - <td></td> + <td>CyberSIDE</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.mage.me.uk/dist/">http</a></td> - <td><a href="http://tor.mage.me.uk/">http</a></td> + <td><a href="http://cyberside.net.ee/tor/">http</a></td> + <td><a href="http://cyberside.planet.ee/tor/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -358,83 +358,83 @@ <tr> - <td>DE</td> + <td>US</td> - <td></td> + <td>BarkerJr</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.dev-random.de/dist/">http</a></td> - <td><a href="http://tor.dev-random.de/">http</a></td> - <td><a href="https://tor.dev-random.de/dist/">https</a></td> - <td><a href="https://tor.dev-random.de/">https</a></td> + <td><a href="http://www.torproject.us/dist/">http</a></td> + <td><a href="http://www.torproject.us/">http</a></td> + <td><a href="https://www.torproject.us/dist/">https</a></td> + <td><a href="https://www.torproject.us/">https</a></td> <td> - </td> - <td> - </td> + <td><a href="rsync://rsync.torproject.us/tor">rsync</a></td> </tr> <tr> - <td>FR</td> + <td>IS</td> - <td>BarkerJr</td> + <td>myRL.net</td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.oignon.net/dist/">http</a></td> - <td><a href="http://www.oignon.net/">http</a></td> - <td><a href="https://www.oignon.net/dist/">https</a></td> - <td><a href="https://www.oignon.net/">https</a></td> + <td><a href="http://tor.myrl.net/dist/">http</a></td> + <td><a href="http://tor.myrl.net/">http</a></td> + <td><a href="https://tor.myrl.net/dist/">https</a></td> + <td><a href="https://tor.myrl.net/">https</a></td> <td> - </td> <td> - </td> </tr> <tr> - <td>AT</td> + <td>US</td> - <td>cyberarmy</td> + <td>hessmo</td> <td>Up to date</td> <td> - </td> + <td><a href="http://mirror.hessmo.com/tor/dist/">http</a></td> + <td><a href="http://mirror.hessmo.com/tor/">http</a></td> <td> - </td> - <td><a href="http://tor.cyberarmy.at/">http</a></td> <td> - </td> <td> - </td> <td> - </td> - <td> - </td> </tr> <tr> - <td>US</td> + <td>DE</td> <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.mirrors.whitedholdings.org/dist/">http</a></td> - <td><a href="http://tor.mirrors.whitedholdings.org/">http</a></td> - <td><a href="https://tor.mirrors.whitedholdings.org/dist/">https</a></td> - <td><a href="https://tor.mirrors.whitedholdings.org/">https</a></td> + <td><a href="http://tor.linuxlounge.net/dist/">http</a></td> + <td><a href="http://tor.linuxlounge.net/">http</a></td> + <td><a href="https://tor.linuxlounge.net/dist/">https</a></td> + <td><a href="https://tor.linuxlounge.net/">https</a></td> <td> - </td> - <td><a href="rsync://mirrors.whitedholdings.org/tor">rsync</a></td> + <td> - </td> </tr> <tr> - <td>FR</td> + <td>RO</td> - <td></td> + <td>me0w.cc</td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.c3l.lu/dist/">http</a></td> - <td><a href="http://torproject.c3l.lu/">http</a></td> + <td><a href="http://tor.me0w.cc/dist/">http</a></td> + <td><a href="http://tor.me0w.cc/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -443,32 +443,32 @@ <tr> - <td>FR</td> + <td>CH</td> <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.mirror.chekanov.net/dist/">http</a></td> - <td><a href="http://tor.mirror.chekanov.net/">http</a></td> + <td><a href="http://torproject.pillo-srv.ch/dist/">http</a></td> + <td><a href="http://torproject.pillo-srv.ch/">http</a></td> + <td><a href="https://torproject.pillo-srv.ch/dist/">https</a></td> + <td><a href="https://torproject.pillo-srv.ch/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>DE</td> + <td>LT</td> - <td>chaos darmstadt</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/dist/">http</a></td> - <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/">http</a></td> + <td><a href="http://tor.vesta.nu/dist/">http</a></td> + <td><a href="http://tor.vesta.nu/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -477,117 +477,117 @@ <tr> - <td>US</td> + <td>EE</td> <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.onthegetgo.com/dist/">http</a></td> - <td><a href="http://tor.onthegetgo.com/">http</a></td> + <td><a href="http://tor.li/dist/">http</a></td> + <td><a href="http://tor.li/">http</a></td> + <td><a href="https://tor.li/dist/">https</a></td> + <td><a href="https://tor.li/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>HU</td> + <td>DE</td> - <td>Unknown</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirror.tor.hu/dist/">http</a></td> - <td><a href="http://mirror.tor.hu/">http</a></td> + <td><a href="http://torproject.cryptowars.info/dist/">http</a></td> + <td><a href="http://torproject.cryptowars.info/">http</a></td> + <td><a href="https://torproject.cryptowars.info/dist/">https</a></td> + <td><a href="https://torproject.cryptowars.info/">https</a></td> <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> + <td><a href="rsync://torproject.cryptowars.info/">rsync</a></td> </tr> <tr> - <td>US</td> + <td>FR</td> - <td></td> + <td>BarkerJr</td> <td>Up to date</td> <td> - </td> - <td><a href="http://199.175.55.215/dist/">http</a></td> - <td><a href="http://199.175.55.215/">http</a></td> + <td><a href="http://www.oignon.net/dist/">http</a></td> + <td><a href="http://www.oignon.net/">http</a></td> + <td><a href="https://www.oignon.net/dist/">https</a></td> + <td><a href="https://www.oignon.net/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>DE</td> + <td>AT</td> - <td>beme it</td> + <td>cyberarmy</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.beme-it.de/dist/">http</a></td> - <td><a href="http://tor.beme-it.de/">http</a></td> - <td><a href="https://tor.beme-it.de/dist/">https</a></td> - <td><a href="https://tor.beme-it.de/">https</a></td> <td> - </td> - <td><a href="rsync://tor.beme-it.de/tor">rsync</a></td> + <td><a href="http://tor.cyberarmy.at/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> <td>US</td> - <td>NW Linux</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.nwlinux.us/dist/">http</a></td> - <td><a href="http://torproject.nwlinux.us/">http</a></td> + <td><a href="http://tor.mirrors.whitedholdings.org/dist/">http</a></td> + <td><a href="http://tor.mirrors.whitedholdings.org/">http</a></td> + <td><a href="https://tor.mirrors.whitedholdings.org/dist/">https</a></td> + <td><a href="https://tor.mirrors.whitedholdings.org/">https</a></td> <td> - </td> - <td> - </td> - <td> - </td> - <td><a href="rsync://nwlinux.us/tor-web">rsync</a></td> + <td><a href="rsync://mirrors.whitedholdings.org/tor">rsync</a></td> </tr> <tr> - <td>US</td> + <td>FR</td> - <td>Xpdm</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproj.xpdm.us/dist/">http</a></td> - <td><a href="http://torproj.xpdm.us/">http</a></td> - <td><a href="https://torproj.xpdm.us/dist/">https</a></td> - <td><a href="https://torproj.xpdm.us/">https</a></td> + <td><a href="http://torproject.c3l.lu/dist/">http</a></td> + <td><a href="http://torproject.c3l.lu/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>IL</td> + <td>FR</td> - <td>Host4site</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirror.host4site.co.il/torproject.org/dist/">http</a></td> - <td><a href="http://mirror.host4site.co.il/torproject.org/">http</a></td> + <td><a href="http://tor.mirror.chekanov.net/dist/">http</a></td> + <td><a href="http://tor.mirror.chekanov.net/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -596,15 +596,15 @@ <tr> - <td>DE</td> + <td>HU</td> - <td>borgmann.tv</td> + <td>Unknown</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.borgmann.tv/dist/">http</a></td> - <td><a href="http://tor.borgmann.tv/">http</a></td> + <td><a href="http://mirror.tor.hu/dist/">http</a></td> + <td><a href="http://mirror.tor.hu/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -613,49 +613,49 @@ <tr> - <td>LU</td> + <td>US</td> - <td></td> + <td>NW Linux</td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.adamas.ai/dist/">http</a></td> - <td><a href="http://torproject.adamas.ai/">http</a></td> + <td><a href="http://torproject.nwlinux.us/dist/">http</a></td> + <td><a href="http://torproject.nwlinux.us/">http</a></td> <td> - </td> <td> - </td> <td> - </td> - <td> - </td> + <td><a href="rsync://nwlinux.us/tor-web">rsync</a></td> </tr> <tr> <td>US</td> - <td>AskApache</td> + <td>Xpdm</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.askapache.com/dist/">http</a></td> - <td><a href="http://tor.askapache.com/">http</a></td> + <td><a href="http://torproj.xpdm.us/dist/">http</a></td> + <td><a href="http://torproj.xpdm.us/">http</a></td> + <td><a href="https://torproj.xpdm.us/dist/">https</a></td> + <td><a href="https://torproj.xpdm.us/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>US</td> + <td>IL</td> - <td></td> + <td>Host4site</td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirror.nametoday.me/tor/dist/">http</a></td> - <td><a href="http://mirror.nametoday.me/tor/">http</a></td> + <td><a href="http://mirror.host4site.co.il/torproject.org/dist/">http</a></td> + <td><a href="http://mirror.host4site.co.il/torproject.org/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -664,15 +664,15 @@ <tr> - <td>FR</td> + <td>LU</td> - <td>LazyTiger</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.taiga-san.net/dist/">http</a></td> - <td><a href="http://tor.taiga-san.net/">http</a></td> + <td><a href="http://torproject.adamas.ai/dist/">http</a></td> + <td><a href="http://torproject.adamas.ai/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -681,15 +681,15 @@ <tr> - <td>IS</td> + <td>US</td> - <td>TheOnionRouter</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://theonionrouter.com/dist/">http</a></td> - <td><a href="http://theonionrouter.com/">http</a></td> + <td><a href="http://mirror.nametoday.me/tor/dist/">http</a></td> + <td><a href="http://mirror.nametoday.me/tor/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -698,19 +698,19 @@ <tr> - <td>GB</td> + <td>FR</td> - <td>torland</td> + <td>LazyTiger</td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirror.torland.me/torproject.org/dist/">http</a></td> - <td><a href="http://mirror.torland.me/torproject.org/">http</a></td> - <td><a href="https://mirror.torland.me/torproject.org/dist/">https</a></td> - <td><a href="https://mirror.torland.me/torproject.org/">https</a></td> + <td><a href="http://tor.taiga-san.net/dist/">http</a></td> + <td><a href="http://tor.taiga-san.net/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> @@ -749,19 +749,19 @@ <tr> - <td>INT</td> + <td>DE</td> - <td>CoralCDN</td> + <td>[[:bbs:]]</td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> - <td><a href="http://www.torproject.org.nyud.net/">http</a></td> + <td><a href="http://tor.blingblingsquad.net/dist/">http</a></td> + <td><a href="http://tor.blingblingsquad.net/">http</a></td> + <td><a href="https://tor.blingblingsquad.net/dist/">https</a></td> + <td><a href="https://tor.blingblingsquad.net/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> @@ -936,51 +936,68 @@ <tr> - <td>NL</td> + <td>UK</td> <td></td> - <td>Out of date</td> + <td>Unknown</td> <td> - </td> + <td><a href="http://tor.mage.me.uk/dist/">http</a></td> + <td><a href="http://tor.mage.me.uk/">http</a></td> <td> - </td> <td> - </td> - <td><a href="https://www.coevoet.nl/tor/dist/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> </tr> <tr> - <td>RU</td> + <td>US</td> - <td>Soviet Anonymous</td> + <td></td> <td>Unknown</td> + <td><a href="ftp://mirrors.go-part.com/tor/dist/">ftp</a></td> + <td><a href="http://mirrors.go-part.com/tor/dist/">http</a></td> <td> - </td> - <td><a href="http://creep.im/tor/dist/">http</a></td> - <td><a href="http://creep.im/tor">http</a></td> - <td><a href="https://creep.im/tor/dist/">https</a></td> - <td><a href="https://creep.im/tor">https</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>DE</td> + <td>NL</td> - <td>[[:bbs:]]</td> + <td></td> + <td>Out of date</td> + + <td> - </td> + <td> - </td> + <td> - </td> + <td><a href="https://www.coevoet.nl/tor/dist/">https</a></td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>RU</td> + + <td>Soviet Anonymous</td> + <td>Unknown</td> <td> - </td> - <td><a href="http://tor.blingblingsquad.net/dist/">http</a></td> - <td><a href="http://tor.blingblingsquad.net/">http</a></td> - <td><a href="https://tor.blingblingsquad.net/dist/">https</a></td> - <td><a href="https://tor.blingblingsquad.net/">https</a></td> + <td><a href="http://creep.im/tor/dist/">http</a></td> + <td><a href="http://creep.im/tor">http</a></td> + <td><a href="https://creep.im/tor/dist/">https</a></td> + <td><a href="https://creep.im/tor">https</a></td> <td> - </td> <td> - </td> </tr> Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2013-03-05 18:07:31 UTC (rev 26074) +++ website/trunk/update-mirrors.pl 2013-03-05 19:31:10 UTC (rev 26075) @@ -1160,6 +1160,24 @@ httpsDistMirror => "https://tor.linuxlounge.net/dist/", rsyncDistMirror => "", hiddenServiceMirror => "", + }, + mirror088 => { + adminContact => "", + orgName => "", + isoCC => "US", + subRegion => "", + region => "US", + ipv4 => "True", + ipv6 => "False", + loadBalanced => "No", + httpWebsiteMirror => "", + httpsWebsiteMirror => "", + rsyncWebsiteMirror => "", + ftpWebsiteMirror => "ftp://mirrors.go-part.com/tor/dist/", + httpDistMirror => "http://mirrors.go-part.com/tor/dist/", + httpsDistMirror => "", + rsyncDistMirror => "rsync://mirrors.go-part.com/tor/dist/", + hiddenServiceMirror => "", } );

1 0

r26074: {website} tails now takes bitcoins. (website/trunk/donate/en)
by Andrew Lewman 05 Mar '13

05 Mar '13

Author: phobos Date: 2013-03-05 18:07:31 +0000 (Tue, 05 Mar 2013) New Revision: 26074 Modified: website/trunk/donate/en/donate.wml Log: tails now takes bitcoins. Modified: website/trunk/donate/en/donate.wml =================================================================== --- website/trunk/donate/en/donate.wml 2013-03-05 08:50:04 UTC (rev 26073) +++ website/trunk/donate/en/donate.wml 2013-03-05 18:07:31 UTC (rev 26074) @@ -227,8 +227,9 @@ <div class="dbox donate"> <h3>Bitcoins</h3> <p>Instead of donating bitcoins to Tor, please consider a donation to - <a href="https://www.torservers.net/donate.html">Torservers.net</a> - or <a href="https://help.riseup.net/en/donate#bitcoin">Riseup</a> + <a href="https://www.torservers.net/donate.html">Torservers.net</a>, + <a href="https://help.riseup.net/en/donate#bitcoin">Riseup</a>, + or <a href="https://tails.boum.org/contribute/how/donate/#bitcoin">Tails</a> which will turn your bitcoin donation into a faster, larger Tor Network for all.</p> </div>

1 0

[translation/vidalia_help_completed] Update translations for vidalia_help_completed
by translation＠torproject.org 05 Mar '13

05 Mar '13

commit 0f7f0682f6fda6d79e380c74941595db803098b1 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 5 09:15:59 2013 +0000 Update translations for vidalia_help_completed --- zh_CN/running.po | 151 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 151 insertions(+), 0 deletions(-) diff --git a/zh_CN/running.po b/zh_CN/running.po new file mode 100644 index 0000000..a48db39 --- /dev/null +++ b/zh_CN/running.po @@ -0,0 +1,151 @@ +# +# Translators: +# chen zhang <magnyfx(a)hotmail.com>, 2011. +# <hua5679(a)gmail.com>, 2012. +msgid "" +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: 2013-03-05 08:51+0000\n" +"Last-Translator: simabull tsai <tsaizb(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" +"Content-Transfer-Encoding: 8bit\n" +"Language: zh_CN\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#. type: Content of: <html><body><h1> +#: en/running.html:16 +msgid "Running Tor" +msgstr "运行Tor" + +#. type: Content of: <html><body><p> +#: en/running.html:20 +msgid "" +"Vidalia can help you control your Tor process by letting you start and stop " +"Tor, as well as monitoring Tor's status and letting you know if it exits " +"unexpectedly." +msgstr "Vidalia的可以帮助您控制Tor进程，让您启动和停止的Tor，以及监视Tor的状态，让你知道，如果它退出意外。" + +#. type: Content of: <html><body> +#: en/running.html:25 +msgid "<a name=\"starting\"/>" +msgstr "<a name=\"starting\"/>" + +#. type: Content of: <html><body><h3> +#: en/running.html:26 +msgid "Starting and Stopping Tor" +msgstr "启动或停止Tor" + +#. type: Content of: <html><body><p> +#: en/running.html:28 +msgid "To <i>start</i> Tor," +msgstr "<i>启动</i> Tor," + +#. type: Content of: <html><body><p><ol><li> +#: en/running.html:30 +msgid "Select <i>Start</i> from Vidalia's tray menu or press <i>Ctrl+S</i>" +msgstr "从Vidalia的托盘菜单选择<i>启动</i> 或者按 <i>Ctrl+S</i>" + +#. type: Content of: <html><body><p><ol> +#: en/running.html:30 en/running.html:45 +msgid "." +msgstr "." + +#. type: Content of: <html><body><p><ol><li> +#: en/running.html:32 +msgid "" +"Vidalia's tray icon will change from an onion with a red X to a green onion " +"when Tor has started." +msgstr "当Tor开启时，Vidalia在系统托盘上的图标会从有X的红色洋葱变成绿色洋葱。" + +#. type: Content of: <html><body><p> +#: en/running.html:36 +msgid "" +"If Vidalia is unable to start Tor, Vidalia will display an error message " +"telling you what went wrong. You can also look at your <a " +"href=\"log.html\">message log</a> to see if Tor printed any more information" +" about what went wrong." +msgstr "如果无法停止 Tor，Vidalia 将显示错误消息，告知用户何处出错。另外，可查看 <a href=\"log.html\">消息日志</a>来查看 Tor 是否提供了更多有关何处出错的信息。" + +#. type: Content of: <html><body><p> +#: en/running.html:43 +msgid "To <i>stop</i> Tor," +msgstr "<i>停止</i> Tor," + +#. type: Content of: <html><body><p><ol><li> +#: en/running.html:45 +msgid "Select <i>Stop</i> from Vidalia's tray menu or press <i>Ctrl+T</i>" +msgstr "请从 Vidalia 的系统托盘菜单选择<i>停止</i>或按 <i>Ctrl+T</i>" + +#. type: Content of: <html><body><p><ol><li> +#: en/running.html:47 +msgid "" +"Vidalia's tray icon will change from a green onion to a gray onion with a " +"red X when Tor has stopped." +msgstr "如果 Tor 已停止，Vidalia 的系统托盘图标将从绿色洋葱变为带有红色 X 的灰色洋葱。" + +#. type: Content of: <html><body><p> +#: en/running.html:51 +msgid "" +"If Vidalia was unable to stop Tor, Vidalia will display an error message " +"telling you what went wrong. You can also look at your <a " +"href=\"log.html\">message log</a> to see if Tor printed any more information" +" about what went wrong." +msgstr "如果无法停止 Tor，Vidalia 将显示错误消息，告知用户何处出错。另外，可查看 <a href=\"log.html\">消息日志</a>来查看 Tor 是否提供了更多有关何处出错的信息。" + +#. type: Content of: <html><body> +#: en/running.html:57 +msgid "<a name=\"monitoring\"/>" +msgstr "<a name=\"monitoring\"/>" + +#. type: Content of: <html><body><h3> +#: en/running.html:58 +msgid "Monitoring Tor's Status" +msgstr "监控Tor的状态" + +#. type: Content of: <html><body><p> +#: en/running.html:60 +msgid "" +"Vidalia tells you about the status of Tor by displaying an icon in your " +"system tray or dock area. The following table shows the different states " +"indicated by an icon in your system's notification area:" +msgstr "Vidalia 通过在系统托盘或通知区域中的图标来显示 Tor 的状态。下表提供了系统通知区域中不同图标所代表的状态：" + +#. type: Content of: <html><body><p><table><tr><td> +#: en/running.html:69 +msgid "" +"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor." +msgstr "Tor处于停止状态。选择Vidalia菜单上的 <i>开始</i> 来开启Tor。" + +#. type: Content of: <html><body><p><table><tr><td> +#: en/running.html:76 +msgid "" +"Tor is starting up. You can check the <a href=\"log.html\">message log</a> " +"for status information about Tor while it is starting." +msgstr "Tor 正在启动。可查看<a href=\"log.html\">消息日志</a>来获取有关 Tor 启动时的状态信息。" + +#. type: Content of: <html><body><p><table><tr><td> +#: en/running.html:84 +msgid "" +"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia" +" menu. Tor will print informational messages to the <a " +"href=\"log.html\">message log</a> while it is running, if you want to see " +"what Tor is doing." +msgstr "Tor 正在运行。如果需要停止 Tor，请从 Vidalia 菜单选择<i>停止</i>。在运行期间，Tor 将通知消息保存至<a href=\"log.html\">消息日志</a>，如果想要了解 Tor 的工作可查看该日志。" + +#. type: Content of: <html><body><p><table><tr><td> +#: en/running.html:92 +msgid "Tor is in the process of shutting down." +msgstr "Tor 正在关闭。" + +#. type: Content of: <html><body><p> +#: en/running.html:98 +msgid "" +"If Tor exits unexpectedly, Vidalia will change its icon to the dark onion " +"with a red X and display an error message letting you know what went wrong. " +"You can also check the <a href=\"log.html\">message log</a> for details " +"about any problems Tor encountered before it exited." +msgstr "如果 Tor 非正常退出，Vidalia 的图标将变为带有红色 X 的灰色洋葱，并显示错误消息，以便让用户获悉何处出错。另外，可查看 <a href=\"log.html\">消息日志</a>来获取 Tor 在退出之前发生的故障。"

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 05 Mar '13

05 Mar '13

commit 90244346fc3ab993578d109c579d1b50cbe5dc9b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 5 09:15:48 2013 +0000 Update translations for vidalia_help --- zh_CN/running.po | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/zh_CN/running.po b/zh_CN/running.po index 398df7a..a48db39 100644 --- a/zh_CN/running.po +++ b/zh_CN/running.po @@ -7,14 +7,14 @@ 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-02-14 10:03+0000\n" -"Last-Translator: zhenghua1991 <hua5679(a)gmail.com>\n" +"PO-Revision-Date: 2013-03-05 08:51+0000\n" +"Last-Translator: simabull tsai <tsaizb(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" "Content-Transfer-Encoding: 8bit\n" "Language: zh_CN\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Plural-Forms: nplurals=1; plural=0;\n" #. type: Content of: <html><body><h1> #: en/running.html:16 @@ -68,7 +68,7 @@ msgid "" "telling you what went wrong. You can also look at your <a " "href=\"log.html\">message log</a> to see if Tor printed any more information" " about what went wrong." -msgstr "" +msgstr "如果无法停止 Tor，Vidalia 将显示错误消息，告知用户何处出错。另外，可查看 <a href=\"log.html\">消息日志</a>来查看 Tor 是否提供了更多有关何处出错的信息。" #. type: Content of: <html><body><p> #: en/running.html:43 @@ -78,14 +78,14 @@ msgstr "<i>停止</i> Tor," #. type: Content of: <html><body><p><ol><li> #: en/running.html:45 msgid "Select <i>Stop</i> from Vidalia's tray menu or press <i>Ctrl+T</i>" -msgstr "" +msgstr "请从 Vidalia 的系统托盘菜单选择<i>停止</i>或按 <i>Ctrl+T</i>" #. type: Content of: <html><body><p><ol><li> #: en/running.html:47 msgid "" "Vidalia's tray icon will change from a green onion to a gray onion with a " "red X when Tor has stopped." -msgstr "" +msgstr "如果 Tor 已停止，Vidalia 的系统托盘图标将从绿色洋葱变为带有红色 X 的灰色洋葱。" #. type: Content of: <html><body><p> #: en/running.html:51 @@ -94,7 +94,7 @@ msgid "" "telling you what went wrong. You can also look at your <a " "href=\"log.html\">message log</a> to see if Tor printed any more information" " about what went wrong." -msgstr "" +msgstr "如果无法停止 Tor，Vidalia 将显示错误消息，告知用户何处出错。另外，可查看 <a href=\"log.html\">消息日志</a>来查看 Tor 是否提供了更多有关何处出错的信息。" #. type: Content of: <html><body> #: en/running.html:57 @@ -112,7 +112,7 @@ msgid "" "Vidalia tells you about the status of Tor by displaying an icon in your " "system tray or dock area. The following table shows the different states " "indicated by an icon in your system's notification area:" -msgstr "" +msgstr "Vidalia 通过在系统托盘或通知区域中的图标来显示 Tor 的状态。下表提供了系统通知区域中不同图标所代表的状态：" #. type: Content of: <html><body><p><table><tr><td> #: en/running.html:69 @@ -125,7 +125,7 @@ msgstr "Tor处于停止状态。选择Vidalia菜单上的 <i>开始</i> 来开 msgid "" "Tor is starting up. You can check the <a href=\"log.html\">message log</a> " "for status information about Tor while it is starting." -msgstr "" +msgstr "Tor 正在启动。可查看<a href=\"log.html\">消息日志</a>来获取有关 Tor 启动时的状态信息。" #. type: Content of: <html><body><p><table><tr><td> #: en/running.html:84 @@ -134,12 +134,12 @@ msgid "" " menu. Tor will print informational messages to the <a " "href=\"log.html\">message log</a> while it is running, if you want to see " "what Tor is doing." -msgstr "" +msgstr "Tor 正在运行。如果需要停止 Tor，请从 Vidalia 菜单选择<i>停止</i>。在运行期间，Tor 将通知消息保存至<a href=\"log.html\">消息日志</a>，如果想要了解 Tor 的工作可查看该日志。" #. type: Content of: <html><body><p><table><tr><td> #: en/running.html:92 msgid "Tor is in the process of shutting down." -msgstr "" +msgstr "Tor 正在关闭。" #. type: Content of: <html><body><p> #: en/running.html:98 @@ -148,4 +148,4 @@ msgid "" "with a red X and display an error message letting you know what went wrong. " "You can also check the <a href=\"log.html\">message log</a> for details " "about any problems Tor encountered before it exited." -msgstr "" +msgstr "如果 Tor 非正常退出，Vidalia 的图标将变为带有红色 X 的灰色洋葱，并显示错误消息，以便让用户获悉何处出错。另外，可查看 <a href=\"log.html\">消息日志</a>来获取 Tor 在退出之前发生的故障。"

1 0

r26073: {website} put the project coordinator line back, since it's already in (website/trunk/about/en)
by Roger Dingledine 05 Mar '13

05 Mar '13

Author: arma Date: 2013-03-05 08:50:04 +0000 (Tue, 05 Mar 2013) New Revision: 26073 Modified: website/trunk/about/en/jobs.wml Log: put the project coordinator line back, since it's already in the "for posterity" section. then make the "for posterity" section more obviously like that. Modified: website/trunk/about/en/jobs.wml =================================================================== --- website/trunk/about/en/jobs.wml 2013-03-04 17:07:58 UTC (rev 26072) +++ website/trunk/about/en/jobs.wml 2013-03-05 08:50:04 UTC (rev 26073) @@ -19,12 +19,12 @@ <li><a href="<page about/jobs-pluggabletransport>">Pluggable transport developer</a></li> </ul> -<p>In the past (and hopefully again in the future, when we have more -funding), we looked for the following people:</p> +<p>In the past, we looked for the following people:</p> <ul> <li><a href="<page about/jobs-coredev>">Core developer</a></li> <li><a href="<page about/jobs-translatorsupport>">Support assistants and translators</a></li> +<li><a href="<page about/jobs-projectcoordinator>">Project coordinator</a></li> <li><a href="<page about/jobs-browserhacker>">Browser hacker</a></li> </ul>

1 0