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

[flashproxy/master] extended OR port authentication.
by dcf＠torproject.org 03 Feb '13

03 Feb '13

commit e45fc2c2a82135c0f588d4ace19a3a090dc91a41 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jan 29 14:51:26 2013 -0800 extended OR port authentication. --- websocket-transport/pt.go | 118 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 117 insertions(+), 1 deletions(-) diff --git a/websocket-transport/pt.go b/websocket-transport/pt.go index a7459a8..bb7866a 100644 --- a/websocket-transport/pt.go +++ b/websocket-transport/pt.go @@ -25,7 +25,12 @@ package main import ( + "bufio" "bytes" + "crypto/hmac" + "crypto/rand" + "crypto/sha256" + "crypto/subtle" "errors" "fmt" "io" @@ -352,10 +357,121 @@ func PtServerSetup(methodNames []string) PtServerInfo { return info } +// See 217-ext-orport-auth.txt section 4.2.1.3. +func computeServerHash(info *PtServerInfo, clientNonce, serverNonce []byte) []byte { + h := hmac.New(sha256.New, info.AuthCookie) + io.WriteString(h, "ExtORPort authentication server-to-client hash") + h.Write(clientNonce) + h.Write(serverNonce) + return h.Sum([]byte{}) +} + +// See 217-ext-orport-auth.txt section 4.2.1.3. +func computeClientHash(info *PtServerInfo, clientNonce, serverNonce []byte) []byte { + h := hmac.New(sha256.New, info.AuthCookie) + io.WriteString(h, "ExtORPort authentication client-to-server hash") + h.Write(clientNonce) + h.Write(serverNonce) + return h.Sum([]byte{}) +} + +func extOrPortAuthenticate(s *net.TCPConn, info *PtServerInfo) error { + r := bufio.NewReader(s) + + // Read auth types. 217-ext-orport-auth.txt section 4.1. + var authTypes [256]bool + var count int + for count = 0; count < 256; count++ { + b, err := r.ReadByte() + if err != nil { + return err + } + if b == 0 { + break + } + authTypes[b] = true + } + if count >= 256 { + return errors.New(fmt.Sprintf("read 256 auth types without seeing \\x00")) + } + + // We support only type 1, SAFE_COOKIE. + if !authTypes[1] { + return errors.New(fmt.Sprintf("server didn't offer auth type 1")) + } + _, err := s.Write([]byte{1}) + if err != nil { + return err + } + + clientNonce := make([]byte, 32) + clientHash := make([]byte, 32) + serverNonce := make([]byte, 32) + serverHash := make([]byte, 32) + + _, err = io.ReadFull(rand.Reader, clientNonce) + if err != nil { + return err + } + _, err = s.Write(clientNonce) + if err != nil { + return err + } + + _, err = io.ReadFull(r, serverHash) + if err != nil { + return err + } + _, err = io.ReadFull(r, serverNonce) + if err != nil { + return err + } + + expectedServerHash := computeServerHash(info, clientNonce, serverNonce) + if subtle.ConstantTimeCompare(serverHash, expectedServerHash) != 1 { + return errors.New(fmt.Sprintf("mismatch in server hash")) + } + + clientHash = computeClientHash(info, clientNonce, serverNonce) + _, err = s.Write(clientHash) + if err != nil { + return err + } + + status := make([]byte, 1) + _, err = io.ReadFull(r, status) + if err != nil { + return err + } + if status[0] != 1 { + return errors.New(fmt.Sprintf("server rejected authentication")) + } + + if r.Buffered() != 0 { + return errors.New(fmt.Sprintf("%d bytes left after extended OR port authentication", r.Buffered())) + } + + return nil +} + // Connect to info.ExtendedOrAddr if defined, or else info.OrAddr, and return an // open *net.TCPConn. If connecting to the extended OR port, extended OR port // authentication à la 217-ext-orport-auth.txt is done before returning; an // error is returned if authentication fails. func PtConnectOr(info *PtServerInfo, conn net.Conn) (*net.TCPConn, error) { - return net.DialTCP("tcp", nil, ptInfo.OrAddr) + if info.ExtendedOrAddr == nil { + return net.DialTCP("tcp", nil, info.OrAddr) + } + + s, err := net.DialTCP("tcp", nil, info.ExtendedOrAddr) + if err != nil { + return nil, err + } + err = extOrPortAuthenticate(s, info) + if err != nil { + s.Close() + return nil, err + } + + return s, nil }

1 0

[flashproxy/master] Abstract out PtConnectOr.
by dcf＠torproject.org 03 Feb '13

03 Feb '13

commit cd8b1cca671e60c770f777e62bbb2e1a88e49bc1 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jan 29 13:21:11 2013 -0800 Abstract out PtConnectOr. --- websocket-transport/pt.go | 8 ++++++++ websocket-transport/websocket-server.go | 2 +- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/websocket-transport/pt.go b/websocket-transport/pt.go index 1f3f283..a7459a8 100644 --- a/websocket-transport/pt.go +++ b/websocket-transport/pt.go @@ -351,3 +351,11 @@ func PtServerSetup(methodNames []string) PtServerInfo { return info } + +// Connect to info.ExtendedOrAddr if defined, or else info.OrAddr, and return an +// open *net.TCPConn. If connecting to the extended OR port, extended OR port +// authentication à la 217-ext-orport-auth.txt is done before returning; an +// error is returned if authentication fails. +func PtConnectOr(info *PtServerInfo, conn net.Conn) (*net.TCPConn, error) { + return net.DialTCP("tcp", nil, ptInfo.OrAddr) +} diff --git a/websocket-transport/websocket-server.go b/websocket-transport/websocket-server.go index 725053c..a1ac8e7 100644 --- a/websocket-transport/websocket-server.go +++ b/websocket-transport/websocket-server.go @@ -149,7 +149,7 @@ func websocketHandler(ws *Websocket) { handlerChan <- -1 }() - s, err := net.DialTCP("tcp", nil, ptInfo.OrAddr) + s, err := PtConnectOr(&ptInfo, ws.Conn) if err != nil { logDebug("Failed to connect to ORPort: " + err.Error()) return

1 0

[flashproxy/master] Auth cookie reading.
by dcf＠torproject.org 03 Feb '13

03 Feb '13

commit 8d706d50fbf1671026a470c36df0c79e0ed93eb8 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jan 29 09:38:28 2013 -0800 Auth cookie reading. --- websocket-transport/pt.go | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/websocket-transport/pt.go b/websocket-transport/pt.go index d5435fa..1f3f283 100644 --- a/websocket-transport/pt.go +++ b/websocket-transport/pt.go @@ -26,7 +26,9 @@ package main import ( "bytes" + "errors" "fmt" + "io" "net" "os" "strings" @@ -262,8 +264,36 @@ func getServerBindAddrs(methodNames []string) []PtBindAddr { // Reads and validates the contents of an auth cookie file. Returns the 32-byte // cookie. See section 4.2.1.2 of pt-spec.txt. func readAuthCookieFile(filename string) ([]byte, error) { + authCookieHeader := []byte("! Extended ORPort Auth Cookie !\x0a") + header := make([]byte, 32) cookie := make([]byte, 32) + f, err := os.Open(filename) + if err != nil { + return cookie, err + } + defer f.Close() + + n, err := io.ReadFull(f, header) + if err != nil { + return cookie, err + } + n, err = io.ReadFull(f, cookie) + if err != nil { + return cookie, err + } + // Check that the file ends here. + n, err = f.Read(make([]byte, 1)) + if n != 0 { + return cookie, errors.New(fmt.Sprintf("file is longer than 64 bytes")) + } else if err != io.EOF { + return cookie, errors.New(fmt.Sprintf("did not find EOF at end of file")) + } + + if !bytes.Equal(header, authCookieHeader) { + return cookie, errors.New(fmt.Sprintf("missing auth cookie header")) + } + return cookie, nil }

1 0

[flashproxy/master] Do USERADDR and DONE commands.
by dcf＠torproject.org 03 Feb '13

03 Feb '13

commit 866e8d58b32eb4472d05905db7a0d4ac0c193e80 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Jan 30 13:46:41 2013 -0800 Do USERADDR and DONE commands. --- websocket-transport/pt.go | 103 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 103 insertions(+), 0 deletions(-) diff --git a/websocket-transport/pt.go b/websocket-transport/pt.go index 2b4a759..f39e177 100644 --- a/websocket-transport/pt.go +++ b/websocket-transport/pt.go @@ -31,6 +31,7 @@ import ( "crypto/rand" "crypto/sha256" "crypto/subtle" + "encoding/binary" "errors" "fmt" "io" @@ -455,6 +456,103 @@ func extOrPortAuthenticate(s *net.TCPConn, info *PtServerInfo) error { return nil } +// See section 3.1 of 196-transport-control-ports.txt. +const ( + extOrCmdDone = 0x0000 + extOrCmdUserAddr = 0x0001 + extOrCmdOkay = 0x1000 + extOrCmdDeny = 0x1001 +) + +func extOrPortWriteCommand(s *net.TCPConn, cmd uint16, body []byte) error { + var buf bytes.Buffer + if len(body) > 65535 { + return errors.New("command exceeds maximum length of 65535") + } + err := binary.Write(&buf, binary.BigEndian, cmd) + if err != nil { + return err + } + err = binary.Write(&buf, binary.BigEndian, uint16(len(body))) + if err != nil { + return err + } + err = binary.Write(&buf, binary.BigEndian, body) + if err != nil { + return err + } + _, err = s.Write(buf.Bytes()) + if err != nil { + return err + } + + return nil +} + +// Send a USERADDR command on s. See section 3.1 of +// 196-transport-control-ports.txt. +func extOrPortSendUserAddr(s *net.TCPConn, conn net.Conn) error { + return extOrPortWriteCommand(s, extOrCmdUserAddr, []byte(conn.RemoteAddr().String())) +} + +// Send a DONE command on s. See section 3.1 of 196-transport-control-ports.txt. +func extOrPortSendDone(s *net.TCPConn) error { + return extOrPortWriteCommand(s, extOrCmdDone, []byte{}) +} + +func extOrPortRecvCommand(s *net.TCPConn) (cmd uint16, body []byte, err error) { + var bodyLen uint16 + data := make([]byte, 4) + + _, err = io.ReadFull(s, data) + if err != nil { + return + } + buf := bytes.NewBuffer(data) + err = binary.Read(buf, binary.BigEndian, &cmd) + if err != nil { + return + } + err = binary.Read(buf, binary.BigEndian, &bodyLen) + if err != nil { + return + } + body = make([]byte, bodyLen) + _, err = io.ReadFull(s, body) + if err != nil { + return + } + + return cmd, body, err +} + +// Send a USERADDR command followed by a DONE command. Wait for an OKAY or DENY +// response command from the server. Returns nil if and only if OKAY is +// received. +func extOrPortDoUserAddr(s *net.TCPConn, conn net.Conn) error { + var err error + + err = extOrPortSendUserAddr(s, conn) + if err != nil { + return err + } + err = extOrPortSendDone(s) + if err != nil { + return err + } + cmd, _, err := extOrPortRecvCommand(s) + if err != nil { + return err + } + if cmd == extOrCmdDeny { + return errors.New("server returned DENY after our USERADDR and DONE") + } else if cmd != extOrCmdOkay { + return errors.New(fmt.Sprintf("server returned unknown command 0x%04x after our USERADDR and DONE", cmd)) + } + + return nil +} + // Connect to info.ExtendedOrAddr if defined, or else info.OrAddr, and return an // open *net.TCPConn. If connecting to the extended OR port, extended OR port // authentication à la 217-ext-orport-auth.txt is done before returning; an @@ -474,6 +572,11 @@ func PtConnectOr(info *PtServerInfo, conn net.Conn) (*net.TCPConn, error) { s.Close() return nil, err } + err = extOrPortDoUserAddr(s, conn) + if err != nil { + s.Close() + return nil, err + } s.SetDeadline(time.Time{}) return s, nil

1 0

[flashproxy/master] Merge remote-tracking branch 'mytorgit/extor'
by dcf＠torproject.org 03 Feb '13

03 Feb '13

commit d54793cf1a5690b51546fbfa2fef94cca4881f4f Merge: 84d83a2 866e8d5 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Feb 2 19:35:55 2013 -0800 Merge remote-tracking branch 'mytorgit/extor' External ORPort support for websocket-server (#7620). README | 3 + websocket-transport/pt.go | 294 ++++++++++++++++++++++++++++++- websocket-transport/websocket-server.go | 2 +- 3 files changed, 296 insertions(+), 3 deletions(-)

1 0

[flashproxy/master] getenv function.
by dcf＠torproject.org 03 Feb '13

03 Feb '13

commit c38bb489b2b4cf1b055363af27a8e2609ba40076 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jan 28 22:09:26 2013 -0800 getenv function. --- websocket-transport/pt.go | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/websocket-transport/pt.go b/websocket-transport/pt.go index cb349e0..15848d1 100644 --- a/websocket-transport/pt.go +++ b/websocket-transport/pt.go @@ -32,6 +32,10 @@ import ( "strings" ) +func getenv(key string) string { + return os.Getenv(key) +} + // Abort with an ENV-ERROR if the environment variable isn't set. func getenvRequired(key string) string { value := os.Getenv(key)

1 0

[flashproxy/master] Add PtServerInfo.ExtendedOrAddr.
by dcf＠torproject.org 03 Feb '13

03 Feb '13

commit 27e9950084de734ff979679393311f9dc9d7ada7 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jan 28 22:13:17 2013 -0800 Add PtServerInfo.ExtendedOrAddr. --- websocket-transport/pt.go | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/websocket-transport/pt.go b/websocket-transport/pt.go index 15848d1..ac5270e 100644 --- a/websocket-transport/pt.go +++ b/websocket-transport/pt.go @@ -262,8 +262,9 @@ func getServerBindAddrs(methodNames []string) []PtBindAddr { // This structure is returned by PtServerSetup. It consists of a list of // PtBindAddrs, along with a single address for the ORPort. type PtServerInfo struct { - BindAddrs []PtBindAddr - OrAddr *net.TCPAddr + BindAddrs []PtBindAddr + OrAddr *net.TCPAddr + ExtendedOrAddr *net.TCPAddr } // Check the server pluggable transports environments, emitting an error message @@ -293,5 +294,13 @@ func PtServerSetup(methodNames []string) PtServerInfo { os.Exit(1) } + var extendedOrPort = getenv("TOR_PT_EXTENDED_SERVER_PORT") + if extendedOrPort != "" { + info.ExtendedOrAddr, err = net.ResolveTCPAddr("tcp", extendedOrPort) + if err != nil { + PtEnvError(fmt.Sprintf("cannot resolve TOR_PT_EXTENDED_SERVER_PORT %q: %s", extendedOrPort, err.Error())) + } + } + return info }

1 0

[stem/master] Using binary mode for the controller socket file
by atagar＠torproject.org 02 Feb '13

02 Feb '13

commit 9cd4c9feb479fe00987526c272a1b2a1853bd295 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Feb 2 12:23:07 2013 -0800 Using binary mode for the controller socket file Yay! Now that I have a version of python 3 that doesn't segfault I can finish making our integ tests work. The socket file used for controller connections should be normalized to use binary mode. This is its behavior in python 2.x, and in 3.x having it in text mode can cause sadness. Exception in thread Tor Listener: Traceback (most recent call last): File "/home/atagar/Desktop/Python-3.3.0/Lib/threading.py", line 639, in _bootstrap_inner self.run() File "/home/atagar/Desktop/Python-3.3.0/Lib/threading.py", line 596, in run self._target(*self._args, **self._kwargs) File "/home/atagar/Desktop/stem/test/data/python3/stem/control.py", line 573, in _reader_loop control_message = self._socket.recv() File "/home/atagar/Desktop/stem/test/data/python3/stem/socket.py", line 115, in recv return recv_message(socket_file) File "/home/atagar/Desktop/stem/test/data/python3/stem/socket.py", line 539, in recv_message line = control_file.readline() File "/home/atagar/Desktop/Python-3.3.0/Lib/codecs.py", line 300, in decode (result, consumed) = self._buffer_decode(data, self.errors, final) UnicodeDecodeError: 'utf-8' codec can't decode byte 0xc3 in position 2005: invalid continuation byte After addressing this and a few encoding issues the controller integ tests now pass, but after we're done testing python spews out a dump following... *** glibc detected *** python3: munmap_chunk(): invalid pointer: 0x097f1620 *** At this point I'm pretty well persuaded that the python 3.x series leaves something to be desired in terms of stability. --- stem/socket.py | 16 +++++++++------- test/integ/control/controller.py | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/stem/socket.py b/stem/socket.py index f0786ab..4277fa1 100644 --- a/stem/socket.py +++ b/stem/socket.py @@ -37,6 +37,7 @@ import threading import stem.prereq import stem.response +import stem.util.str_tools from stem.util import log @@ -182,12 +183,7 @@ class ControlSocket(object): with self._recv_lock: self._socket = self._make_socket() - - if stem.prereq.is_python_3(): - self._socket_file = self._socket.makefile(mode = "rw", newline = "") - else: - self._socket_file = self._socket.makefile(mode = "rw") - + self._socket_file = self._socket.makefile(mode = "rwb") self._is_alive = True # It's possible for this to have a transient failure... @@ -425,7 +421,7 @@ def send_message(control_file, message, raw = False): message = send_formatting(message) try: - control_file.write(message) + control_file.write(stem.util.str_tools.to_bytes(message)) control_file.flush() log_message = message.replace("\r\n", "\n").rstrip() @@ -471,6 +467,9 @@ def recv_message(control_file): while True: try: line = control_file.readline() + + if stem.prereq.is_python_3(): + line = stem.util.str_tools.to_unicode(line) except AttributeError: # if the control_file has been closed then we will receive: # AttributeError: 'NoneType' object has no attribute 'recv' @@ -537,6 +536,9 @@ def recv_message(control_file): while True: try: line = control_file.readline() + + if stem.prereq.is_python_3(): + line = stem.util.str_tools.to_unicode(line) except socket.error, exc: prefix = logging_prefix % "SocketClosed" log.info(prefix + "received an exception while mid-way through a data reply (exception: \"%s\", read content: \"%s\")" % (exc, log.escape(raw_content))) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 600403b..15168a4 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -568,7 +568,7 @@ class TestController(unittest.TestCase): controller.set_conf("ContactInfo", "confsaved") controller.save_conf() - with file(runner.get_torrc_path()) as torrcfile: + with open(runner.get_torrc_path()) as torrcfile: self.assertTrue("\nContactInfo confsaved\n" in torrcfile.read()) finally: controller.load_conf(oldconf)

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 02 Feb '13

02 Feb '13

commit c525bb1258306da3b1114773db9820bb132a3ea7 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Feb 2 21:15:05 2013 +0000 Update translations for gettor --- sv/gettor.po | 29 +++++++++++++++-------------- 1 files changed, 15 insertions(+), 14 deletions(-) diff --git a/sv/gettor.po b/sv/gettor.po index 065c0a1..f3982bf 100644 --- a/sv/gettor.po +++ b/sv/gettor.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Dan West <acc(a)dnw.st>, 2013. # Jacob Appelbaum <jacob(a)appelbaum.net>, 2009. # <kanin(a)ersboda.nu>, 2012. msgid "" @@ -10,8 +11,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-01-19 12:48+0000\n" -"Last-Translator: youcanbeshiva <kanin(a)ersboda.nu>\n" +"PO-Revision-Date: 2013-02-02 21:10+0000\n" +"Last-Translator: Dan West <acc(a)dnw.st>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -39,14 +40,14 @@ msgid "" "We only process requests from email services that support \"DKIM\",\n" "which is an email feature that lets us verify that the address in the\n" "\"From\" line is actually the one who sent the mail." -msgstr "" +msgstr "Vi behandlar endast begäran från email tjänster som stödjer \"DKIM\",\nvilket är en email funktion som låter oss verifiera att adressen i\n\"Från\" linjen verkligen är från den som skickade mailet." #: lib/gettor/i18n.py:39 msgid "" "(We apologize if you didn't ask for this mail. Since your email is from\n" "a service that doesn't use DKIM, we're sending a short explanation,\n" "and then we'll ignore this email address for the next day or so.)" -msgstr "" +msgstr "(Vi ber om ursäkt om du inte begärde det här mailet Eftersom din email är från\nen service som inte använder DKIM, skickar vi en kort förklaring,\noch sen ignorerar vi din email adress en dag eller två.)" #: lib/gettor/i18n.py:43 lib/gettor/i18n.py:135 msgid "" @@ -101,7 +102,7 @@ msgstr "" #: lib/gettor/i18n.py:76 msgid " List of supported locales:" -msgstr "" +msgstr "Lista av lokaliseringar som stöds:" #: lib/gettor/i18n.py:78 msgid "Here is a list of all available languages:" @@ -120,7 +121,7 @@ msgid "" " gettor+pl(a)torproject.org: Polish\n" " gettor+ru(a)torproject.org: Russian\n" " gettor+zh(a)torproject.org: Chinese" -msgstr "" +msgstr "gettor+ar(a)torproject.org: Arabiska\ngettor+de(a)torproject.org: Tyska\ngettor+en(a)torproject.org: Engelska\ngettor+es(a)torproject.org: Spanska\ngettor+fa(a)torproject.org: Farsi (Iran)\ngettor+fr(a)torproject.org: Franska\ngettor+it(a)torproject.org: Italienska\ngettor+nl(a)torproject.org: Holländska\ngettor+pl(a)torproject.org: Polska\ngettor+ru(a)torproject.org: Ryska\ngettor+zh(a)torproject.org: Kinesiska" #: lib/gettor/i18n.py:92 msgid "If you select no language, you will receive the English version." @@ -152,13 +153,13 @@ msgstr "" msgid "" "Sending this text in an email to GetTor will cause it to send you \n" "the Tor Browser Bundle in a number of 1,4MB attachments." -msgstr "" +msgstr "Att skicka denna text i ett email till GetTor kommer göra att den sänder dig\nTor Browser Bundle i ett antal bifogade filer om 1,4MB styck." #: lib/gettor/i18n.py:110 msgid "" "After having received all parts, you need to re-assemble them to \n" "one package again. This is done as follows:" -msgstr "" +msgstr "Efter att du fått alla delar måste du bygga ihop dom till\nett paket igen. Det gör du såhär:" #: lib/gettor/i18n.py:113 msgid "1.) Save all received attachments into one folder on your disk." @@ -175,7 +176,7 @@ msgstr "" msgid "" "3.) Verify all files as described in the mail you received with \n" "each package. (gpg --verify)" -msgstr "" +msgstr "3.) Verifiera alla filer som det beskrivs i mailet du fick med\nvarje paket. (gpg --verify)" #: lib/gettor/i18n.py:122 msgid "" @@ -189,11 +190,11 @@ msgid "" "5.) After unpacking is finished, you should find a newly created \n" "\".exe\" file in your destination folder. Simply doubleclick\n" "that and Tor Browser Bundle should start within a few seconds." -msgstr "" +msgstr "5.) Efter att upppackningen är klar, bör du finna en nyligen skapad\n\".exe\" fil i din destinationsmapp. Dubbelklicka på\nden och Tor Browser Bundle startas inom några sekunder." #: lib/gettor/i18n.py:130 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!" -msgstr "" +msgstr "6.) Det är allt. Du är klar. Tack för att du använder Tor och ha kul!" #: lib/gettor/i18n.py:132 msgid "" @@ -433,11 +434,11 @@ msgstr "" msgid "" "FREQUENTLY ASKED QUESTIONS\n" "==========================" -msgstr "" +msgstr "VANLIGA FRÅGOR\n===============" #: lib/gettor/i18n.py:272 msgid "What is Tor?" -msgstr "" +msgstr "Vad är Tor?" #: lib/gettor/i18n.py:274 msgid "The name \"Tor\" can refer to several different components." @@ -458,7 +459,7 @@ msgstr "" #: lib/gettor/i18n.py:286 msgid "What is the Tor Browser Bundle?" -msgstr "" +msgstr "Vad är Tor Browser Bundle?" #: lib/gettor/i18n.py:288 msgid ""

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 02 Feb '13

02 Feb '13

commit 0f3c2665d569a3f17318caa99803d3e2a1aacf30 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Feb 2 20:16:03 2013 +0000 Update translations for torbirdy_completed --- it/torbirdy.dtd | 1 + it/torbirdy.properties | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/it/torbirdy.dtd b/it/torbirdy.dtd index ed3d316..4e662f5 100644 --- a/it/torbirdy.dtd +++ b/it/torbirdy.dtd @@ -43,4 +43,5 @@ <!ENTITY torbirdy.panel.usetor.label "Usa Tor Onion Router"> <!ENTITY torbirdy.panel.usejondo.label "Usa JonDo (Premium)"> +<!ENTITY torbirdy.panel.usewhonix.label "Usa Whonix"> <!ENTITY torbirdy.panel.preferences.label "Apri le preferenze di TorBirdy"> diff --git a/it/torbirdy.properties b/it/torbirdy.properties index cc97582..34f8f70 100644 --- a/it/torbirdy.properties +++ b/it/torbirdy.properties @@ -4,6 +4,7 @@ torbirdy.enabled.tor=TorBirdy ha abilitato: Tor torbirdy.enabled.jondo=TorBirdy ha abilitato: JonDo torbirdy.enabled.custom=TorBirdy ha abilitato: Proxy Personalizzato torbirdy.enabled.torification=TorBirdy ha abilitato: Tor-ificazione trasparente +torbirdy.enabled.whonix=TorBirdy Attivo: Whonix torbirdy.disabled=TorBirdy: disabilitato! torbirdy.email.prompt=TorBirdy ha disabilitato la configurazione automatica di Thunderbird per proteggere il tuo anonimato.\n\nLe impostazioni di sicurezza di %S sono state impostate.\nAdesso puoi configurare le altre impostazioni dell'account manualmente.

1 0