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

[obfs-flash/master] Set TOR_PT_EXTENDED_SERVER_PORT= for websocket-server.
by dcf＠torproject.org 04 Dec '13

04 Dec '13

commit e5184672b8180f16a32a41375a40ab65bbe5e6b3 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Dec 3 19:05:04 2013 -0800 Set TOR_PT_EXTENDED_SERVER_PORT= for websocket-server. This doesn't change behavior, because websocket-server ignores an absent environment variable. But this makes it match the setup for obfsproxy, which insists on having the variable set. --- obfs-flash-server.go | 1 + 1 file changed, 1 insertion(+) diff --git a/obfs-flash-server.go b/obfs-flash-server.go index d429594..6678e13 100644 --- a/obfs-flash-server.go +++ b/obfs-flash-server.go @@ -196,6 +196,7 @@ func startProcesses(connectBackAddr net.Addr) (extBindAddr *net.TCPAddr, procs P cmd.Env = []string{ "TOR_PT_MANAGED_TRANSPORT_VER=1", "TOR_PT_STATE_LOCATION=" + os.Getenv("TOR_PT_STATE_LOCATION"), + "TOR_PT_EXTENDED_SERVER_PORT=", "TOR_PT_ORPORT=" + midBindAddr.String(), "TOR_PT_SERVER_TRANSPORTS=websocket", "TOR_PT_SERVER_BINDADDR=websocket-127.0.0.1:0",

1 0

[obfs-flash/master] Implement startProcesses as a loop.
by dcf＠torproject.org 04 Dec '13

04 Dec '13

