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

[tor-browser-bundle/master] HTTPS-Everywhere is so easy to forget. Maybe because it works so well?
by mikeperry＠torproject.org 27 Mar '15

27 Mar '15

commit be94df05ea2c58a34e4084b74b653f277a136a44 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Mar 27 00:03:17 2015 -0700 HTTPS-Everywhere is so easy to forget. Maybe because it works so well? --- Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 40833da..f27632f 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -4,6 +4,7 @@ Tor Browser 4.5a5 -- Mar 31 2015 * Update OpenSSL to 1.0.1m * Update Tor to 0.2.6.6 * Update NoScript to 2.6.9.19 + * Update HTTPS-Everywhere to 5.0 * Update meek to 0.16 * Update Tor Launcher to 0.2.7.3 * Bug 13983: Directory search path fix for Tor Messanger+TorBirdy

1 0

[tor-browser-bundle/master] 4.5a5 changelog fixes.
by mikeperry＠torproject.org 27 Mar '15

27 Mar '15

commit 123c74449aac2419d5968fd0c736996ee946c628 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Mar 26 23:58:36 2015 -0700 4.5a5 changelog fixes. --- Bundle-Data/Docs/ChangeLog.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index ffea36a..40833da 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -25,11 +25,10 @@ Tor Browser 4.5a5 -- Mar 31 2015 * Bug 14937: Show meek and flashproxy bridges in tor circuit display * Bugs 13891+15207: Fix exceptions/errors in circuit display with bridges * Bug 13019: Change locale hiding pref to boolean - * Bug 7255: Warn users about maximizing windows (off by default) + * Bug 7255: Warn users about maximizing windows * Pluggable Transport Dependency Updates: * Bug 15448: Use golang 1.4.2 for meek and obs4proxy * Bug 15265: Switch go.net repo to golang.org/x/net - * Bug 12535: Use a SOCKS5 listener instead of a SOCKS4a for goptlib * Bug 14937: Hard-code meek and flashproxy node fingerprints * Bug 13019: Prevent Javascript from leaking system locale * Bug 10280: Improved fix to prevent loading plugins into address space

1 0

[tor-browser-bundle/master] Bug 15482: Don't surprise users with new circuits while a page is in use
by mikeperry＠torproject.org 27 Mar '15

27 Mar '15

