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

[flashproxy/master] Ignore language subtags in language tags.
by dcf＠torproject.org 09 Jun '13

09 Jun '13

commit f5e60771a902270a3330c51ea023dc10e2380e73 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Jun 9 10:27:49 2013 -0700 Ignore language subtags in language tags. With a tag like "ru-RU", first try matching the whole thing, then match only the first part. See #8828. --- ChangeLog | 3 +++ proxy/flashproxy-test.js | 24 ++++++++++++++++++++++++ proxy/flashproxy.js | 19 ++++++++++++++++--- 3 files changed, 43 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9f47f12..01e12bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,9 @@ o The managed transport method name "flashproxy" is now recognized as a synonym for "websocket". + o The badge localization now understands language subtags such as + "ru-RU". Fixes bug 8828. + Changes in version 1.1 o Programs that use certificate pins now take a --disable-pin option that causes pins to be ignored. diff --git a/proxy/flashproxy-test.js b/proxy/flashproxy-test.js index aed5247..9615588 100755 --- a/proxy/flashproxy-test.js +++ b/proxy/flashproxy-test.js @@ -308,12 +308,36 @@ function test_get_param_addr() } } +function test_lang_keys() +{ + var TESTS = [ + { code: "de", expected: ["de"] }, + { code: "de-at", expected: ["de-at", "de"] }, + ]; + for (var i = 0; i < TESTS.length; i++) { + var test = TESTS[i]; + var actual = lang_keys(test.code); + + var j, k; + k = 0; + for (j = 0; j < test.expected.length; j++) { + for (; k < actual.length; k++) { + if (test.expected[j] === actual[k]) + break; + } + if (k === actual.length) + fail(test.code, test.expected, actual) + } + } +} + test_build_url(); test_parse_cookie_string(); test_parse_query_string(); test_get_param_boolean(); test_parse_addr_spec(); test_get_param_addr(); +test_lang_keys(); if (num_failed == 0) quit(0); diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index 6170a67..0ecc4dd 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -888,14 +888,27 @@ var LOCALIZATIONS = { "ru": { filename: "badge-ru.png", text: "Свобода Интернета" } }; var DEFAULT_LOCALIZATION = { filename: "badge.png", text: "Internet Freedom" }; +/* Return an array of progressively less specific language tags, canonicalized + for lookup in LOCALIZATIONS. */ +function lang_keys(code) { + var result = [code]; + var m = code.match(/^(\w+)/); + if (m !== null) { + result.push(m[0]); + } + return result; +} /* Return an object with "filename" and "text" keys appropriate for the given array of language codes. Returns a default value if there is no localization for any of the codes. */ function get_badge_localization(langs) { for (var i = 0; i < langs.length; i++) { - var localization = LOCALIZATIONS[langs[i]]; - if (localization !== undefined) - return localization; + var tags = lang_keys(langs[i]); + for (var j = 0; j < tags.length; j++) { + var localization = LOCALIZATIONS[tags[j]]; + if (localization !== undefined) + return localization; + } } return DEFAULT_LOCALIZATION; }

1 0

r26209: {website} updated debian and ubuntu versions in instructions (website/trunk/docs/en)
by Moritz Bartl 09 Jun '13

09 Jun '13

Author: moritz Date: 2013-06-09 15:49:47 +0000 (Sun, 09 Jun 2013) New Revision: 26209 Modified: website/trunk/docs/en/debian.wml Log: updated debian and ubuntu versions in instructions Modified: website/trunk/docs/en/debian.wml =================================================================== --- website/trunk/docs/en/debian.wml 2013-06-07 23:17:53 UTC (rev 26208) +++ website/trunk/docs/en/debian.wml 2013-06-09 15:49:47 UTC (rev 26209) @@ -54,16 +54,14 @@ Here's a quick mapping: <ul> <li> Debian unstable (sid) is "sid"</li> -<li> Debian testing is "wheezy"</li> +<li> Debian 7.0 (wheezy) is "wheezy"</li> <li> Debian 6.0 (squeeze) is "squeeze"</li> -<li> Debian 5.0 (lenny) is "lenny"</li> +<li> Ubuntu 13.04 is "raring"</li> +<li> Ubuntu 12.10 is "quantal"</li> <li> Ubuntu 12.04 is "precise"</li> <li> Ubuntu 11.10 is "oneiric"</li> <li> Ubuntu 11.04 is "natty"</li> -<li> Ubuntu 10.10 or Trisquel 4.5 is "maverick"</li> <li> Ubuntu 10.04 or Trisquel 4.0 is "lucid"</li> -<li> Ubuntu 9.10 or Trisquel 3.5 is "karmic"</li> -<li> Ubuntu 8.04 is "hardy"</li> </ul> Then add this line to your