commit e64ac21625492499a30805c8332626776485c188 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Dec 3 19:53:01 2013 -0800 Implement startProcesses as a loop. It's reading from a static list of method names and commands. --- obfs-flash-server.go | 104 +++++++++++++++++++++----------------------------- 1 file changed, 44 insertions(+), 60 deletions(-) diff --git a/obfs-flash-server.go b/obfs-flash-server.go index 6678e13..e70b842 100644 --- a/obfs-flash-server.go +++ b/obfs-flash-server.go @@ -148,8 +148,14 @@ func findBindAddr(r io.Reader, methodName string) (*net.TCPAddr, error) { return nil, errors.New(fmt.Sprintf("no SMETHOD %s found before SMETHODS DONE", methodName)) } -func startProcesses(connectBackAddr net.Addr) (extBindAddr *net.TCPAddr, procs ProcList, err error) { - var midBindAddr *net.TCPAddr +// Represents a server transport plugin configuration like: +// ServerTransportPlugin MethodName exec Command +type ServerTransportPlugin struct { + MethodName string + Command []string +} + +func startProcesses(connectBackAddr net.Addr) (bindAddr *net.TCPAddr, procs ProcList, err error) { var stdout io.ReadCloser defer func() { @@ -160,69 +166,47 @@ func startProcesses(connectBackAddr net.Addr) (extBindAddr *net.TCPAddr, procs P } }() - // obfsproxy talks to connectBackAddr and listens on midBindAddr. - cmd := exec.Command("obfsproxy", "managed") - cmd.Env = []string{ - "TOR_PT_MANAGED_TRANSPORT_VER=1", - "TOR_PT_STATE_LOCATION=" + os.Getenv("TOR_PT_STATE_LOCATION"), - "TOR_PT_EXTENDED_SERVER_PORT=", - "TOR_PT_ORPORT=" + connectBackAddr.String(), - "TOR_PT_SERVER_TRANSPORTS=obfs3", - "TOR_PT_SERVER_BINDADDR=obfs3-127.0.0.1:0", - } - log("obfsproxy environment %q", cmd.Env) - stdout, err = cmd.StdoutPipe() - if err != nil { - log("Failed to open obfsproxy stdout pipe: %s.", err) - return - } - err = cmd.Start() - if err != nil { - log("Failed to start obfsproxy: %s.", err) - return + plugins := []ServerTransportPlugin{ + {"obfs3", []string{"obfsproxy", "managed"}}, + {"websocket", []string{"websocket-server"}}, } - log("Exec %s with args %q pid %d.", cmd.Path, cmd.Args, cmd.Process.Pid) - procs = append(procs, cmd.Process) - midBindAddr, err = findBindAddr(stdout, "obfs3") - if err != nil { - log("Failed to find obfsproxy bindaddr: %s.", err) - return - } - log("obfsproxy bindaddr is %s.", midBindAddr) - - // websocket-server talks to midBindAddr and listens on extBindAddr. - cmd = exec.Command("websocket-server") - cmd.Env = []string{ - "TOR_PT_MANAGED_TRANSPORT_VER=1", - "TOR_PT_STATE_LOCATION=" + os.Getenv("TOR_PT_STATE_LOCATION"), - "TOR_PT_EXTENDED_SERVER_PORT=", - "TOR_PT_ORPORT=" + midBindAddr.String(), - "TOR_PT_SERVER_TRANSPORTS=websocket", - "TOR_PT_SERVER_BINDADDR=websocket-127.0.0.1:0", - } - log("websocket-server environment %q", cmd.Env) - stdout, err = cmd.StdoutPipe() - if err != nil { - log("Failed to open websocket-server stdout pipe: %s.", err) - return - } - err = cmd.Start() - if err != nil { - log("Failed to start websocket-server: %s.", err) - return - } - log("Exec %s with args %q pid %d.", cmd.Path, cmd.Args, cmd.Process.Pid) - procs = append(procs, cmd.Process) + bindAddr = connectBackAddr.(*net.TCPAddr) + for _, plugin := range plugins { + // This plugin has its TOR_PT_ORPORT set to the previous + // bindAddr. + cmd := exec.Command(plugin.Command[0], plugin.Command[1:]...) + cmd.Env = []string{ + "TOR_PT_MANAGED_TRANSPORT_VER=1", + "TOR_PT_STATE_LOCATION=" + os.Getenv("TOR_PT_STATE_LOCATION"), + "TOR_PT_EXTENDED_SERVER_PORT=", + "TOR_PT_ORPORT=" + bindAddr.String(), + "TOR_PT_SERVER_TRANSPORTS=" + plugin.MethodName, + "TOR_PT_SERVER_BINDADDR=" + plugin.MethodName + "-127.0.0.1:0", + } + log("%s environment %q", cmd.Args[0], cmd.Env) + stdout, err = cmd.StdoutPipe() + if err != nil { + log("Failed to open %s stdout pipe: %s.", cmd.Args[0], err) + return + } + err = cmd.Start() + if err != nil { + log("Failed to start %s: %s.", cmd.Args[0], err) + return + } + log("Exec %s with args %q pid %d.", cmd.Path, cmd.Args, cmd.Process.Pid) + procs = append(procs, cmd.Process) - extBindAddr, err = findBindAddr(stdout, "websocket") - if err != nil { - log("Failed to find websocket-server bindaddr: %s.", err) - return + bindAddr, err = findBindAddr(stdout, plugin.MethodName) + if err != nil { + log("Failed to find %s bindaddr: %s.", cmd.Args[0], err) + return + } + log("%s bindaddr is %s.", cmd.Args[0], bindAddr) } - log("websocket-server bindaddr is %s.", extBindAddr) - return extBindAddr, procs, err + return bindAddr, procs, err } func acceptLoop(name string, ln *net.TCPListener, ch chan *net.TCPConn) {

1 0

[obfs-flash/master] Simulate loading configuration from a file.
by dcf＠torproject.org 04 Dec '13

04 Dec '13