commit f73953b08c7df47dc47a9c9d4aa16e794a156acf Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Mar 26 23:05:23 2015 -0700 Bug 15482: Don't surprise users with new circuits while a page is in use This patch resets timestamp_dirty every time a new stream is attached to a circuit. --- gitian/descriptors/linux/gitian-tor.yml | 3 +++ gitian/descriptors/mac/gitian-tor.yml | 3 +++ gitian/descriptors/windows/gitian-tor.yml | 3 +++ gitian/patches/bug15482.patch | 32 +++++++++++++++++++++++++++++ 4 files changed, 41 insertions(+) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 7338f2d..b218486 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -21,6 +21,7 @@ files: - "versions" - "bug8402-master.patch" - "bug8405.patch" +- "bug15482.patch" - "dzip.sh" - "openssl-linux32-utils.zip" - "openssl-linux64-utils.zip" @@ -80,6 +81,8 @@ script: | then git am ~/build/bug8405.patch git am ~/build/bug8402-master.patch + else + git am ~/build/bug15482.patch fi mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 08408f8..3d0e0c6 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -17,6 +17,7 @@ files: - "versions" - "bug8402-master.patch" - "bug8405.patch" +- "bug15482.patch" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" - "dzip.sh" @@ -58,6 +59,8 @@ script: | then git am ~/build/bug8405.patch git am ~/build/bug8402-master.patch + else + git am ~/build/bug15482.patch fi mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 7db511b..87e1dc2 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -17,6 +17,7 @@ files: - "versions" - "bug8402-master.patch" - "bug8405.patch" +- "bug15482.patch" - "binutils.tar.bz2" - "dzip.sh" - "mingw-w64-win32-utils.zip" @@ -58,6 +59,8 @@ script: | then git am ~/build/bug8405.patch git am ~/build/bug8402-master.patch + else + git am ~/build/bug15482.patch fi mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/patches/bug15482.patch b/gitian/patches/bug15482.patch new file mode 100644 index 0000000..5250fe4 --- /dev/null +++ b/gitian/patches/bug15482.patch @@ -0,0 +1,32 @@ +From a9c7e6dc3508e78f4b296e38603dd34174e2a14c Mon Sep 17 00:00:00 2001 +From: Mike Perry <mikeperry-git(a)torproject.org> +Date: Thu, 26 Mar 2015 22:38:45 -0700 +Subject: [PATCH] Bug 15482: Don't abandon circuits that are still being used + by TBB. + +Reset timestamp_dirty every time we get a new stream request so that circuits +are not abandoned while still in use. +--- + src/or/circuituse.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/or/circuituse.c b/src/or/circuituse.c +index d0d31ad..fff46cd 100644 +--- a/src/or/circuituse.c ++++ b/src/or/circuituse.c +@@ -2264,8 +2264,10 @@ connection_ap_handshake_attach_chosen_circuit(entry_connection_t *conn, + + base_conn->state = AP_CONN_STATE_CIRCUIT_WAIT; + +- if (!circ->base_.timestamp_dirty) +- circ->base_.timestamp_dirty = time(NULL); ++ /* For Tor Browser, we want to avoid surprising the user by giving up on ++ * circuits while they are still being used, so we always reset the ++ * dirtiness timestamp. */ ++ circ->base_.timestamp_dirty = time(NULL); + + pathbias_count_use_attempt(circ); + +-- +1.9.1 +

1 0

[tor-browser-bundle/master] Update changelog for 15482.
by mikeperry＠torproject.org 27 Mar '15

27 Mar '15

commit 8a99ab949e082f8782b062b21e3fbaca3fa428db Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Mar 26 23:09:08 2015 -0700 Update changelog for 15482. --- Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index f357766..ffea36a 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -38,7 +38,7 @@ Tor Browser 4.5a5 -- Mar 31 2015 * Bug 12827: Create preference to disable SVG images (for security slider) * Bug 13548: Create preference to disable MathML (for security slider) * Bug 14631: Improve startup error messages for filesystem permissions issues - * Bug 13766: Keep content window Tor circuits open for 2 hours + * Bug 15482: Don't allow circuits to change while a site is in use * Linux * Bug 13375: Create a hybrid GUI/desktop/shell launcher wrapper * Bug 12468: Only print/write log messages if launched with --debug

1 0

[tor-browser-bundle/master] Revert "Bug 13766: Raise MaxCircuitDirtiness to 2 hours"
by mikeperry＠torproject.org 27 Mar '15

27 Mar '15

commit a6b594ee52905336419e8148a77f96cde6488c42 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Mar 26 23:09:54 2015 -0700 Revert "Bug 13766: Raise MaxCircuitDirtiness to 2 hours" This reverts commit 824116042a03683ae20fa6e7d0768d8fd6fd6f95. --- Bundle-Data/linux/Data/Tor/torrc-defaults | 1 - Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults | 1 - Bundle-Data/windows/Data/Tor/torrc-defaults | 1 - 3 files changed, 3 deletions(-) diff --git a/Bundle-Data/linux/Data/Tor/torrc-defaults b/Bundle-Data/linux/Data/Tor/torrc-defaults index e502356..819b9e8 100644 --- a/Bundle-Data/linux/Data/Tor/torrc-defaults +++ b/Bundle-Data/linux/Data/Tor/torrc-defaults @@ -8,4 +8,3 @@ Log notice stdout SocksPort 9150 ControlPort 9151 CookieAuthentication 1 -MaxCircuitDirtiness 7199 diff --git a/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults b/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults index e502356..819b9e8 100644 --- a/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults +++ b/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults @@ -8,4 +8,3 @@ Log notice stdout SocksPort 9150 ControlPort 9151 CookieAuthentication 1 -MaxCircuitDirtiness 7199 diff --git a/Bundle-Data/windows/Data/Tor/torrc-defaults b/Bundle-Data/windows/Data/Tor/torrc-defaults index e502356..819b9e8 100644 --- a/Bundle-Data/windows/Data/Tor/torrc-defaults +++ b/Bundle-Data/windows/Data/Tor/torrc-defaults @@ -8,4 +8,3 @@ Log notice stdout SocksPort 9150 ControlPort 9151 CookieAuthentication 1 -MaxCircuitDirtiness 7199

1 0

[tor-browser-bundle/master] Revert "Use a SOCKS5 listener instead of a SOCKS4a for goptlib."
by mikeperry＠torproject.org 27 Mar '15

27 Mar '15

commit b45bf02c7559eecebf0924e507a4b2137e7042e6 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Mar 26 23:29:39 2015 -0700 Revert "Use a SOCKS5 listener instead of a SOCKS4a for goptlib." This reverts commit 9d26e0009fc6a8e89a48db2a976097459f14f45e, which broke the build. --- .../linux/gitian-pluggable-transports.yml | 6 - .../mac/gitian-pluggable-transports.yml | 6 - .../windows/gitian-pluggable-transports.yml | 6 - gitian/patches/bug12535.patch | 1032 -------------------- 4 files changed, 1050 deletions(-) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index 6adf16c..1ae9c0c 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -57,7 +57,6 @@ files: - "openssl-linux32-utils.zip" - "openssl-linux64-utils.zip" - "go.net.tar.bz2" -- "bug12535.patch" script: | INSTDIR="$HOME/install" PTDIR="$INSTDIR/Tor/PluggableTransports" @@ -209,11 +208,6 @@ script: | # Building goptlib cd goptlib - git update-index --refresh -q - export GIT_COMMITTER_NAME="nobody" - export GIT_COMMITTER_EMAIL="nobody@localhost" - export GIT_COMMITTER_DATE="$REFERENCE_DATETIME" - git am ~/build/bug12535.patch find -type f | xargs touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports" ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/goptlib.git" diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index d72ab44..e2693e1 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -53,7 +53,6 @@ files: - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" - "dzip.sh" - "go.net.tar.bz2" -- "bug12535.patch" - "gmp-mac64-utils.zip" - "openssl-mac64-utils.zip" script: | @@ -235,11 +234,6 @@ script: | # Building goptlib cd goptlib - git update-index --refresh -q - export GIT_COMMITTER_NAME="nobody" - export GIT_COMMITTER_EMAIL="nobody@localhost" - export GIT_COMMITTER_DATE="$REFERENCE_DATETIME" - git am ~/build/bug12535.patch find -type f | xargs touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports" ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/goptlib.git" diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 0b0b5db..0f5ec84 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -60,7 +60,6 @@ files: - "gmp-win32-utils.zip" - "gcclibs-win32-utils.zip" - "go.net.tar.bz2" -- "bug12535.patch" script: | # Set the timestamp on every .pyc file in a zip file, and re-dzip the zip file. function py2exe_zip_timestomp { @@ -311,11 +310,6 @@ script: | # Building goptlib cd goptlib - git update-index --refresh -q - export GIT_COMMITTER_NAME="nobody" - export GIT_COMMITTER_EMAIL="nobody@localhost" - export GIT_COMMITTER_DATE="$REFERENCE_DATETIME" - git am ~/build/bug12535.patch find -type f | xargs touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports" ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/goptlib.git" diff --git a/gitian/patches/bug12535.patch b/gitian/patches/bug12535.patch deleted file mode 100644 index dae6818..0000000 --- a/gitian/patches/bug12535.patch +++ /dev/null @@ -1,1032 +0,0 @@ -From 743ae58b6c33dda837ffb1267867f564597dd59d Mon Sep 17 00:00:00 2001 -From: Yawning Angel <yawning(a)schwanenlied.me> -Date: Mon, 8 Sep 2014 18:24:08 +0000 -Subject: [PATCH] Replace the SOCKS4a listener with a SOCKS5 listener. - -The change is designed to be transparent to calling code and implements -enough of RFC1928/RFC1929 such that pluggable transports can be written. - -Notable incompatibilities/limitations: - * GSSAPI authentication is not supported. - * BND.ADDR/BND.PORT in responses is always "0.0.0.0:0" instead of the - bound address/port of the outgoing socket. - * RFC1929 Username/Password authentication is setup exclusively for - pluggable transport arguments. - * The BIND and UDP ASSOCIATE commands are not supported. ---- - pt.go | 5 +- - socks.go | 386 +++++++++++++++++++++++++++++++++++++------- - socks_test.go | 510 +++++++++++++++++++++++++++++++++++++++++----------------- - 3 files changed, 685 insertions(+), 216 deletions(-) - -diff --git a/pt.go b/pt.go -index 62dfc38..47f8273 100644 ---- a/pt.go -+++ b/pt.go -@@ -119,10 +119,11 @@ - // Extended ORPort Authentication: - // https://gitweb.torproject.org/torspec.git/blob/HEAD:/proposals/217-ext-orpo…. - // --// The package implements a SOCKS4a server sufficient for a Tor client transport -+// The package implements a SOCKS5 server sufficient for a Tor client transport - // plugin. - // --// http://ftp.icm.edu.pl/packages/socks/socks4/SOCKS4.protocol -+// https://www.ietf.org/rfc/rfc1928.txt -+// https://www.ietf.org/rfc/rfc1929.txt - package pt - - import ( -diff --git a/socks.go b/socks.go -index 6ad6542..e4488e8 100644 ---- a/socks.go -+++ b/socks.go -@@ -9,11 +9,40 @@ import ( - ) - - const ( -- socksVersion = 0x04 -- socksCmdConnect = 0x01 -- socksResponseVersion = 0x00 -- socksRequestGranted = 0x5a -- socksRequestRejected = 0x5b -+ socksVersion = 0x05 -+ -+ socksAuthNoneRequired = 0x00 -+ socksAuthUsernamePassword = 0x02 -+ socksAuthNoAcceptableMethods = 0xff -+ -+ socksCmdConnect = 0x01 -+ socksRsv = 0x00 -+ -+ socksAtypeV4 = 0x01 -+ socksAtypeDomainName = 0x03 -+ socksAtypeV6 = 0x04 -+ -+ socksAuthRFC1929Ver = 0x01 -+ socksAuthRFC1929Success = 0x00 -+ socksAuthRFC1929Fail = 0x01 -+ -+ socksRepSucceeded = 0x00 -+ // "general SOCKS server failure" -+ SocksRepGeneralFailure = 0x01 -+ // "connection not allowed by ruleset" -+ SocksRepConnectionNotAllowed = 0x02 -+ // "Network unreachable" -+ SocksRepNetworkUnreachable = 0x03 -+ // "Host unreachable" -+ SocksRepHostUnreachable = 0x04 -+ // "Connection refused" -+ SocksRepConnectionRefused = 0x05 -+ // "TTL expired" -+ SocksRepTTLExpired = 0x06 -+ // "Command not supported" -+ SocksRepCommandNotSupported = 0x07 -+ // "Address type not supported" -+ SocksRepAddressNotSupported = 0x08 - ) - - // Put a sanity timeout on how long we wait for a SOCKS request. -@@ -25,6 +54,8 @@ type SocksRequest struct { - Target string - // The userid string sent by the client. - Username string -+ // The password string sent by the client. -+ Password string - // The parsed contents of Username as a key–value mapping. - Args Args - } -@@ -36,15 +67,23 @@ type SocksConn struct { - } - - // Send a message to the proxy client that access to the given address is --// granted. If the IP field inside addr is not an IPv4 address, the IP portion --// of the response will be four zero bytes. -+// granted. Addr is ignored, and "0.0.0.0:0" is always sent back for -+// BND.ADDR/BND.PORT in the SOCKS response. - func (conn *SocksConn) Grant(addr *net.TCPAddr) error { -- return sendSocks4aResponseGranted(conn, addr) -+ return sendSocks5ResponseGranted(conn) - } - --// Send a message to the proxy client that access was rejected or failed. -+// Send a message to the proxy client that access was rejected or failed. This -+// sends back a "General Failure" error code. RejectReason should be used if -+// more specific error reporting is desired. - func (conn *SocksConn) Reject() error { -- return sendSocks4aResponseRejected(conn) -+ return conn.RejectReason(SocksRepGeneralFailure) -+} -+ -+// Send a message to the proxy client that access was rejected, with the -+// specific error code indicating the reason behind the rejection. -+func (conn *SocksConn) RejectReason(reason byte) error { -+ return sendSocks5ResponseRejected(conn, reason) - } - - // SocksListener wraps a net.Listener in order to read a SOCKS request on Accept. -@@ -138,7 +177,7 @@ func (ln *SocksListener) AcceptSocks() (*SocksConn, error) { - if err != nil { - return nil, err - } -- conn.Req, err = readSocks4aConnect(conn) -+ conn.Req, err = socks5Handshake(conn) - if err != nil { - conn.Close() - return nil, err -@@ -150,58 +189,251 @@ func (ln *SocksListener) AcceptSocks() (*SocksConn, error) { - return conn, nil - } - --// Returns "socks4", suitable to be included in a call to Cmethod. -+// Returns "socks5", suitable to be included in a call to Cmethod. - func (ln *SocksListener) Version() string { -- return "socks4" -+ return "socks5" - } - --// Read a SOCKS4a connect request. Returns a SocksRequest. --func readSocks4aConnect(s io.Reader) (req SocksRequest, err error) { -- r := bufio.NewReader(s) -+// socks5handshake conducts the SOCKS5 handshake up to the point where the -+// client command is read and the proxy must open the outgoing connection. -+// Returns a SocksRequest. -+func socks5Handshake(s io.ReadWriter) (req SocksRequest, err error) { -+ rw := bufio.NewReadWriter(bufio.NewReader(s), bufio.NewWriter(s)) - -- var h [8]byte -- _, err = io.ReadFull(r, h[:]) -- if err != nil { -+ // Negotiate the authentication method. -+ var method byte -+ if method, err = socksNegotiateAuth(rw); err != nil { - return - } -- if h[0] != socksVersion { -- err = fmt.Errorf("SOCKS header had version 0x%02x, not 0x%02x", h[0], socksVersion) -+ -+ // Authenticate the client. -+ if err = socksAuthenticate(rw, method, &req); err != nil { - return - } -- if h[1] != socksCmdConnect { -- err = fmt.Errorf("SOCKS header had command 0x%02x, not 0x%02x", h[1], socksCmdConnect) -+ -+ // Read the command. -+ err = socksReadCommand(rw, &req) -+ return -+} -+ -+// socksNegotiateAuth negotiates the authentication method and returns the -+// selected method as a byte. On negotiation failures an error is returned. -+func socksNegotiateAuth(rw *bufio.ReadWriter) (method byte, err error) { -+ // Validate the version. -+ if err = socksReadByteVerify(rw, "version", socksVersion); err != nil { - return - } - -- var usernameBytes []byte -- usernameBytes, err = r.ReadBytes('\x00') -- if err != nil { -+ // Read the number of methods. -+ var nmethods byte -+ if nmethods, err = socksReadByte(rw); err != nil { - return - } -- req.Username = string(usernameBytes[:len(usernameBytes)-1]) - -- req.Args, err = parseClientParameters(req.Username) -- if err != nil { -+ // Read the methods. -+ var methods []byte -+ if methods, err = socksReadBytes(rw, int(nmethods)); err != nil { - return - } - -- var port int -- var host string -+ // Pick the most "suitable" method. -+ method = socksAuthNoAcceptableMethods -+ for _, m := range methods { -+ switch m { -+ case socksAuthNoneRequired: -+ // Pick Username/Password over None if the client happens to -+ // send both. -+ if method == socksAuthNoAcceptableMethods { -+ method = m -+ } -+ -+ case socksAuthUsernamePassword: -+ method = m -+ } -+ } -+ -+ // Send the negotiated method. -+ var msg [2]byte -+ msg[0] = socksVersion -+ msg[1] = method -+ if _, err = rw.Writer.Write(msg[:]); err != nil { -+ return -+ } -+ -+ if err = socksFlushBuffers(rw); err != nil { -+ return -+ } -+ return -+} -+ -+// socksAuthenticate authenticates the client via the chosen authentication -+// mechanism. -+func socksAuthenticate(rw *bufio.ReadWriter, method byte, req *SocksRequest) (err error) { -+ switch method { -+ case socksAuthNoneRequired: -+ // Straight into reading the connect. - -- port = int(h[2])<<8 | int(h[3])<<0 -- if h[4] == 0 && h[5] == 0 && h[6] == 0 && h[7] != 0 { -- var hostBytes []byte -- hostBytes, err = r.ReadBytes('\x00') -- if err != nil { -+ case socksAuthUsernamePassword: -+ if err = socksAuthRFC1929(rw, req); err != nil { - return - } -- host = string(hostBytes[:len(hostBytes)-1]) -+ -+ case socksAuthNoAcceptableMethods: -+ err = fmt.Errorf("SOCKS method select had no compatible methods") -+ return -+ -+ default: -+ err = fmt.Errorf("SOCKS method select picked a unsupported method 0x%02x", method) -+ return -+ } -+ -+ if err = socksFlushBuffers(rw); err != nil { -+ return -+ } -+ return -+} -+ -+// socksAuthRFC1929 authenticates the client via RFC 1929 username/password -+// auth. As a design decision any valid username/password is accepted as this -+// field is primarily used as an out-of-band argument passing mechanism for -+// pluggable transports. -+func socksAuthRFC1929(rw *bufio.ReadWriter, req *SocksRequest) (err error) { -+ sendErrResp := func() { -+ // Swallow the write/flush error here, we are going to close the -+ // connection and the original failure is more useful. -+ resp := []byte{socksAuthRFC1929Ver, socksAuthRFC1929Fail} -+ rw.Write(resp[:]) -+ socksFlushBuffers(rw) -+ } -+ -+ // Validate the fixed parts of the command message. -+ if err = socksReadByteVerify(rw, "auth version", socksAuthRFC1929Ver); err != nil { -+ sendErrResp() -+ return -+ } -+ -+ // Read the username. -+ var ulen byte -+ if ulen, err = socksReadByte(rw); err != nil { -+ return -+ } -+ if ulen < 1 { -+ sendErrResp() -+ err = fmt.Errorf("RFC1929 username with 0 length") -+ return -+ } -+ var uname []byte -+ if uname, err = socksReadBytes(rw, int(ulen)); err != nil { -+ return -+ } -+ req.Username = string(uname) -+ -+ // Read the password. -+ var plen byte -+ if plen, err = socksReadByte(rw); err != nil { -+ return -+ } -+ if plen < 1 { -+ sendErrResp() -+ err = fmt.Errorf("RFC1929 password with 0 length") -+ return -+ } -+ var passwd []byte -+ if passwd, err = socksReadBytes(rw, int(plen)); err != nil { -+ return -+ } -+ if !(plen == 1 && passwd[0] == 0x00) { -+ // tor will set the password to 'NUL' if there are no arguments. -+ req.Password = string(passwd) -+ } -+ -+ // Mash the username/password together and parse it as a pluggable -+ // transport argument string. -+ if req.Args, err = parseClientParameters(req.Username + req.Password); err != nil { -+ sendErrResp() - } else { -- host = net.IPv4(h[4], h[5], h[6], h[7]).String() -+ resp := []byte{socksAuthRFC1929Ver, socksAuthRFC1929Success} -+ _, err = rw.Write(resp[:]) -+ } -+ return -+} -+ -+// socksReadCommand reads a SOCKS5 client command and parses out the relevant -+// fields into a SocksRequest. Only CMD_CONNECT is supported. -+func socksReadCommand(rw *bufio.ReadWriter, req *SocksRequest) (err error) { -+ sendErrResp := func(reason byte) { -+ // Swallow errors that occur when writing/flushing the response, -+ // connection will be closed anyway. -+ sendSocks5ResponseRejected(rw, reason) -+ socksFlushBuffers(rw) -+ } -+ -+ // Validate the fixed parts of the command message. -+ if err = socksReadByteVerify(rw, "version", socksVersion); err != nil { -+ sendErrResp(SocksRepGeneralFailure) -+ return -+ } -+ if err = socksReadByteVerify(rw, "command", socksCmdConnect); err != nil { -+ sendErrResp(SocksRepCommandNotSupported) -+ return -+ } -+ if err = socksReadByteVerify(rw, "reserved", socksRsv); err != nil { -+ sendErrResp(SocksRepGeneralFailure) -+ return -+ } -+ -+ // Read the destination address/port. -+ // XXX: This should probably eventually send socks 5 error messages instead -+ // of rudely closing connections on invalid addresses. -+ var atype byte -+ if atype, err = socksReadByte(rw); err != nil { -+ return -+ } -+ var host string -+ switch atype { -+ case socksAtypeV4: -+ var addr []byte -+ if addr, err = socksReadBytes(rw, net.IPv4len); err != nil { -+ return -+ } -+ host = net.IPv4(addr[0], addr[1], addr[2], addr[3]).String() -+ -+ case socksAtypeDomainName: -+ var alen byte -+ if alen, err = socksReadByte(rw); err != nil { -+ return -+ } -+ if alen == 0 { -+ err = fmt.Errorf("SOCKS request had domain name with 0 length") -+ return -+ } -+ var addr []byte -+ if addr, err = socksReadBytes(rw, int(alen)); err != nil { -+ return -+ } -+ host = string(addr) -+ -+ case socksAtypeV6: -+ var rawAddr []byte -+ if rawAddr, err = socksReadBytes(rw, net.IPv6len); err != nil { -+ return -+ } -+ addr := make(net.IP, net.IPv6len) -+ copy(addr[:], rawAddr[:]) -+ host = fmt.Sprintf("[%s]", addr.String()) -+ -+ default: -+ sendErrResp(SocksRepAddressNotSupported) -+ err = fmt.Errorf("SOCKS request had unsupported address type 0x%02x", atype) -+ return - } -+ var rawPort []byte -+ if rawPort, err = socksReadBytes(rw, 2); err != nil { -+ return -+ } -+ port := int(rawPort[0])<<8 | int(rawPort[1])<<0 - -- if r.Buffered() != 0 { -- err = fmt.Errorf("%d bytes left after SOCKS header", r.Buffered()) -+ if err = socksFlushBuffers(rw); err != nil { - return - } - -@@ -209,34 +441,64 @@ func readSocks4aConnect(s io.Reader) (req SocksRequest, err error) { - return - } - --// Send a SOCKS4a response with the given code and address. If the IP field --// inside addr is not an IPv4 address, the IP portion of the response will be --// four zero bytes. --func sendSocks4aResponse(w io.Writer, code byte, addr *net.TCPAddr) error { -- var resp [8]byte -- resp[0] = socksResponseVersion -+// Send a SOCKS5 response with the given code. BND.ADDR/BND.PORT is always the -+// IPv4 address/port "0.0.0.0:0". -+func sendSocks5Response(w io.Writer, code byte) error { -+ resp := make([]byte, 4+4+2) -+ resp[0] = socksVersion - resp[1] = code -- resp[2] = byte((addr.Port >> 8) & 0xff) -- resp[3] = byte((addr.Port >> 0) & 0xff) -- ipv4 := addr.IP.To4() -- if ipv4 != nil { -- resp[4] = ipv4[0] -- resp[5] = ipv4[1] -- resp[6] = ipv4[2] -- resp[7] = ipv4[3] -- } -+ resp[2] = socksRsv -+ resp[3] = socksAtypeV4 -+ -+ // BND.ADDR/BND.PORT should be the address and port that the outgoing -+ // connection is bound to on the proxy, but Tor does not use this -+ // information, so all zeroes are sent. -+ - _, err := w.Write(resp[:]) - return err - } - --var emptyAddr = net.TCPAddr{IP: net.IPv4(0, 0, 0, 0), Port: 0} -+// Send a SOCKS5 response code 0x00. -+func sendSocks5ResponseGranted(w io.Writer) error { -+ return sendSocks5Response(w, socksRepSucceeded) -+} - --// Send a SOCKS4a response code 0x5a. --func sendSocks4aResponseGranted(w io.Writer, addr *net.TCPAddr) error { -- return sendSocks4aResponse(w, socksRequestGranted, addr) -+// Send a SOCKS5 response with the provided failure reason. -+func sendSocks5ResponseRejected(w io.Writer, reason byte) error { -+ return sendSocks5Response(w, reason) - } - --// Send a SOCKS4a response code 0x5b (with an all-zero address). --func sendSocks4aResponseRejected(w io.Writer) error { -- return sendSocks4aResponse(w, socksRequestRejected, &emptyAddr) -+func socksFlushBuffers(rw *bufio.ReadWriter) error { -+ if err := rw.Writer.Flush(); err != nil { -+ return err -+ } -+ if rw.Reader.Buffered() > 0 { -+ return fmt.Errorf("%d bytes left after SOCKS message", rw.Reader.Buffered()) -+ } -+ return nil -+} -+ -+func socksReadByte(rw *bufio.ReadWriter) (byte, error) { -+ return rw.Reader.ReadByte() -+} -+ -+func socksReadBytes(rw *bufio.ReadWriter, n int) ([]byte, error) { -+ ret := make([]byte, n) -+ if _, err := io.ReadFull(rw.Reader, ret); err != nil { -+ return nil, err -+ } -+ return ret, nil - } -+ -+func socksReadByteVerify(rw *bufio.ReadWriter, descr string, expected byte) error { -+ val, err := socksReadByte(rw) -+ if err != nil { -+ return err -+ } -+ if val != expected { -+ return fmt.Errorf("SOCKS message field %s was 0x%02x, not 0x%02x", descr, val, expected) -+ } -+ return nil -+} -+ -+var _ net.Listener = (*SocksListener)(nil) -diff --git a/socks_test.go b/socks_test.go -index 18d141a..aa27d4c 100644 ---- a/socks_test.go -+++ b/socks_test.go -@@ -1,162 +1,368 @@ - package pt - - import ( -+ "bufio" - "bytes" -+ "encoding/hex" -+ "io" - "net" - "testing" - ) - --func TestReadSocks4aConnect(t *testing.T) { -- badTests := [...][]byte{ -- []byte(""), -- // missing userid -- []byte("\x04\x01\x12\x34\x01\x02\x03\x04"), -- // missing \x00 after userid -- []byte("\x04\x01\x12\x34\x01\x02\x03\x04key=value"), -- // missing hostname -- []byte("\x04\x01\x12\x34\x00\x00\x00\x01key=value\x00"), -- // missing \x00 after hostname -- []byte("\x04\x01\x12\x34\x00\x00\x00\x01key=value\x00hostname"), -- // bad name–value mapping -- []byte("\x04\x01\x12\x34\x00\x00\x00\x01userid\x00hostname\x00"), -- // bad version number -- []byte("\x03\x01\x12\x34\x01\x02\x03\x04\x00"), -- // BIND request -- []byte("\x04\x02\x12\x34\x01\x02\x03\x04\x00"), -- // SOCKS5 -- []byte("\x05\x01\x00"), -- } -- ipTests := [...]struct { -- input []byte -- addr net.TCPAddr -- userid string -- }{ -- { -- []byte("\x04\x01\x12\x34\x01\x02\x03\x04key=value\x00"), -- net.TCPAddr{IP: net.ParseIP("1.2.3.4"), Port: 0x1234}, -- "key=value", -- }, -- { -- []byte("\x04\x01\x12\x34\x01\x02\x03\x04\x00"), -- net.TCPAddr{IP: net.ParseIP("1.2.3.4"), Port: 0x1234}, -- "", -- }, -- } -- hostnameTests := [...]struct { -- input []byte -- target string -- userid string -- }{ -- { -- []byte("\x04\x01\x12\x34\x00\x00\x00\x01key=value\x00hostname\x00"), -- "hostname:4660", -- "key=value", -- }, -- { -- []byte("\x04\x01\x12\x34\x00\x00\x00\x01\x00hostname\x00"), -- "hostname:4660", -- "", -- }, -- { -- []byte("\x04\x01\x12\x34\x00\x00\x00\x01key=value\x00\x00"), -- ":4660", -- "key=value", -- }, -- { -- []byte("\x04\x01\x12\x34\x00\x00\x00\x01\x00\x00"), -- ":4660", -- "", -- }, -- } -- -- for _, input := range badTests { -- var buf bytes.Buffer -- buf.Write(input) -- _, err := readSocks4aConnect(&buf) -- if err == nil { -- t.Errorf("%q unexpectedly succeeded", input) -- } -- } -- -- for _, test := range ipTests { -- var buf bytes.Buffer -- buf.Write(test.input) -- req, err := readSocks4aConnect(&buf) -- if err != nil { -- t.Errorf("%q unexpectedly returned an error: %s", test.input, err) -- } -- addr, err := net.ResolveTCPAddr("tcp", req.Target) -- if err != nil { -- t.Errorf("%q → target %q: cannot resolve: %s", test.input, -- req.Target, err) -- } -- if !tcpAddrsEqual(addr, &test.addr) { -- t.Errorf("%q → address %s (expected %s)", test.input, -- req.Target, test.addr.String()) -- } -- if req.Username != test.userid { -- t.Errorf("%q → username %q (expected %q)", test.input, -- req.Username, test.userid) -- } -- if req.Args == nil { -- t.Errorf("%q → unexpected nil Args from username %q", test.input, req.Username) -- } -- } -- -- for _, test := range hostnameTests { -- var buf bytes.Buffer -- buf.Write(test.input) -- req, err := readSocks4aConnect(&buf) -- if err != nil { -- t.Errorf("%q unexpectedly returned an error: %s", test.input, err) -- } -- if req.Target != test.target { -- t.Errorf("%q → target %q (expected %q)", test.input, -- req.Target, test.target) -- } -- if req.Username != test.userid { -- t.Errorf("%q → username %q (expected %q)", test.input, -- req.Username, test.userid) -- } -- if req.Args == nil { -- t.Errorf("%q → unexpected nil Args from username %q", test.input, req.Username) -- } -- } --} -- --func TestSendSocks4aResponse(t *testing.T) { -- tests := [...]struct { -- code byte -- addr net.TCPAddr -- expected []byte -- }{ -- { -- socksRequestGranted, -- net.TCPAddr{IP: net.ParseIP("1.2.3.4"), Port: 0x1234}, -- []byte("\x00\x5a\x12\x34\x01\x02\x03\x04"), -- }, -- { -- socksRequestRejected, -- net.TCPAddr{IP: net.ParseIP("1:2::3:4"), Port: 0x1234}, -- []byte("\x00\x5b\x12\x34\x00\x00\x00\x00"), -- }, -- } -- -- for _, test := range tests { -- var buf bytes.Buffer -- err := sendSocks4aResponse(&buf, test.code, &test.addr) -- if err != nil { -- t.Errorf("0x%02x %s unexpectedly returned an error: %s", test.code, &test.addr, err) -- } -- p := make([]byte, 1024) -- n, err := buf.Read(p) -- if err != nil { -- t.Fatal(err) -- } -- output := p[:n] -- if !bytes.Equal(output, test.expected) { -- t.Errorf("0x%02x %s → %v (expected %v)", -- test.code, &test.addr, output, test.expected) -- } -+// testReadWriter is a bytes.Buffer backed io.ReadWriter used for testing. The -+// Read and Write routines are to be used by the component being tested. Data -+// can be written to and read back via the writeHex and readHex routines. -+type testReadWriter struct { -+ readBuf bytes.Buffer -+ writeBuf bytes.Buffer -+} -+ -+func (c *testReadWriter) Read(buf []byte) (n int, err error) { -+ return c.readBuf.Read(buf) -+} -+ -+func (c *testReadWriter) Write(buf []byte) (n int, err error) { -+ return c.writeBuf.Write(buf) -+} -+ -+func (c *testReadWriter) writeHex(str string) (n int, err error) { -+ var buf []byte -+ if buf, err = hex.DecodeString(str); err != nil { -+ return -+ } -+ return c.readBuf.Write(buf) -+} -+ -+func (c *testReadWriter) readHex() string { -+ return hex.EncodeToString(c.writeBuf.Bytes()) -+} -+ -+func (c *testReadWriter) toBufio() *bufio.ReadWriter { -+ return bufio.NewReadWriter(bufio.NewReader(c), bufio.NewWriter(c)) -+} -+ -+func (c *testReadWriter) reset() { -+ c.readBuf.Reset() -+ c.writeBuf.Reset() -+} -+ -+// TestAuthInvalidVersion tests auth negotiation with an invalid version. -+func TestAuthInvalidVersion(t *testing.T) { -+ c := new(testReadWriter) -+ -+ // VER = 03, NMETHODS = 01, METHODS = [00] -+ c.writeHex("030100") -+ if _, err := socksNegotiateAuth(c.toBufio()); err == nil { -+ t.Error("socksNegotiateAuth(InvalidVersion) succeded") -+ } -+} -+ -+// TestAuthInvalidNMethods tests auth negotiaton with no methods. -+func TestAuthInvalidNMethods(t *testing.T) { -+ c := new(testReadWriter) -+ var err error -+ var method byte -+ -+ // VER = 05, NMETHODS = 00 -+ c.writeHex("0500") -+ if method, err = socksNegotiateAuth(c.toBufio()); err != nil { -+ t.Error("socksNegotiateAuth(No Methods) failed:", err) -+ } -+ if method != socksAuthNoAcceptableMethods { -+ t.Error("socksNegotiateAuth(No Methods) picked unexpected method:", method) -+ } -+ if msg := c.readHex(); msg != "05ff" { -+ t.Error("socksNegotiateAuth(No Methods) invalid response:", msg) -+ } -+} -+ -+// TestAuthNoneRequired tests auth negotiaton with NO AUTHENTICATION REQUIRED. -+func TestAuthNoneRequired(t *testing.T) { -+ c := new(testReadWriter) -+ var err error -+ var method byte -+ -+ // VER = 05, NMETHODS = 01, METHODS = [00] -+ c.writeHex("050100") -+ if method, err = socksNegotiateAuth(c.toBufio()); err != nil { -+ t.Error("socksNegotiateAuth(None) failed:", err) -+ } -+ if method != socksAuthNoneRequired { -+ t.Error("socksNegotiateAuth(None) unexpected method:", method) -+ } -+ if msg := c.readHex(); msg != "0500" { -+ t.Error("socksNegotiateAuth(None) invalid response:", msg) -+ } -+} -+ -+// TestAuthUsernamePassword tests auth negotiation with USERNAME/PASSWORD. -+func TestAuthUsernamePassword(t *testing.T) { -+ c := new(testReadWriter) -+ var err error -+ var method byte -+ -+ // VER = 05, NMETHODS = 01, METHODS = [02] -+ c.writeHex("050102") -+ if method, err = socksNegotiateAuth(c.toBufio()); err != nil { -+ t.Error("socksNegotiateAuth(UsernamePassword) failed:", err) -+ } -+ if method != socksAuthUsernamePassword { -+ t.Error("socksNegotiateAuth(UsernamePassword) unexpected method:", method) -+ } -+ if msg := c.readHex(); msg != "0502" { -+ t.Error("socksNegotiateAuth(UsernamePassword) invalid response:", msg) - } - } -+ -+// TestAuthBoth tests auth negotiation containing both NO AUTHENTICATION -+// REQUIRED and USERNAME/PASSWORD. -+func TestAuthBoth(t *testing.T) { -+ c := new(testReadWriter) -+ var err error -+ var method byte -+ -+ // VER = 05, NMETHODS = 02, METHODS = [00, 02] -+ c.writeHex("05020002") -+ if method, err = socksNegotiateAuth(c.toBufio()); err != nil { -+ t.Error("socksNegotiateAuth(Both) failed:", err) -+ } -+ if method != socksAuthUsernamePassword { -+ t.Error("socksNegotiateAuth(Both) unexpected method:", method) -+ } -+ if msg := c.readHex(); msg != "0502" { -+ t.Error("socksNegotiateAuth(Both) invalid response:", msg) -+ } -+} -+ -+// TestAuthUnsupported tests auth negotiation with a unsupported method. -+func TestAuthUnsupported(t *testing.T) { -+ c := new(testReadWriter) -+ var err error -+ var method byte -+ -+ // VER = 05, NMETHODS = 01, METHODS = [01] (GSSAPI) -+ c.writeHex("050101") -+ if method, err = socksNegotiateAuth(c.toBufio()); err != nil { -+ t.Error("socksNegotiateAuth(Unknown) failed:", err) -+ } -+ if method != socksAuthNoAcceptableMethods { -+ t.Error("socksNegotiateAuth(Unknown) picked unexpected method:", method) -+ } -+ if msg := c.readHex(); msg != "05ff" { -+ t.Error("socksNegotiateAuth(Unknown) invalid response:", msg) -+ } -+} -+ -+// TestAuthUnsupported2 tests auth negotiation with supported and unsupported -+// methods. -+func TestAuthUnsupported2(t *testing.T) { -+ c := new(testReadWriter) -+ var err error -+ var method byte -+ -+ // VER = 05, NMETHODS = 03, METHODS = [00,01,02] -+ c.writeHex("0503000102") -+ if method, err = socksNegotiateAuth(c.toBufio()); err != nil { -+ t.Error("socksNegotiateAuth(Unknown2) failed:", err) -+ } -+ if method != socksAuthUsernamePassword { -+ t.Error("socksNegotiateAuth(Unknown2) picked unexpected method:", method) -+ } -+ if msg := c.readHex(); msg != "0502" { -+ t.Error("socksNegotiateAuth(Unknown2) invalid response:", msg) -+ } -+} -+ -+// TestRFC1929InvalidVersion tests RFC1929 auth with an invalid version. -+func TestRFC1929InvalidVersion(t *testing.T) { -+ c := new(testReadWriter) -+ var req SocksRequest -+ -+ // VER = 03, ULEN = 5, UNAME = "ABCDE", PLEN = 5, PASSWD = "abcde" -+ c.writeHex("03054142434445056162636465") -+ if err := socksAuthenticate(c.toBufio(), socksAuthUsernamePassword, &req); err == nil { -+ t.Error("socksAuthenticate(InvalidVersion) succeded") -+ } -+ if msg := c.readHex(); msg != "0101" { -+ t.Error("socksAuthenticate(InvalidVersion) invalid response:", msg) -+ } -+} -+ -+// TestRFC1929InvalidUlen tests RFC1929 auth with an invalid ULEN. -+func TestRFC1929InvalidUlen(t *testing.T) { -+ c := new(testReadWriter) -+ var req SocksRequest -+ -+ // VER = 01, ULEN = 0, UNAME = "", PLEN = 5, PASSWD = "abcde" -+ c.writeHex("0100056162636465") -+ if err := socksAuthenticate(c.toBufio(), socksAuthUsernamePassword, &req); err == nil { -+ t.Error("socksAuthenticate(InvalidUlen) succeded") -+ } -+ if msg := c.readHex(); msg != "0101" { -+ t.Error("socksAuthenticate(InvalidUlen) invalid response:", msg) -+ } -+} -+ -+// TestRFC1929InvalidPlen tests RFC1929 auth with an invalid PLEN. -+func TestRFC1929InvalidPlen(t *testing.T) { -+ c := new(testReadWriter) -+ var req SocksRequest -+ -+ // VER = 01, ULEN = 5, UNAME = "ABCDE", PLEN = 0, PASSWD = "" -+ c.writeHex("0105414243444500") -+ if err := socksAuthenticate(c.toBufio(), socksAuthUsernamePassword, &req); err == nil { -+ t.Error("socksAuthenticate(InvalidPlen) succeded") -+ } -+ if msg := c.readHex(); msg != "0101" { -+ t.Error("socksAuthenticate(InvalidPlen) invalid response:", msg) -+ } -+} -+ -+// TestRFC1929InvalidArgs tests RFC1929 auth with invalid pt args. -+func TestRFC1929InvalidPTArgs(t *testing.T) { -+ c := new(testReadWriter) -+ var req SocksRequest -+ -+ // VER = 01, ULEN = 5, UNAME = "ABCDE", PLEN = 5, PASSWD = "abcde" -+ c.writeHex("01054142434445056162636465") -+ if err := socksAuthenticate(c.toBufio(), socksAuthUsernamePassword, &req); err == nil { -+ t.Error("socksAuthenticate(InvalidArgs) succeded") -+ } -+ if msg := c.readHex(); msg != "0101" { -+ t.Error("socksAuthenticate(InvalidArgs) invalid response:", msg) -+ } -+} -+ -+// TestRFC1929Success tests RFC1929 auth with valid pt args. -+func TestRFC1929Success(t *testing.T) { -+ c := new(testReadWriter) -+ var req SocksRequest -+ -+ // VER = 01, ULEN = 9, UNAME = "key=value", PLEN = 1, PASSWD = "\0" -+ c.writeHex("01096b65793d76616c75650100") -+ if err := socksAuthenticate(c.toBufio(), socksAuthUsernamePassword, &req); err != nil { -+ t.Error("socksAuthenticate(Success) failed:", err) -+ } -+ if msg := c.readHex(); msg != "0100" { -+ t.Error("socksAuthenticate(Success) invalid response:", msg) -+ } -+ v, ok := req.Args.Get("key") -+ if v != "value" || !ok { -+ t.Error("RFC1929 k,v parse failure:", v) -+ } -+} -+ -+// TestRequestInvalidHdr tests SOCKS5 requests with invalid VER/CMD/RSV/ATYPE -+func TestRequestInvalidHdr(t *testing.T) { -+ c := new(testReadWriter) -+ var req SocksRequest -+ -+ // VER = 03, CMD = 01, RSV = 00, ATYPE = 01, DST.ADDR = 127.0.0.1, DST.PORT = 9050 -+ c.writeHex("030100017f000001235a") -+ if err := socksReadCommand(c.toBufio(), &req); err == nil { -+ t.Error("socksReadCommand(InvalidVer) succeded") -+ } -+ if msg := c.readHex(); msg != "05010001000000000000" { -+ t.Error("socksReadCommand(InvalidVer) invalid response:", msg) -+ } -+ c.reset() -+ -+ // VER = 05, CMD = 05, RSV = 00, ATYPE = 01, DST.ADDR = 127.0.0.1, DST.PORT = 9050 -+ c.writeHex("050500017f000001235a") -+ if err := socksReadCommand(c.toBufio(), &req); err == nil { -+ t.Error("socksReadCommand(InvalidCmd) succeded") -+ } -+ if msg := c.readHex(); msg != "05070001000000000000" { -+ t.Error("socksReadCommand(InvalidCmd) invalid response:", msg) -+ } -+ c.reset() -+ -+ // VER = 05, CMD = 01, RSV = 30, ATYPE = 01, DST.ADDR = 127.0.0.1, DST.PORT = 9050 -+ c.writeHex("050130017f000001235a") -+ if err := socksReadCommand(c.toBufio(), &req); err == nil { -+ t.Error("socksReadCommand(InvalidRsv) succeded") -+ } -+ if msg := c.readHex(); msg != "05010001000000000000" { -+ t.Error("socksReadCommand(InvalidRsv) invalid response:", msg) -+ } -+ c.reset() -+ -+ // VER = 05, CMD = 01, RSV = 01, ATYPE = 05, DST.ADDR = 127.0.0.1, DST.PORT = 9050 -+ c.writeHex("050100057f000001235a") -+ if err := socksReadCommand(c.toBufio(), &req); err == nil { -+ t.Error("socksReadCommand(InvalidAtype) succeded") -+ } -+ if msg := c.readHex(); msg != "05080001000000000000" { -+ t.Error("socksAuthenticate(InvalidAtype) invalid response:", msg) -+ } -+ c.reset() -+} -+ -+// TestRequestIPv4 tests IPv4 SOCKS5 requests. -+func TestRequestIPv4(t *testing.T) { -+ c := new(testReadWriter) -+ var req SocksRequest -+ -+ // VER = 05, CMD = 01, RSV = 00, ATYPE = 01, DST.ADDR = 127.0.0.1, DST.PORT = 9050 -+ c.writeHex("050100017f000001235a") -+ if err := socksReadCommand(c.toBufio(), &req); err != nil { -+ t.Error("socksReadCommand(IPv4) failed:", err) -+ } -+ addr, err := net.ResolveTCPAddr("tcp", req.Target) -+ if err != nil { -+ t.Error("net.ResolveTCPAddr failed:", err) -+ } -+ if !tcpAddrsEqual(addr, &net.TCPAddr{IP: net.ParseIP("127.0.0.1"), Port: 9050}) { -+ t.Error("Unexpected target:", addr) -+ } -+} -+ -+// TestRequestIPv6 tests IPv4 SOCKS5 requests. -+func TestRequestIPv6(t *testing.T) { -+ c := new(testReadWriter) -+ var req SocksRequest -+ -+ // VER = 05, CMD = 01, RSV = 00, ATYPE = 04, DST.ADDR = 0102:0304:0506:0708:090a:0b0c:0d0e:0f10, DST.PORT = 9050 -+ c.writeHex("050100040102030405060708090a0b0c0d0e0f10235a") -+ if err := socksReadCommand(c.toBufio(), &req); err != nil { -+ t.Error("socksReadCommand(IPv6) failed:", err) -+ } -+ addr, err := net.ResolveTCPAddr("tcp", req.Target) -+ if err != nil { -+ t.Error("net.ResolveTCPAddr failed:", err) -+ } -+ if !tcpAddrsEqual(addr, &net.TCPAddr{IP: net.ParseIP("0102:0304:0506:0708:090a:0b0c:0d0e:0f10"), Port: 9050}) { -+ t.Error("Unexpected target:", addr) -+ } -+} -+ -+// TestRequestFQDN tests FQDN (DOMAINNAME) SOCKS5 requests. -+func TestRequestFQDN(t *testing.T) { -+ c := new(testReadWriter) -+ var req SocksRequest -+ -+ // VER = 05, CMD = 01, RSV = 00, ATYPE = 04, DST.ADDR = example.com, DST.PORT = 9050 -+ c.writeHex("050100030b6578616d706c652e636f6d235a") -+ if err := socksReadCommand(c.toBufio(), &req); err != nil { -+ t.Error("socksReadCommand(FQDN) failed:", err) -+ } -+ if req.Target != "example.com:9050" { -+ t.Error("Unexpected target:", req.Target) -+ } -+} -+ -+// TestResponseNil tests nil address SOCKS5 responses. -+func TestResponseNil(t *testing.T) { -+ c := new(testReadWriter) -+ -+ b := c.toBufio() -+ if err := sendSocks5ResponseGranted(b); err != nil { -+ t.Error("sendSocks5ResponseGranted() failed:", err) -+ } -+ b.Flush() -+ if msg := c.readHex(); msg != "05000001000000000000" { -+ t.Error("sendSocks5ResponseGranted(nil) invalid response:", msg) -+ } -+} -+ -+var _ io.ReadWriter = (*testReadWriter)(nil) --- -2.3.3 -

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 27 Mar '15

27 Mar '15

commit 7c36612b85e56c150ec6e14acdb48bdd8a03393e Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 27 06:45:04 2015 +0000 Update translations for gettor --- bn_IN/gettor.po | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/bn_IN/gettor.po b/bn_IN/gettor.po index 0b8f30b..d06378f 100644 --- a/bn_IN/gettor.po +++ b/bn_IN/gettor.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2015-03-27 06:12+0000\n" +"PO-Revision-Date: 2015-03-27 06:43+0000\n" "Last-Translator: Rajarshi Bhowmick <raz.bhowmick(a)gmail.com>\n" "Language-Team: Bengali (India) (http://www.transifex.com/projects/p/torproject/language/bn_IN/)\n" "MIME-Version: 1.0\n" @@ -45,13 +45,13 @@ 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 "(আমরা দুঃক্ষিত, যদি আপনি আমাদের কাছথেকে এই বার্তা আশা না করে থাকেন.\nযেহেতু আপনার ইমেল এড্রেস DKIM সমর্থন করে না, তাই আমরা একটি সংক্ষিপ্ত ব্যাখ্যা প্রেরণ করেছি.\nএবং পরের বার আমরা এই ইমেইল এড্রেস উপেক্ষা করব.)" #: lib/gettor/i18n.py:43 lib/gettor/i18n.py:135 msgid "" "If you have any questions or it doesn't work, you can contact a\n" "human at this support email address: help(a)rt.torproject.org" -msgstr "" +msgstr "আপনার যদি আর কোন প্রশ্ন থাকে অথবা এটি কাজ না করে, তখন কোন মানুষকে\nসহায়তার জন্য যোগাযোগের ইমেইল এড্রেসটি হল: help(a)rt.torproject.org" #: lib/gettor/i18n.py:46 msgid "" @@ -100,11 +100,11 @@ msgstr "" #: lib/gettor/i18n.py:76 msgid " List of supported locales:" -msgstr "" +msgstr "সমর্থিত স্থানিয়ের তালিকা:" #: lib/gettor/i18n.py:78 msgid "Here is a list of all available languages:" -msgstr "" +msgstr "এখানে সব ব্যবহারযোগ্য ভাষার একটি তালিকা:" #: lib/gettor/i18n.py:80 msgid "" @@ -123,13 +123,13 @@ msgstr "" #: lib/gettor/i18n.py:92 msgid "If you select no language, you will receive the English version." -msgstr "" +msgstr "আপনি কোন ভাষা নির্বাচন না করেন তবে, আপনি ইংরেজি সংস্করণ পাবেন." #: lib/gettor/i18n.py:94 msgid "" "SMALLER SIZED PACKAGES\n" "======================" -msgstr "" +msgstr "ছোট আকারের প্যাকেজ\n======================" #: lib/gettor/i18n.py:97 msgid "" @@ -198,7 +198,7 @@ msgstr "" msgid "" "SUPPORT\n" "=======" -msgstr "" +msgstr "সহায়তা\n======= " #: lib/gettor/i18n.py:138 msgid "" @@ -314,7 +314,7 @@ msgstr "" msgid "" "UNPACKING THE FILES\n" "===================" -msgstr "" +msgstr "ফাইলগুলি আন-প্যাক হচ্ছে\n===================" #: lib/gettor/i18n.py:205 msgid "" @@ -432,11 +432,11 @@ msgstr "" msgid "" "FREQUENTLY ASKED QUESTIONS\n" "==========================" -msgstr "" +msgstr "যে প্রশ্ন গুলি প্রায় জানতে চাওয়া হয়\n==========================" #: lib/gettor/i18n.py:272 msgid "What is Tor?" -msgstr "" +msgstr "টর কি জিনিস ?" #: lib/gettor/i18n.py:274 msgid "The name \"Tor\" can refer to several different components." @@ -457,7 +457,7 @@ msgstr "" #: lib/gettor/i18n.py:286 msgid "What is the Tor Browser Bundle?" -msgstr "" +msgstr "\"টর ব্রাউসার বান্ডিল\" কি?" #: lib/gettor/i18n.py:288 msgid "" @@ -468,7 +468,7 @@ msgstr "" #: lib/gettor/i18n.py:292 msgid "What package should I request?" -msgstr "" +msgstr "আমি কি প্যাকেজ অনুরোধ করতে পারি? " #: lib/gettor/i18n.py:294 msgid "" @@ -484,11 +484,11 @@ msgstr "" #: lib/gettor/i18n.py:301 msgid "QUESTION:" -msgstr "" +msgstr "প্রশ্ন:" #: lib/gettor/i18n.py:303 msgid "ANSWER:" -msgstr "" +msgstr "উত্তর: " #: lib/gettor/i18n.py:305 #, python-format

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 27 Mar '15

27 Mar '15

commit 121c68c523bcc72d97b505d7852804951ac03b90 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 27 06:15:05 2015 +0000 Update translations for gettor --- bn_IN/gettor.po | 503 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 503 insertions(+) diff --git a/bn_IN/gettor.po b/bn_IN/gettor.po new file mode 100644 index 0000000..0b8f30b --- /dev/null +++ b/bn_IN/gettor.po @@ -0,0 +1,503 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Rajarshi Bhowmick <raz.bhowmick(a)gmail.com>, 2015 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-01-19 13:40+0100\n" +"PO-Revision-Date: 2015-03-27 06:12+0000\n" +"Last-Translator: Rajarshi Bhowmick <raz.bhowmick(a)gmail.com>\n" +"Language-Team: Bengali (India) (http://www.transifex.com/projects/p/torproject/language/bn_IN/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: bn_IN\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: lib/gettor/i18n.py:27 +msgid "Hello, This is the \"GetTor\" robot." +msgstr "নমস্কার, আমি হলাম \"গেট-টর\" রোবট " + +#: lib/gettor/i18n.py:29 +msgid "Thank you for your request." +msgstr "আপনার অনুরোধের জন্য ধন্যবাদ |" + +#: lib/gettor/i18n.py:31 +msgid "" +"Unfortunately, we won't answer you at this address. You should make\n" +"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n" +"one of those." +msgstr "আমরা বিশেষ কারন বশত এই আড্রেস এ কোনো উত্তর দিই না. আপনাকে হয় GOOGLE.COM বা YAHOO.COM অথবা YAHOO.CN এ একটি ইমেইল আড্রেস খুলতে হবে, \nএবং সেখান থেকে আমাদের বার্তা পাঠাতে হবে." + +#: lib/gettor/i18n.py:35 +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 "আমরা সেই সব ইমেল আড্রেস এর থেকে অনুরোধ গ্রহণকরি যে গুলি \"DKIM\" সমর্থন করে. \nএটি এমন একটি বৈশিষ্ট যেটি আমাদের বার্তাটি কোন আসল জায়গা থেকে পাঠানো হয়েছে কি না, সেটা পরীক্ষা করতে দেয়. " + +#: 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 "" + +#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:135 +msgid "" +"If you have any questions or it doesn't work, you can contact a\n" +"human at this support email address: help(a)rt.torproject.org" +msgstr "" + +#: lib/gettor/i18n.py:46 +msgid "" +"I will mail you a Tor package, if you tell me which one you want.\n" +"Please select one of the following package names:\n" +"\n" +" windows\n" +" macos-i386\n" +" macos-ppc\n" +" linux-i386\n" +" linux-x86_64\n" +" obfs-windows\n" +" obfs-macos-i386\n" +" obfs-macos-x86_64\n" +" obfs-linux-i386\n" +" obfs-linux-x86_64\n" +" source" +msgstr "" + +#: lib/gettor/i18n.py:61 +msgid "" +"Please reply to this mail, and tell me a single package name anywhere \n" +"in the body of your email." +msgstr "" + +#: lib/gettor/i18n.py:64 +msgid "" +"OBTAINING LOCALIZED VERSIONS OF TOR\n" +"===================================" +msgstr "" + +#: lib/gettor/i18n.py:67 +msgid "" +"To get a version of Tor translated into your language, specify the\n" +"language you want in the address you send the mail to:\n" +"\n" +" gettor+fa(a)torproject.org" +msgstr "" + +#: lib/gettor/i18n.py:72 +msgid "" +"This example will give you the requested package in a localized\n" +"version for Farsi (Persian). Check below for a list of supported language\n" +"codes. " +msgstr "" + +#: lib/gettor/i18n.py:76 +msgid " List of supported locales:" +msgstr "" + +#: lib/gettor/i18n.py:78 +msgid "Here is a list of all available languages:" +msgstr "" + +#: lib/gettor/i18n.py:80 +msgid "" +" gettor+ar(a)torproject.org: Arabic\n" +" gettor+de(a)torproject.org: German\n" +" gettor+en(a)torproject.org: English\n" +" gettor+es(a)torproject.org: Spanish\n" +" gettor+fa(a)torproject.org: Farsi (Iran)\n" +" gettor+fr(a)torproject.org: French\n" +" gettor+it(a)torproject.org: Italian\n" +" gettor+nl(a)torproject.org: Dutch\n" +" gettor+pl(a)torproject.org: Polish\n" +" gettor+ru(a)torproject.org: Russian\n" +" gettor+zh(a)torproject.org: Chinese" +msgstr "" + +#: lib/gettor/i18n.py:92 +msgid "If you select no language, you will receive the English version." +msgstr "" + +#: lib/gettor/i18n.py:94 +msgid "" +"SMALLER SIZED PACKAGES\n" +"======================" +msgstr "" + +#: lib/gettor/i18n.py:97 +msgid "" +"If your bandwith is low or your provider doesn't allow you to\n" +"receive large attachments in your email, GetTor can send you several\n" +"small packages instead of one big one." +msgstr "" + +#: lib/gettor/i18n.py:101 +msgid "" +"Simply include the keyword 'split' in a new line on its own (this part\n" +"is important!) like so: \n" +" \n" +" windows\n" +" split" +msgstr "" + +#: lib/gettor/i18n.py:107 +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 "" + +#: 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 "" + +#: lib/gettor/i18n.py:113 +msgid "1.) Save all received attachments into one folder on your disk." +msgstr "" + +#: lib/gettor/i18n.py:115 +msgid "" +"2.) Unzip all files ending in \".z\". If you saved all attachments to\n" +"a fresh folder before, simply unzip all files in that folder. If you don't\n" +"know how to unzip the .z files, please see the UNPACKING THE FILES section." +msgstr "" + +#: lib/gettor/i18n.py:119 +msgid "" +"3.) Verify all files as described in the mail you received with \n" +"each package. (gpg --verify)" +msgstr "" + +#: lib/gettor/i18n.py:122 +msgid "" +"4.) Now unpack the multi-volume archive into one file by double-\n" +"clicking the file ending in \"..split.part01.exe\". This should start the \n" +"process automatically." +msgstr "" + +#: lib/gettor/i18n.py:126 +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 "" + +#: lib/gettor/i18n.py:130 +msgid "6.) That's it. You're done. Thanks for using Tor and have fun!" +msgstr "" + +#: lib/gettor/i18n.py:132 +msgid "" +"SUPPORT\n" +"=======" +msgstr "" + +#: lib/gettor/i18n.py:138 +msgid "" +"Here's your requested software as a zip file. Please unzip the\n" +"package and verify the signature." +msgstr "" + +#: lib/gettor/i18n.py:141 +msgid "" +"VERIFY SIGNATURE\n" +"================\n" +"If your computer has GnuPG installed, use the gpg commandline \n" +"tool as follows after unpacking the zip file:\n" +"\n" +" gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US.exe" +msgstr "" + +#: lib/gettor/i18n.py:148 +msgid "" +"The output should look somewhat like this:\n" +"\n" +" gpg: Good signature from 'Erinn Clark <...>'" +msgstr "" + +#: lib/gettor/i18n.py:152 +msgid "" +"If you're not familiar with commandline tools, try looking for\n" +"a graphical user interface for GnuPG on this website:\n" +"\n" +" http://www.gnupg.org/related_software/frontends.html" +msgstr "" + +#: lib/gettor/i18n.py:157 +msgid "" +"BLOCKED ACCESS / CENSORSHIP\n" +"===========================" +msgstr "" + +#: lib/gettor/i18n.py:160 +msgid "" +"If your Internet connection blocks access to the Tor network, you\n" +"may need a bridge relay. Bridge relays (or \"bridges\" for short)\n" +"are Tor relays that aren't listed in the main directory. Since there\n" +"is no complete public list of them, even if your ISP is filtering\n" +"connections to all the known Tor relays, they probably won't be able\n" +"to block all the bridges." +msgstr "" + +#: lib/gettor/i18n.py:167 +msgid "" +"You can acquire a bridge by sending an email that contains \"get bridges\"\n" +"in the body of the email to the following email address:\n" +"\n" +" bridges(a)torproject.org" +msgstr "" + +#: lib/gettor/i18n.py:172 +msgid "" +"It is also possible to fetch bridges with a web browser at the following\n" +"url: https://bridges.torproject.org/" +msgstr "" + +#: lib/gettor/i18n.py:175 +msgid "" +"Another censorship circumvention tool you can request from GetTor is\n" +"the Tor Obfsproxy Browser Bundle. Please read the package descriptions for\n" +"which package you should request to receive this." +msgstr "" + +#: lib/gettor/i18n.py:179 +msgid "" +"IMPORTANT NOTE:\n" +"Since this is part of a split-file request, you need to wait for\n" +"all split files to be received by you before you can save them all\n" +"into the same directory and unpack them by double-clicking the\n" +"first file." +msgstr "" + +#: lib/gettor/i18n.py:185 +msgid "" +"Packages might arrive out of order! Please make sure you received\n" +"all packages before you attempt to unpack them!" +msgstr "" + +#: lib/gettor/i18n.py:188 +#, python-format +msgid "" +"It was successfully understood. Your request is currently being processed.\n" +"Your package (%s) should arrive within the next ten minutes." +msgstr "" + +#: lib/gettor/i18n.py:191 +msgid "" +"If it doesn't arrive, the package might be too big for your mail provider.\n" +"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account." +msgstr "" + +#: lib/gettor/i18n.py:194 +msgid "" +"Unfortunately we are currently experiencing problems and we can't fulfill\n" +"your request right now. Please be patient as we try to resolve this issue." +msgstr "" + +#: lib/gettor/i18n.py:197 +msgid "" +"Unfortunately there is no split package available for the package you\n" +"requested. Please send us another package name or request the same package \n" +"again, but remove the 'split' keyword. In that case we'll send you the whole \n" +"package. Make sure this is what you want." +msgstr "" + +#: lib/gettor/i18n.py:202 +msgid "" +"UNPACKING THE FILES\n" +"===================" +msgstr "" + +#: lib/gettor/i18n.py:205 +msgid "" +"The easiest way to unpack the files you received is to install 7-Zip,\n" +"a free file compression/uncompression tool. If it isn't installed on\n" +"your computer yet, you can download it here:\n" +"\n" +" http://www.7-zip.org/" +msgstr "" + +#: lib/gettor/i18n.py:211 +msgid "" +"When 7-Zip is installed, you can open the .z archive you received from\n" +"us by double-clicking on it." +msgstr "" + +#: lib/gettor/i18n.py:214 +msgid "" +"An alternative way to get the .z files extraced is to rename them to\n" +".zip. For example, if you recevied a file called \"windows.z\", rename it to \n" +"\"windows.zip\". You should then be able to extract the archive with common \n" +"file archiver programs that probably are already installed on your computer." +msgstr "" + +#: lib/gettor/i18n.py:219 +msgid "" +"Please reply to this mail, and tell me a single package name anywhere\n" +"in your reply. Here's a short explanation of what these packages are:" +msgstr "" + +#: lib/gettor/i18n.py:222 +msgid "" +"windows:\n" +"The Tor Browser Bundle package for Windows operating systems. If you're \n" +"running some version of Windows, like Windows XP, Windows Vista or \n" +"Windows 7, this is the package you should get." +msgstr "" + +#: lib/gettor/i18n.py:227 +msgid "" +"macos-i386:\n" +"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n" +"general, newer Mac hardware will require you to use this package." +msgstr "" + +#: lib/gettor/i18n.py:231 +msgid "" +"macos-ppc:\n" +"This is an older installer (the \"Vidalia bundle\") for older Macs running\n" +"OS X on PowerPC CPUs. Note that this package will be deprecated soon." +msgstr "" + +#: lib/gettor/i18n.py:235 +msgid "" +"linux-i386:\n" +"The Tor Browser Bundle package for Linux, 32bit versions." +msgstr "" + +#: lib/gettor/i18n.py:238 +msgid "" +"Note that this package is rather large and needs your email provider to \n" +"allow for attachments of about 30MB in size." +msgstr "" + +#: lib/gettor/i18n.py:241 +msgid "" +"linux-x86_64:\n" +"The Tor Browser Bundle package for Linux, 64bit versions." +msgstr "" + +#: lib/gettor/i18n.py:244 +msgid "" +"obfs-windows:\n" +"The Tor Obfsproxy Browser Bundle for Windows operating systems. If you need\n" +"strong censorship circumvention and you are running some version of the \n" +"Windows, like Windows XP, Windows Vista or Windows 7, this is the package\n" +"you should get." +msgstr "" + +#: lib/gettor/i18n.py:250 +msgid "" +"obfs-macos-i386:\n" +"The Tor Obfsproxy Browser Bundle package for OS X, 32bit Intel CPU \n" +"architecture." +msgstr "" + +#: lib/gettor/i18n.py:254 +msgid "" +"obfs-macos-x86_64:\n" +"The Tor Obfsproxy Browser Bundle package for OS X, 64bit Intel CPU \n" +"architecture." +msgstr "" + +#: lib/gettor/i18n.py:258 +msgid "" +"obfs-linux-i386:\n" +"The Tor Obfsproxy Browser Bundle package for Linux, 32bit Intel CPU \n" +"architecture." +msgstr "" + +#: lib/gettor/i18n.py:262 +msgid "" +"obfs-linux-x86_64:\n" +"The Tor Obfsproxy Browser Bundle package for Linux, 64bit Intel CPU \n" +"architecture." +msgstr "" + +#: lib/gettor/i18n.py:266 +msgid "" +"source:\n" +"The Tor source code, for experts. Most users do not want this package." +msgstr "" + +#: lib/gettor/i18n.py:269 +msgid "" +"FREQUENTLY ASKED QUESTIONS\n" +"==========================" +msgstr "" + +#: lib/gettor/i18n.py:272 +msgid "What is Tor?" +msgstr "" + +#: lib/gettor/i18n.py:274 +msgid "The name \"Tor\" can refer to several different components." +msgstr "" + +#: lib/gettor/i18n.py:276 +msgid "" +"The Tor software is a program you can run on your computer that helps \n" +"keep you safe on the Internet. Tor protects you by bouncing your \n" +"communications around a distributed network of relays run by volunteers \n" +"all around the world: it prevents somebody watching your Internet connection \n" +"from learning what sites you visit, and it prevents the sites you visit from \n" +"learning your physical location. This set of volunteer relays is called the \n" +"Tor network. You can read more about how Tor works here:\n" +"\n" +" https://www.torproject.org/about/overview.html.en" +msgstr "" + +#: lib/gettor/i18n.py:286 +msgid "What is the Tor Browser Bundle?" +msgstr "" + +#: lib/gettor/i18n.py:288 +msgid "" +"The Browser Bundle (TBB) is the package we recommend to most users. \n" +"The bundle comes with everything you need to safely browse the Internet.\n" +"Just extract it and run." +msgstr "" + +#: lib/gettor/i18n.py:292 +msgid "What package should I request?" +msgstr "" + +#: lib/gettor/i18n.py:294 +msgid "" +"This depends on the operating system you use. For instance, if your\n" +"operating system is Microsoft Windows, you should request \"windows\". Here\n" +"is a short explanation of all packages to request and what operating \n" +"systems there are suitable for:" +msgstr "" + +#: lib/gettor/i18n.py:299 +msgid "How do I extract the file(s) you sent me?" +msgstr "" + +#: lib/gettor/i18n.py:301 +msgid "QUESTION:" +msgstr "" + +#: lib/gettor/i18n.py:303 +msgid "ANSWER:" +msgstr "" + +#: lib/gettor/i18n.py:305 +#, python-format +msgid "" +"Sorry, but the package you requested (%s) is too large for your \n" +"provider to accept as an attachment. Try using another provider that allows \n" +"for larger email attachments. Or try one of the following mirrors:\n" +"\n" +" https://www.oignon.net/dist/torbrowser/\n" +" https://tor.beme-it.de/dist/torbrowser/\n" +" https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/" +msgstr ""

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 27 Mar '15

27 Mar '15

commit 13793c60fa12e7fbfccf88abbdd6ef6886a2771c Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 27 04:45:46 2015 +0000 Update translations for torbutton-torbuttonproperties --- zh_CN/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/torbutton.properties b/zh_CN/torbutton.properties index 7461488..f2ee819 100644 --- a/zh_CN/torbutton.properties +++ b/zh_CN/torbutton.properties @@ -58,7 +58,7 @@ torbutton.popup.confirm_newnym = Tor Browser 将关闭所有窗口和标签页 torbutton.slider_notification = 绿色的洋葱菜单中现在有了一个安全滑块，您可以用它来调整您的安全级别。试试吧！ torbutton.slider_notification_button = 打开安全设置 -torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. +torbutton.maximize_warning = 最大化 Tor Browser 可使网站能够确定您的显示器尺寸并用来跟踪您。我们推荐您保持 Tor Browser 窗口在其默认大小。 # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=此网站 (%S) 试图获取 HTML5 Canva 图像数据，该数据可用作你所用计算机的唯一标识。\n\nTor Browser 是否应允许此网站获取 HTML5 Canva 图像数据？

1 0

[tor-browser-bundle/master] Update update manifest config for 4.5a5.
by mikeperry＠torproject.org 27 Mar '15

27 Mar '15

commit d7473d644091e3c94eb494567d6a080d970e555d Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Mar 26 19:54:14 2015 -0700 Update update manifest config for 4.5a5. --- tools/update-responses/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 403be5c..d06be81 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -9,14 +9,14 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - alpha: 4.5a4 + alpha: 4.5a5 versions: - 4.5a4: - platformVersion: 31.5.0 + 4.5a5: + platformVersion: 31.6.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en - download_url: https://www.torproject.org/dist/torbrowser/4.5a4 + download_url: https://www.torproject.org/dist/torbrowser/4.5a5 incremental_from: - - 4.5a3 + - 4.5a4 migrate_archs: osx32: osx64 osx32:

1 0