1 0

[flashproxy/master] Indentation.
by dcf＠torproject.org 09 Jun '13

09 Jun '13

commit 6193de8b8546af6b04ddfd36b5ea6f48a58b88dc Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jun 8 20:30:03 2013 -0700 Indentation. --- flashproxy-client | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flashproxy-client b/flashproxy-client index 34f2cf8..3c40be9 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -1039,10 +1039,10 @@ option.\ sys.exit(1) def pt_cmethod(method_name, addr): - pt_line("CMETHOD", method_name, "socks4", format_sockaddr(addr)) + pt_line("CMETHOD", method_name, "socks4", format_sockaddr(addr)) def pt_cmethods_done(): - pt_line("CMETHODS", "DONE") + pt_line("CMETHODS", "DONE") def main(): global remote_listen, local_listen

1 0

[flashproxy/master] Typo.
by dcf＠torproject.org 09 Jun '13

09 Jun '13

commit 0e9f651b2c004c27452d8f7f3426f23172ce9e75 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jun 8 20:17:59 2013 -0700 Typo. --- doc/flashproxy-client.1 | 8 ++++---- doc/flashproxy-client.1.txt | 2 +- flashproxy-client | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/flashproxy-client.1 b/doc/flashproxy-client.1 index 6cb4a0d..e9fea5c 100644 --- a/doc/flashproxy-client.1 +++ b/doc/flashproxy-client.1 @@ -1,13 +1,13 @@ '\" t .\" Title: flashproxy-client .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 04/30/2013 +.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> +.\" Date: 06/08/2013 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "FLASHPROXY\-CLIENT" "1" "04/30/2013" "\ \&" "\ \&" +.TH "FLASHPROXY\-CLIENT" "1" "06/08/2013" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -38,7 +38,7 @@ Wait for connections on a local and a remote port\&. When any pair of connection .sp The local connection acts as a SOCKS4a proxy, but the host and port in the SOCKS request are ignored and the local connection is always linked to a remote connection\&. .sp -By default, runs as a managed proxy: informs a parent Tor project of support for the "websocket" pluggable transport\&. In managed mode, the \fILOCAL\fR port is chosen arbitrarily instead of defaulting to 9001; however this can be overridden by including a \fILOCAL\fR port in the command\&. This is the way the program should be invoked in a torrc ClientTransportPlugin "exec" line\&. Use the \fB\-\-external\fR option to run as an external proxy that does not interact with Tor\&. +By default, runs as a managed proxy: informs a parent Tor process of support for the "websocket" pluggable transport\&. In managed mode, the \fILOCAL\fR port is chosen arbitrarily instead of defaulting to 9001; however this can be overridden by including a \fILOCAL\fR port in the command\&. This is the way the program should be invoked in a torrc ClientTransportPlugin "exec" line\&. Use the \fB\-\-external\fR option to run as an external proxy that does not interact with Tor\&. .sp If any of the \fB\-\-register\fR, \fB\-\-register\-addr\fR, or \fB\-\-register\-methods\fR options are used, then your IP address will be sent to the facilitator so that proxies can connect to you\&. You need to register in some way in order to get any service\&. The \fB\-\-facilitator\fR option allows controlling which facilitator is used; if omitted, it uses a public default\&. .SH "OPTIONS" diff --git a/doc/flashproxy-client.1.txt b/doc/flashproxy-client.1.txt index 0a7bf36..66eaa50 100644 --- a/doc/flashproxy-client.1.txt +++ b/doc/flashproxy-client.1.txt @@ -24,7 +24,7 @@ The local connection acts as a SOCKS4a proxy, but the host and port in the SOCKS request are ignored and the local connection is always linked to a remote connection. -By default, runs as a managed proxy: informs a parent Tor project of support for +By default, runs as a managed proxy: informs a parent Tor process of support for the "websocket" pluggable transport. In managed mode, the __LOCAL__ port is chosen arbitrarily instead of defaulting to 9001; however this can be overridden by including a __LOCAL__ port in the command. This is the way the diff --git a/flashproxy-client b/flashproxy-client index 70b2464..34f2cf8 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -78,7 +78,7 @@ The local connection acts as a SOCKS4a proxy, but the host and port in the SOCKS request are ignored and the local connection is always linked to a remote connection. -By default, runs as a managed proxy: informs a parent Tor project of support for +By default, runs as a managed proxy: informs a parent Tor process of support for the "websocket" pluggable transport. In managed mode, the LOCAL port is chosen arbitrarily instead of defaulting to %(local_port)d; however this can be overridden by including a LOCAL port in the command. This is the way the