commit 34047d7cae18337ff9eb56809f3cd2447a85c894 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 4 01:56:02 2013 -0800 Simulate loading configuration from a file. --- obfs-flash-server.go | 76 +++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 66 insertions(+), 10 deletions(-) diff --git a/obfs-flash-server.go b/obfs-flash-server.go index e70b842..20b5b65 100644 --- a/obfs-flash-server.go +++ b/obfs-flash-server.go @@ -155,7 +155,7 @@ type ServerTransportPlugin struct { Command []string } -func startProcesses(connectBackAddr net.Addr) (bindAddr *net.TCPAddr, procs ProcList, err error) { +func startProcesses(connectBackAddr net.Addr, plugins []ServerTransportPlugin) (bindAddr *net.TCPAddr, procs ProcList, err error) { var stdout io.ReadCloser defer func() { @@ -166,11 +166,6 @@ func startProcesses(connectBackAddr net.Addr) (bindAddr *net.TCPAddr, procs Proc } }() - plugins := []ServerTransportPlugin{ - {"obfs3", []string{"obfsproxy", "managed"}}, - {"websocket", []string{"websocket-server"}}, - } - bindAddr = connectBackAddr.(*net.TCPAddr) for _, plugin := range plugins { // This plugin has its TOR_PT_ORPORT set to the previous @@ -327,7 +322,7 @@ loop: } } -func startChain(bindAddr *net.TCPAddr) (*Chain, error) { +func startChain(bindAddr *net.TCPAddr, plugins []ServerTransportPlugin) (*Chain, error) { chain := &Chain{} var err error @@ -343,7 +338,7 @@ func startChain(bindAddr *net.TCPAddr) (*Chain, error) { log("Internal listener on %s.", chain.IntLn.Addr()) // Start subprocesses. - chain.ProcsAddr, chain.Procs, err = startProcesses(chain.IntLn.Addr()) + chain.ProcsAddr, chain.Procs, err = startProcesses(chain.IntLn.Addr(), plugins) if err != nil { log("Error starting proxy chain: %s.", err) chain.Shutdown() @@ -366,6 +361,59 @@ func startChain(bindAddr *net.TCPAddr) (*Chain, error) { return chain, nil } +type Configuration struct { + // Map from method names to command strings. + Transports map[string][]string + // Map from tor-friendly names like "obfs3_websocket" to systematic + // names like "obfs3|websocket". + Aliases map[string]string +} + +func (conf *Configuration) MethodNames() []string { + result := make([]string, 0) + // We understand all the single transports + for k, _ := range conf.Transports { + result = append(result, k) + } + // and aliases. + for k, _ := range conf.Aliases { + result = append(result, k) + } + return result +} + +// Parse a (possibly composed) method name into a slice of single method names. +func (conf *Configuration) ParseMethodName(methodName string) []string { + if name, ok := conf.Aliases[methodName]; ok { + methodName = name + } + return strings.Split(methodName, "|") +} + +func (conf *Configuration) PluginList(methodName string) ([]ServerTransportPlugin, error) { + names := conf.ParseMethodName(methodName) + stp := make([]ServerTransportPlugin, 0) + for _, name := range names { + command, ok := conf.Transports[name] + if !ok { + return nil, errors.New(fmt.Sprintf("no transport named %q", name)) + } + stp = append(stp, ServerTransportPlugin{name, command}) + } + return stp, nil +} + +// Simulate loading a configuration file. +func getConfiguration() (conf *Configuration) { + conf = new(Configuration) + conf.Transports = make(map[string][]string) + conf.Aliases = make(map[string]string) + conf.Transports["obfs3"] = []string{"obfsproxy", "managed"} + conf.Transports["websocket"] = []string{"websocket-server"} + conf.Aliases["obfs3_websocket"] = "obfs3|websocket" + return conf +} + func main() { var logFilename string var port int @@ -385,7 +433,9 @@ func main() { } log("Starting.") - ptInfo = pt.ServerSetup([]string{ptMethodName}) + + conf := getConfiguration() + ptInfo = pt.ServerSetup(conf.MethodNames()) chains := make([]*Chain, 0) for _, bindAddr := range ptInfo.BindAddrs { @@ -396,7 +446,13 @@ func main() { bindAddr.Addr.Port = port } - chain, err := startChain(bindAddr.Addr) + plugins, err := conf.PluginList(bindAddr.MethodName) + if err != nil { + pt.SmethodError(bindAddr.MethodName, err.Error()) + continue + } + + chain, err := startChain(bindAddr.Addr, plugins) if err != nil { pt.SmethodError(bindAddr.MethodName, err.Error()) continue

1 0

[torbutton/master] Bump Torbuton version to pre-release for real.
by mikeperry＠torproject.org 04 Dec '13

04 Dec '13

commit 8ee97c8ab3892a6d329a9a632f74d440fb2ab8b4 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Dec 4 01:35:45 2013 -0800 Bump Torbuton version to pre-release for real. This time without the commit screw-up. --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index eed2a47..3dd60f7 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.6.4.1</em:version> + <em:version>1.6.5pre</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[torbutton/master] Revert "Bump Torbuton version to pre-release."
by mikeperry＠torproject.org 04 Dec '13

04 Dec '13

commit 7eb48fb4eeec46266f50d561cb0d645680cf8b8c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Dec 4 01:35:09 2013 -0800 Revert "Bump Torbuton version to pre-release." This reverts commit 609d5c25f035368c9fcc5c5a764f6529b8f612ca, which accidentally committed some working changes. --- src/chrome/content/stanford-safecache.js | 19 +++---------------- src/install.rdf | 2 +- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/src/chrome/content/stanford-safecache.js b/src/chrome/content/stanford-safecache.js index a333e29..48f6d88 100644 --- a/src/chrome/content/stanford-safecache.js +++ b/src/chrome/content/stanford-safecache.js @@ -61,10 +61,7 @@ function SSC_dump(msg) { function SSC_RequestListener(controller) { this.controller = controller; - this.thirdPartyUtil = Cc["@mozilla.org/thirdpartyutil;1"]. - getService(Ci.mozIThirdPartyUtil); - this.cookie_permissions = Cc["@mozilla.org/cookie/permission;1"]. - getService(Ci.nsICookiePermission); + this.cookie_permissions = Cc["@mozilla.org/cookie/permission;1"].getService(Ci.nsICookiePermission); } SSC_RequestListener.prototype = @@ -80,13 +77,11 @@ SSC_RequestListener.prototype = subject.QueryInterface(Components.interfaces.nsIHttpChannel); subject.QueryInterface(Components.interfaces.nsIHttpChannelInternal); subject.QueryInterface(Components.interfaces.nsICachingChannel); - subject.QueryInterface(Components.interfaces.nsIChannel); this.onModifyRequest(subject); } else if (topic == 'http-on-examine-response') { subject.QueryInterface(Components.interfaces.nsIHttpChannel); subject.QueryInterface(Components.interfaces.nsIHttpChannelInternal); subject.QueryInterface(Components.interfaces.nsICachingChannel); - subject.QueryInterface(Components.interfaces.nsIChannel); this.onExamineResponse(subject); } } catch(e) {try {torbutton_log(4, "SSC: "+e);} catch(ex) {}} @@ -140,19 +135,11 @@ SSC_RequestListener.prototype = } else if(!parent_host) { // Questionable first party interaction.. try { - var anuri = null; - try { - anuri = this.thirdPartyUtil.getFirstPartyURI(channel, null); - } catch (e) { - torbutton_safelog(4, "FirstParty API failed to get parent: "+e, channel.URI.spec); - // We are not using the TBB based on ESR 24. Falling back to the old - // method. - anuri = this.cookie_permissions.getOriginatingURI(channel); - } + var anuri = this.cookie_permissions.getOriginatingURI(channel); parent_host = anuri.host; parent_spec = anuri.spec; } catch(e) { - torbutton_safelog(4, "Cookie API failed to get parent: "+e,channel.URI.spec); + torbutton_safelog(2, "Cookie API failed to get parent: "+e,channel.URI.spec); if (!channel.referrer) { torbutton_safelog(3, "SSC: No parent for ", channel.URI.spec); } else { diff --git a/src/install.rdf b/src/install.rdf index 3dd60f7..eed2a47 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.6.5pre</em:version> + <em:version>1.6.4.1</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 04 Dec '13

04 Dec '13

commit c85a233434e4a96eb77b0b47e379ecaca3445f42 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 4 07:45:59 2013 +0000 Update translations for liveusb-creator_completed --- pt_BR/pt_BR.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index 9bd106c..475796f 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -21,7 +21,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-11-30 15:23+0100\n" -"PO-Revision-Date: 2013-12-04 07:13+0000\n" +"PO-Revision-Date: 2013-12-04 07:40+0000\n" "Last-Translator: ebonsi\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -391,7 +391,7 @@ msgstr "Esta é a barra de progresso que vai indicar quanto falta do processo de #: ../liveusb/dialog.py:171 msgid "This is the status console, where all messages get written to." -msgstr "Este é o console de informação onde todas mensagens são mostradas." +msgstr "Este é o status do console onde todas mensagens são escritas." #: ../liveusb/creator.py:882 msgid "Trying to continue anyway." @@ -507,7 +507,7 @@ msgstr "Sistema de arquivos não suportado: %s" msgid "" "Unsupported filesystem: %s\n" "In case you are trying to upgrade a manually installed Tails system (that is, if it was installed without this installer), this option is not supported: you need to install it anew to start with, e.g. by choosing the \"Clone & Install\" action instead." -msgstr "Sistema de arquivos não suportado: %s\nCaso esteja tentando atualizar um sistema Tails instalado manualmente, ou seja, um que tenha sido instalado sem usar esta instalação, esta opção não é possível; é necessário que se instale de novo, isto é, se escolhendo a opção \"Clonar & Instalar\"." +msgstr "Sistema de arquivos não suportados: %s\nNo caso de você estiver tentando atualizar manualmente um sistema Tails já instalado (ou seja, se ele foi instalado sem esse instalador), esta opção não é suportada: você precisa ao invés, de instalá-lo de novo, escolhendo por exemplo a opção, \"Clonar & instalar\"." #: ../liveusb/creator.py:1216 #, python-format

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 04 Dec '13

04 Dec '13

commit c9de4fb98d2141a4ffa05a268e6650460c3fe3df Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 4 07:45:56 2013 +0000 Update translations for liveusb-creator --- pt_BR/pt_BR.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index 9bd106c..475796f 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -21,7 +21,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-11-30 15:23+0100\n" -"PO-Revision-Date: 2013-12-04 07:13+0000\n" +"PO-Revision-Date: 2013-12-04 07:40+0000\n" "Last-Translator: ebonsi\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -391,7 +391,7 @@ msgstr "Esta é a barra de progresso que vai indicar quanto falta do processo de #: ../liveusb/dialog.py:171 msgid "This is the status console, where all messages get written to." -msgstr "Este é o console de informação onde todas mensagens são mostradas." +msgstr "Este é o status do console onde todas mensagens são escritas." #: ../liveusb/creator.py:882 msgid "Trying to continue anyway." @@ -507,7 +507,7 @@ msgstr "Sistema de arquivos não suportado: %s" msgid "" "Unsupported filesystem: %s\n" "In case you are trying to upgrade a manually installed Tails system (that is, if it was installed without this installer), this option is not supported: you need to install it anew to start with, e.g. by choosing the \"Clone & Install\" action instead." -msgstr "Sistema de arquivos não suportado: %s\nCaso esteja tentando atualizar um sistema Tails instalado manualmente, ou seja, um que tenha sido instalado sem usar esta instalação, esta opção não é possível; é necessário que se instale de novo, isto é, se escolhendo a opção \"Clonar & Instalar\"." +msgstr "Sistema de arquivos não suportados: %s\nNo caso de você estiver tentando atualizar manualmente um sistema Tails já instalado (ou seja, se ele foi instalado sem esse instalador), esta opção não é suportada: você precisa ao invés, de instalá-lo de novo, escolhendo por exemplo a opção, \"Clonar & instalar\"." #: ../liveusb/creator.py:1216 #, python-format

1 0

r26448: {website} update the mirrors table and change the donation wording on (in website/trunk: download/en include)
by Andrew Lewman 04 Dec '13

04 Dec '13

Author: phobos Date: 2013-12-04 07:15:58 +0000 (Wed, 04 Dec 2013) New Revision: 26448 Modified: website/trunk/download/en/download-easy.wml website/trunk/include/mirrors-table.wmi Log: update the mirrors table and change the donation wording on download-easy. Modified: website/trunk/download/en/download-easy.wml =================================================================== --- website/trunk/download/en/download-easy.wml 2013-12-03 21:45:01 UTC (rev 26447) +++ website/trunk/download/en/download-easy.wml 2013-12-04 07:15:58 UTC (rev 26448) @@ -261,7 +261,7 @@ }); </script> <form class="dbox dl" action="https://www.paypal.com/cgi-bin/webscr" method="post"> - <h2>Donate to Tor</h2> + <h2>Help create more Tor!</h2> <p> <select name="currency_code" class="cur"> <option value="USD" selected="selected">$</option> Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2013-12-03 21:45:01 UTC (rev 26447) +++ website/trunk/include/mirrors-table.wmi 2013-12-04 07:15:58 UTC (rev 26448) @@ -1,6 +1,23 @@ <tr> + <td>INT</td> + + <td>CoralCDN</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> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>CZ</td> <td>Lightning-bolt.net</td> @@ -205,6 +222,23 @@ <tr> + <td>FR</td> + + <td></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> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>DE</td> <td>chaos darmstadt</td> @@ -222,8 +256,42 @@ <tr> + <td>IS</td> + + <td>Frenn vun der Enn A.S.B.L.</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://torproject.lu/dist/">http</a></td> + <td><a href="http://torproject.lu/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>US</td> + <td>HackThisSite.org</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://mirror.hackthissite.org/tor">http</a></td> + <td><a href="http://tor.hackthissite.org/">http</a></td> + <td><a href="https://mirror.hackthissite.org/tor">https</a></td> + <td><a href="https://tor.hackthissite.org/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>US</td> + <td></td> <td>Up to date</td> @@ -275,23 +343,6 @@ <td>US</td> - <td>NW Linux</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> - </td> - <td> - </td> - <td><a href="rsync://nwlinux.us/tor-dist">rsync</a></td> - <td><a href="rsync://nwlinux.us/tor-web">rsync</a></td> -</tr> - -<tr> - - <td>US</td> - <td>AskApache</td> <td>Up to date</td> @@ -392,19 +443,19 @@ <tr> - <td>INT</td> + <td>AT</td> - <td>CoralCDN</td> + <td>TechAsk.IT</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://www.unicorncloud.org/public/torproject.org/dist">http</a></td> + <td><a href="http://www.unicorncloud.org/public/torproject.org/">http</a></td> + <td><a href="https://www.unicorncloud.org/public/torproject.org/dist">https</a></td> + <td><a href="https://www.unicorncloud.org/public/torproject.org/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> @@ -579,19 +630,19 @@ <tr> - <td>MX</td> + <td>NL</td> - <td></td> + <td>BBLN</td> <td>Up to date</td> <td> - </td> - <td><a href="http://fbnaia.homelinux.net/torproject/dist/">http</a></td> - <td><a href="http://fbnaia.homelinux.net/torproject/">http</a></td> - <td><a href="https://fbnaia.homelinux.net/torproject//dist/">https</a></td> - <td><a href="https://fbnaia.homelinux.net/torproject/">https</a></td> + <td><a href="http://t02.nl/mirror/dist/">http</a></td> + <td><a href="http://t02.nl/mirror/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> @@ -664,23 +715,6 @@ <tr> - <td>DE</td> - - <td>tor-mirror.de</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor-mirror.de/dist/">http</a></td> - <td><a href="http://tor-mirror.de/">http</a></td> - <td><a href="https://tor-mirror.de/dist/">https</a></td> - <td><a href="https://tor-mirror.de/">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>HU</td> <td>Unknown</td> @@ -800,68 +834,51 @@ <tr> - <td>US</td> + <td>IN</td> - <td>HackThisSite.org</td> + <td>India Tor Fans</td> <td>DO NOT USE. Out of date.</td> <td> - </td> - <td><a href="http://mirror.hackthissite.org/tor">http</a></td> - <td><a href="http://tor.hackthissite.org/">http</a></td> - <td><a href="https://mirror.hackthissite.org/tor">https</a></td> - <td><a href="https://tor.hackthissite.org/">https</a></td> + <td><a href="http://www.torproject.org.in/dist/">http</a></td> + <td><a href="http://www.torproject.org.in/">http</a></td> <td> - </td> <td> - </td> -</tr> - -<tr> - - <td>US</td> - - <td>searchprivate</td> - - <td>DO NOT USE. Out of date.</td> - <td> - </td> - <td><a href="http://tor.searchprivate.com/dist/">http</a></td> - <td><a href="http://tor.searchprivate.com/">http</a></td> <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>IN</td> + <td>TN</td> - <td>India Tor Fans</td> + <td></td> <td>DO NOT USE. Out of date.</td> <td> - </td> - <td><a href="http://www.torproject.org.in/dist/">http</a></td> - <td><a href="http://www.torproject.org.in/">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>TN</td> + <td>US</td> - <td></td> + <td>searchprivate</td> - <td>Unknown</td> + <td>DO NOT USE. Out of date.</td> <td> - </td> + <td><a href="http://tor.searchprivate.com/dist/">http</a></td> + <td><a href="http://tor.searchprivate.com/">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> @@ -936,40 +953,23 @@ <tr> - <td>FR</td> + <td>US</td> - <td></td> + <td>NW Linux</td> <td>Unknown</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://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-dist">rsync</a></td> + <td><a href="rsync://nwlinux.us/tor-web">rsync</a></td> </tr> <tr> - <td>IS</td> - - <td>Frenn vun der Enn A.S.B.L.</td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://torproject.lu/dist/">http</a></td> - <td><a href="http://torproject.lu/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>NL</td> <td></td> @@ -1055,23 +1055,6 @@ <tr> - <td>AT</td> - - <td>TechAsk.IT</td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://www.unicorncloud.org/public/torproject.org/dist">http</a></td> - <td><a href="http://www.unicorncloud.org/public/torproject.org/">http</a></td> - <td><a href="https://www.unicorncloud.org/public/torproject.org/dist">https</a></td> - <td><a href="https://www.unicorncloud.org/public/torproject.org/">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>US</td> <td></td> @@ -1106,19 +1089,19 @@ <tr> - <td>NL</td> + <td>MX</td> - <td>BBLN</td> + <td></td> <td>Unknown</td> <td> - </td> - <td><a href="http://t02.nl/mirror/dist/">http</a></td> - <td><a href="http://t02.nl/mirror/">http</a></td> + <td><a href="http://fbnaia.homelinux.net/torproject/dist/">http</a></td> + <td><a href="http://fbnaia.homelinux.net/torproject/">http</a></td> + <td><a href="https://fbnaia.homelinux.net/torproject//dist/">https</a></td> + <td><a href="https://fbnaia.homelinux.net/torproject/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> @@ -1171,3 +1154,20 @@ <td> - </td> <td> - </td> </tr> + +<tr> + + <td>DE</td> + + <td>tor-mirror.de</td> + + <td>Unknown</td> + + <td> - </td> + <td><a href="http://tor-mirror.de/dist/">http</a></td> + <td><a href="http://tor-mirror.de/">http</a></td> + <td><a href="https://tor-mirror.de/dist/">https</a></td> + <td><a href="https://tor-mirror.de/">https</a></td> + <td> - </td> + <td> - </td> +</tr>

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 04 Dec '13