1 0

[flashproxy/master] Honor both "flashproxy" and "websocket" method names.
by dcf＠torproject.org 09 Jun '13

09 Jun '13

commit 93be030227cf96aa682f9fb8dbc9ccc986d1c36c Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jun 8 20:31:32 2013 -0700 Honor both "flashproxy" and "websocket" method names. These are treated as synonyms. If Tor asks for "*", it gets only one of them. --- ChangeLog | 3 +++ doc/flashproxy-client.1 | 2 +- doc/flashproxy-client.1.txt | 2 +- flashproxy-client | 44 ++++++++++++++++++++++++------------------- 4 files changed, 30 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index c342eb0..9f47f12 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,9 @@ facilitator to estimate the level of service each client is getting. Proxies send a protocol revision number "r=1" to signify the change. + o The managed transport method name "flashproxy" is now recognized as + a synonym for "websocket". + Changes in version 1.1 o Programs that use certificate pins now take a --disable-pin option that causes pins to be ignored. diff --git a/doc/flashproxy-client.1 b/doc/flashproxy-client.1 index e9fea5c..d431a58 100644 --- a/doc/flashproxy-client.1 +++ b/doc/flashproxy-client.1 @@ -38,7 +38,7 @@ Wait for connections on a local and a remote port\&. When any pair of connection .sp The local connection acts as a SOCKS4a proxy, but the host and port in the SOCKS request are ignored and the local connection is always linked to a remote connection\&. .sp -By default, runs as a managed proxy: informs a parent Tor process of support for the "websocket" pluggable transport\&. In managed mode, the \fILOCAL\fR port is chosen arbitrarily instead of defaulting to 9001; however this can be overridden by including a \fILOCAL\fR port in the command\&. This is the way the program should be invoked in a torrc ClientTransportPlugin "exec" line\&. Use the \fB\-\-external\fR option to run as an external proxy that does not interact with Tor\&. +By default, runs as a managed proxy: informs a parent Tor process of support for the "flashproxy" or "websocket" pluggable transport\&. In managed mode, the \fILOCAL\fR port is chosen arbitrarily instead of defaulting to 9001; however this can be overridden by including a \fILOCAL\fR port in the command\&. This is the way the program should be invoked in a torrc ClientTransportPlugin "exec" line\&. Use the \fB\-\-external\fR option to run as an external proxy that does not interact with Tor\&. .sp If any of the \fB\-\-register\fR, \fB\-\-register\-addr\fR, or \fB\-\-register\-methods\fR options are used, then your IP address will be sent to the facilitator so that proxies can connect to you\&. You need to register in some way in order to get any service\&. The \fB\-\-facilitator\fR option allows controlling which facilitator is used; if omitted, it uses a public default\&. .SH "OPTIONS" diff --git a/doc/flashproxy-client.1.txt b/doc/flashproxy-client.1.txt index 66eaa50..8d9a99e 100644 --- a/doc/flashproxy-client.1.txt +++ b/doc/flashproxy-client.1.txt @@ -25,7 +25,7 @@ request are ignored and the local connection is always linked to a remote connection. By default, runs as a managed proxy: informs a parent Tor process of support for -the "websocket" pluggable transport. In managed mode, the __LOCAL__ port is chosen +the "flashproxy" or "websocket" pluggable transport. In managed mode, the __LOCAL__ port is chosen arbitrarily instead of defaulting to 9001; however this can be overridden by including a __LOCAL__ port in the command. This is the way the program should be invoked in a torrc ClientTransportPlugin "exec" line. diff --git a/flashproxy-client b/flashproxy-client index 3c40be9..7feaefe 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -79,12 +79,12 @@ request are ignored and the local connection is always linked to a remote connection. By default, runs as a managed proxy: informs a parent Tor process of support for -the "websocket" pluggable transport. In managed mode, the LOCAL port is chosen -arbitrarily instead of defaulting to %(local_port)d; however this can be -overridden by including a LOCAL port in the command. This is the way the -program should be invoked in a torrc ClientTransportPlugin "exec" line. -Use the --external option to run as an external proxy that does not -interact with Tor. +the "flashproxy" or "websocket" pluggable transport. In managed mode, +the LOCAL port is chosen arbitrarily instead of defaulting to +%(local_port)d; however this can be overridden by including a LOCAL port +in the command. This is the way the program should be invoked in a torrc +ClientTransportPlugin "exec" line. Use the --external option to run as +an external proxy that does not interact with Tor. If any of the --register, --register-addr, or --register-methods options are used, then your IP address will be sent to the facilitator so that proxies can @@ -1003,10 +1003,12 @@ def pt_cmethoderror(msg): pt_line("CMETHOD-ERROR", msg) sys.exit(1) -def pt_get_client_transports(known): +def pt_get_client_transports(known, wildcard = None): result = [] if os.environ.get("TOR_PT_CLIENT_TRANSPORTS") == "*": - return known + if wildcard is None: + wildcard = known + return wildcard for method in os.environ.get("TOR_PT_CLIENT_TRANSPORTS", "").split(","): if method in known: result.append(method) @@ -1033,10 +1035,11 @@ option.\ pt_line("VERSION-ERROR", "no-version") sys.exit(1) - client_transports = pt_get_client_transports(["websocket"]) + client_transports = pt_get_client_transports(["flashproxy", "websocket"], ["flashproxy"]) if not client_transports: pt_cmethods_done() sys.exit(1) + return client_transports def pt_cmethod(method_name, addr): pt_line("CMETHOD", method_name, "socks4", format_sockaddr(addr)) @@ -1096,7 +1099,9 @@ def main(): options.log_file = sys.stderr if options.managed: - pt_setup_managed() + method_names = pt_setup_managed() + else: + method_names = ["flashproxy"] if options.managed: default_local_port = DEFAULT_LOCAL_PORT_MANAGED @@ -1154,15 +1159,16 @@ def main(): # Local sockets, accepting SOCKS requests from localhost local_listen = [] for addr in options.local_addrs: - try: - listen = listen_socket(addr) - except socket.error, e: - log(u"Failed to listen local on %s: %s." % (addr, str(e))) - continue - local_listen.append(listen) - log(u"Listening local on %s." % format_sockaddr(listen.getsockname())) - if options.managed: - pt_cmethod("websocket", listen.getsockname()) + for method_name in method_names: + try: + listen = listen_socket(addr) + except socket.error, e: + log(u"Failed to listen local on %s: %s." % (addr, str(e))) + continue + local_listen.append(listen) + log(u"Listening local on %s." % format_sockaddr(listen.getsockname())) + if options.managed: + pt_cmethod(method_name, listen.getsockname()) if not local_listen: log(u"Failed to open any local listeners, quitting.") pt_cmethoderror("Failed to open any local listeners.")

1 0

[stem/master] Correcting Controller pydoc links
by atagar＠torproject.org 08 Jun '13

08 Jun '13

commit 65846e81628040779e4d28041d1400f53719468c Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 8 13:22:12 2013 -0700 Correcting Controller pydoc links Handful of mistakes in the stem.control module that prevented sphinx's internal linking. Pity sphinx doesn't provide warnings about this... --- stem/control.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/stem/control.py b/stem/control.py index 53d49b9..5f9a745 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1119,8 +1119,8 @@ class Controller(BaseController): Provides an iterator for all of the microdescriptors that tor presently knows about. - **Tor does not expose this information via the control protocol - (:trac:`8323`).** Until it does this reads the microdescriptors from disk, + **Tor does not expose this information via the control protocol** + (:trac:`8323`). Until it does this reads the microdescriptors from disk, and hence won't work remotely or if we lack read permissions. :param list default: items to provide if the query fails @@ -1908,7 +1908,7 @@ class Controller(BaseController): :raises: * :class:`stem.ControllerError` if the call fails - * ValueError if the circuit doesn't exist + * **ValueError** if the circuit doesn't exist An exception is only raised if we weren't provided a default response. """ @@ -2118,7 +2118,7 @@ class Controller(BaseController): :param object default: response if the query fails - :returns: list of :class:`stem.events.StreamEvent` objects + :returns: list of :class:`stem.response.events.StreamEvent` objects :raises: :class:`stem.ControllerError` if the call fails and no default was provided @@ -2153,7 +2153,7 @@ class Controller(BaseController): :raises: * :class:`stem.InvalidRequest` if the stream or circuit id were unrecognized - * :class:`UnsatisfiableRequest` if the stream isn't in a state where it can be attached + * :class:`stem.UnsatisfiableRequest` if the stream isn't in a state where it can be attached * :class:`stem.OperationFailed` if the stream couldn't be attached for any other reason """

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 08 Jun '13