04 Dec '13

commit 74090e7d3c401e617d7cd683569a1d1f30a1d813 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 4 07:15:57 2013 +0000 Update translations for liveusb-creator_completed --- pt_BR/pt_BR.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index 3d5416a..9bd106c 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -21,7 +21,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-11-30 15:23+0100\n" -"PO-Revision-Date: 2013-12-04 06:43+0000\n" +"PO-Revision-Date: 2013-12-04 07:13+0000\n" "Last-Translator: ebonsi\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -209,7 +209,7 @@ msgstr "A soma de verificação do MD5 da imagem ISO falhou" msgid "" "If you do not select an existing Live ISO, the selected release will be " "downloaded for you." -msgstr "Se nenhuma ISO Live existente for selecionada, a versão já selecionada será baixada." +msgstr "Se você não selecionar um existente Live ISO, uma versão selecionada será baixada para você." #: ../liveusb/dialog.py:174 msgid "Install Tails" @@ -341,7 +341,7 @@ msgstr "Sincronizando dados no disco..." #: ../liveusb/dialog.py:168 msgid "Target Device" -msgstr "Dispositivo de Destino" +msgstr "Dispositivo Selecionado" #: ../liveusb/gui.py:665 msgid "" @@ -367,7 +367,7 @@ msgid "" "This button allows you to browse for an existing Live system ISO that you " "have previously downloaded. If you do not select one, a release will be " "downloaded for you automatically." -msgstr "Este botão permite procurar por uma ISO do sistema Live existente e previamente baixada. Se nenhuma ISO for selecionada, uma versão será baixada automaticamente." +msgstr "Este botão permite que você procure por um existente sistema Live ISO que você abaixou anteriormente. Se nenhum ISO for selecionado, uma versão será abaixada para você automaticamente." #: ../liveusb/dialog.py:173 msgid "" @@ -375,7 +375,7 @@ msgid "" "optionally downloading a release (if an existing one wasn't selected), " "extracting the ISO to the USB device, creating the persistent overlay, and " "installing the bootloader." -msgstr "Este botão iniciará o processo de criação do LiveUSB. Opcionalmente, uma versão será baixada (se nenhuma versão existente tiver sido selecionada), extraindo a ISO para o dispositivo USB, criando a camada permanente e instalando o inicializador." +msgstr "Este botão iniciará o processo de criação do LiveUSB. Opcionalmente, uma versão será baixada (se nenhuma versão existente tiver sido selecionada), extraindo a ISO para o dispositivo USB, criando então uma superfície persistente e instalando o inicializador." #: ../liveusb/dialog.py:167 msgid ""

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 04 Dec '13