08 Jun '13

commit 04ac744259da2d70821943861440d6c343621a88 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 8 19:46:26 2013 +0000 Update translations for tor-launcher-network-settings --- fa/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fa/network-settings.dtd b/fa/network-settings.dtd index 8d526c2..ed4ba0d 100644 --- a/fa/network-settings.dtd +++ b/fa/network-settings.dtd @@ -33,7 +33,7 @@ <!ENTITY torsettings.useProxy.checkbox ""> <!ENTITY torsettings.useProxy.type ""> <!ENTITY torsettings.useProxy.address "آدرس:"> -<!ENTITY torsettings.useProxy.address.placeholder ""> +<!ENTITY torsettings.useProxy.address.placeholder "آدرس آی پی یا نام میزبان"> <!ENTITY torsettings.useProxy.port "پورت:"> <!ENTITY torsettings.useProxy.username "نام کاربری:"> <!ENTITY torsettings.useProxy.password "رمز عبور">

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
by arma＠torproject.org 08 Jun '13

08 Jun '13

commit fe689de084116bd54eb3f90baba4620eef5d1001 Merge: 78735f8 d347531 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 5 11:22:02 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 changes/geoip-june2013 | 3 + src/config/geoip |106050 +++++------------------------------------------- 2 files changed, 9168 insertions(+), 96885 deletions(-)

1 0

[tor/release-0.2.4] Fix two cut'n'paste docu bugs.
by arma＠torproject.org 08 Jun '13

08 Jun '13

commit c03cfc05468077d5db52ec660a2e7e3fb086a751 Author: Linus Nordberg <linus(a)torproject.org> Date: Wed Jun 5 15:48:57 2013 +0200 Fix two cut'n'paste docu bugs. --- doc/tor.1.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index adcf6b7..56d163b 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2012,12 +2012,12 @@ The following options are used for running a testing Tor network. **TestingTorNetwork** is set. (Default: 30 minutes) **TestingV3AuthInitialVoteDelay** __N__ **minutes**|**hours**:: - Like TestingV3AuthInitialVoteDelay, but for initial voting interval before + Like V3AuthVoteDelay, but for initial voting interval before the first consensus has been created. Changing this requires that **TestingTorNetwork** is set. (Default: 5 minutes) **TestingV3AuthInitialDistDelay** __N__ **minutes**|**hours**:: - Like TestingV3AuthInitialDistDelay, but for initial voting interval before + Like V3AuthDistDelay, but for initial voting interval before the first consensus has been created. Changing this requires that **TestingTorNetwork** is set. (Default: 5 minutes)

1 0

[tor/release-0.2.4] Merge branch 'maint-0.2.4' into release-0.2.4
by arma＠torproject.org 08 Jun '13

08 Jun '13

commit 34c70ba9e62cc28c3bfe363c1c34a2f0fbf2dba4 Merge: 2d4aeba c860a96 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Jun 8 15:12:29 2013 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/geoip-june2013 | 3 + doc/tor.1.txt | 4 +- src/config/geoip |106050 +++++------------------------------------------- 3 files changed, 9170 insertions(+), 96887 deletions(-)

1 0