04 Dec '13

commit 395cb540eee6498d9a32e2088eb7c186e9f6efa1 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 4 07:15:54 2013 +0000 Update translations for liveusb-creator --- pt_BR/pt_BR.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index 3d5416a..9bd106c 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -21,7 +21,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-11-30 15:23+0100\n" -"PO-Revision-Date: 2013-12-04 06:43+0000\n" +"PO-Revision-Date: 2013-12-04 07:13+0000\n" "Last-Translator: ebonsi\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -209,7 +209,7 @@ msgstr "A soma de verificação do MD5 da imagem ISO falhou" msgid "" "If you do not select an existing Live ISO, the selected release will be " "downloaded for you." -msgstr "Se nenhuma ISO Live existente for selecionada, a versão já selecionada será baixada." +msgstr "Se você não selecionar um existente Live ISO, uma versão selecionada será baixada para você." #: ../liveusb/dialog.py:174 msgid "Install Tails" @@ -341,7 +341,7 @@ msgstr "Sincronizando dados no disco..." #: ../liveusb/dialog.py:168 msgid "Target Device" -msgstr "Dispositivo de Destino" +msgstr "Dispositivo Selecionado" #: ../liveusb/gui.py:665 msgid "" @@ -367,7 +367,7 @@ msgid "" "This button allows you to browse for an existing Live system ISO that you " "have previously downloaded. If you do not select one, a release will be " "downloaded for you automatically." -msgstr "Este botão permite procurar por uma ISO do sistema Live existente e previamente baixada. Se nenhuma ISO for selecionada, uma versão será baixada automaticamente." +msgstr "Este botão permite que você procure por um existente sistema Live ISO que você abaixou anteriormente. Se nenhum ISO for selecionado, uma versão será abaixada para você automaticamente." #: ../liveusb/dialog.py:173 msgid "" @@ -375,7 +375,7 @@ msgid "" "optionally downloading a release (if an existing one wasn't selected), " "extracting the ISO to the USB device, creating the persistent overlay, and " "installing the bootloader." -msgstr "Este botão iniciará o processo de criação do LiveUSB. Opcionalmente, uma versão será baixada (se nenhuma versão existente tiver sido selecionada), extraindo a ISO para o dispositivo USB, criando a camada permanente e instalando o inicializador." +msgstr "Este botão iniciará o processo de criação do LiveUSB. Opcionalmente, uma versão será baixada (se nenhuma versão existente tiver sido selecionada), extraindo a ISO para o dispositivo USB, criando então uma superfície persistente e instalando o inicializador." #: ../liveusb/dialog.py:167 msgid ""

1 0