- tor-commits - lists.torproject.org

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 11 Sep '12

11 Sep '12

commit 61a64aa882fe9b83aaf9fbad4b6ba599c6c6cbc7 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 11 17:15:12 2012 +0000 Update translations for vidalia_alpha --- it/vidalia_it.po | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/it/vidalia_it.po b/it/vidalia_it.po index ab822e7..1e4d333 100644 --- a/it/vidalia_it.po +++ b/it/vidalia_it.po @@ -8,19 +8,20 @@ # runasand <runa.sandvik(a)gmail.com>, 2011. # <tru74368(a)yahoo.com>, 2011. # usagetta <usa_getta(a)libero.it>, 2012. +# Vincenzo Cerminara <rebek994(a)gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-08-21 10:04+0000\n" -"Last-Translator: Luca Marzo <luca(a)jeckodevelopment.it>\n" +"PO-Revision-Date: 2012-09-11 17:07+0000\n" +"Last-Translator: Vincenzo Cerminara <rebek994(a)gmail.com>\n" "Language-Team: Italian (http://www.transifex.com/projects/p/torproject/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: it\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Vidalia ts2po 0.2\n" msgctxt "AboutDialog" @@ -202,7 +203,7 @@ msgstr "Seleziona il percorso del file da usare come socket per Tor" msgctxt "AdvancedPage" msgid "Configure ControlPort automatically" -msgstr "" +msgstr "Configura ControlPort automaticamente" msgctxt "AdvancedPage" msgid "" @@ -280,7 +281,7 @@ msgstr "Nascondi l'icona nella barra di stato" msgctxt "AppearancePage" msgid "Hide the Dock Icon" -msgstr "" +msgstr "Nascondi l'icona nella Dock" msgctxt "BandwidthGraph" msgid "Since:" @@ -2088,11 +2089,11 @@ msgstr "fallito (%1)" msgctxt "MainWindow" msgid "(probably Telnet)" -msgstr "" +msgstr "(probabilmente Telnet)" msgctxt "MainWindow" msgid "(probably an email client)" -msgstr "" +msgstr "(probabilmente un client email)" msgctxt "MainWindow" msgid ""

1 0

[flashproxy/master] Add tests for parse_addr_spec.
by dcf＠torproject.org 11 Sep '12

11 Sep '12

commit 8201762b9ca27ec232270c2d3c7256a3775cabaf Author: David Fifield <david(a)bamsoftware.com> Date: Tue Sep 11 08:42:37 2012 -0700 Add tests for parse_addr_spec. --- facilitator/fac.py | 6 +++++- facilitator/facilitator-test | 27 +++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletions(-) diff --git a/facilitator/fac.py b/facilitator/fac.py index b9ad435..2382d2b 100644 --- a/facilitator/fac.py +++ b/facilitator/fac.py @@ -12,11 +12,15 @@ def parse_addr_spec(spec, defhost = None, defport = None, resolve = False): >>> parse_addr_spec("192.168.0.2:8888", defhost="192.168.0.1", defport=9999) ('192.168.0.2', 8888) >>> parse_addr_spec(":8888", defhost="192.168.0.1", defport=9999) - ('192.168.0.1', 9999) + ('192.168.0.1', 8888) + >>> parse_addr_spec("192.168.0.2", defhost="192.168.0.1", defport=9999) + ('192.168.0.2', 9999) >>> parse_addr_spec("192.168.0.2:", defhost="192.168.0.1", defport=9999) ('192.168.0.2', 9999) >>> parse_addr_spec(":", defhost="192.168.0.1", defport=9999) ('192.168.0.1', 9999) + >>> parse_addr_spec("", defhost="192.168.0.1", defport=9999) + ('192.168.0.1', 9999) If resolve is true, then the host in the specification or the defhost may be a domain name, which will be resolved. If resolve is false, then the host diff --git a/facilitator/facilitator-test b/facilitator/facilitator-test index b06f5d7..c8946e6 100755 --- a/facilitator/facilitator-test +++ b/facilitator/facilitator-test @@ -86,6 +86,33 @@ class FacilitatorTest(unittest.TestCase): # """Test that the facilitator rejects hostnames.""" # self.fail() +class ParseAddrSpecTest(unittest.TestCase): + def test_ipv4(self): + self.assertEqual(fac.parse_addr_spec("192.168.0.1:9999"), ("192.168.0.1", 9999)) + + def test_ipv6(self): + self.assertEqual(fac.parse_addr_spec("[12::34]:9999"), ("12::34", 9999)) + + def test_defhost_defport_ipv4(self): + self.assertEqual(fac.parse_addr_spec("192.168.0.2:8888", defhost="192.168.0.1", defport=9999), ("192.168.0.2", 8888)) + self.assertEqual(fac.parse_addr_spec("192.168.0.2:", defhost="192.168.0.1", defport=9999), ("192.168.0.2", 9999)) + self.assertEqual(fac.parse_addr_spec("192.168.0.2", defhost="192.168.0.1", defport=9999), ("192.168.0.2", 9999)) + self.assertEqual(fac.parse_addr_spec(":8888", defhost="192.168.0.1", defport=9999), ("192.168.0.1", 8888)) + self.assertEqual(fac.parse_addr_spec(":", defhost="192.168.0.1", defport=9999), ("192.168.0.1", 9999)) + self.assertEqual(fac.parse_addr_spec("", defhost="192.168.0.1", defport=9999), ("192.168.0.1", 9999)) + + def test_defhost_defport_ipv6(self): + self.assertEqual(fac.parse_addr_spec("[1234::2]:8888", defhost="1234::1", defport=9999), ("1234::2", 8888)) + self.assertEqual(fac.parse_addr_spec("[1234::2]:", defhost="1234::1", defport=9999), ("1234::2", 9999)) + self.assertEqual(fac.parse_addr_spec("[1234::2]", defhost="1234::1", defport=9999), ("1234::2", 9999)) + self.assertEqual(fac.parse_addr_spec(":8888", defhost="1234::1", defport=9999), ("1234::1", 8888)) + self.assertEqual(fac.parse_addr_spec(":", defhost="1234::1", defport=9999), ("1234::1", 9999)) + self.assertEqual(fac.parse_addr_spec("", defhost="1234::1", defport=9999), ("1234::1", 9999)) + + def test_noresolve(self): + """Test that parse_addr_spec does not do DNS resolution by default.""" + self.assertRaises(ValueError, fac.parse_addr_spec, "example.com") + class ParseTransactionTest(unittest.TestCase): def test_empty_string(self): self.assertRaises(ValueError, fac.parse_transaction, "")

1 0

[flashproxy/master] Make parse_addr_spec pass new tests.
by dcf＠torproject.org 11 Sep '12

11 Sep '12

commit fd2df35dc9cdc27c24423f7905f60cc222e27a6d Author: David Fifield <david(a)bamsoftware.com> Date: Tue Sep 11 08:56:38 2012 -0700 Make parse_addr_spec pass new tests. --- facilitator/fac.py | 23 ++++++++++------------- flashproxy-client | 23 ++++++++++------------- flashproxy-reg-http | 23 ++++++++++------------- 3 files changed, 30 insertions(+), 39 deletions(-) diff --git a/facilitator/fac.py b/facilitator/fac.py index 2382d2b..494b378 100644 --- a/facilitator/fac.py +++ b/facilitator/fac.py @@ -29,32 +29,29 @@ def parse_addr_spec(spec, defhost = None, defport = None, resolve = False): IPv6 addresses must be enclosed in square brackets.""" host = None port = None + af = 0 m = None # IPv6 syntax. if not m: - m = re.match(ur'^\[(.+)\]:(\d+)$', spec) + m = re.match(ur'^\[(.+)\]:(\d*)$', spec) if m: host, port = m.groups() af = socket.AF_INET6 if not m: - m = re.match(ur'^\[(.+)\]:?$', spec) + m = re.match(ur'^\[(.+)\]$', spec) if m: host, = m.groups() af = socket.AF_INET6 - # IPv4 syntax. + # IPv4/hostname/port-only syntax. if not m: - m = re.match(ur'^(.+):(\d+)$', spec) - if m: - host, port = m.groups() + try: + host, port = spec.split(":", 1) + except ValueError: + host = spec + if re.match(ur'^[\d.]+$', host): af = socket.AF_INET - if not m: - m = re.match(ur'^:?(\d+)$', spec) - if m: - port, = m.groups() + else: af = 0 - if not m: - host = spec - af = 0 host = host or defhost port = port or defport if host is None or port is None: diff --git a/flashproxy-client b/flashproxy-client index f5c9a8b..6f7477e 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -95,32 +95,29 @@ def log(msg): def parse_addr_spec(spec, defhost = None, defport = None): host = None port = None + af = 0 m = None # IPv6 syntax. if not m: - m = re.match(ur'^\[(.+)\]:(\d+)$', spec) + m = re.match(ur'^\[(.+)\]:(\d*)$', spec) if m: host, port = m.groups() af = socket.AF_INET6 if not m: - m = re.match(ur'^\[(.+)\]:?$', spec) + m = re.match(ur'^\[(.+)\]$', spec) if m: host, = m.groups() af = socket.AF_INET6 - # IPv4 syntax. + # IPv4/hostname/port-only syntax. if not m: - m = re.match(ur'^(.+):(\d+)$', spec) - if m: - host, port = m.groups() + try: + host, port = spec.split(":", 1) + except ValueError: + host = spec + if re.match(ur'^[\d.]+$', host): af = socket.AF_INET - if not m: - m = re.match(ur'^:?(\d+)$', spec) - if m: - port, = m.groups() + else: af = 0 - if not m: - host = spec - af = 0 host = host or defhost port = port or defport if port is not None: diff --git a/flashproxy-reg-http b/flashproxy-reg-http index e17abdf..4372c1f 100755 --- a/flashproxy-reg-http +++ b/flashproxy-reg-http @@ -34,32 +34,29 @@ remote address registered is "%(remote_addr)s". def parse_addr_spec(spec, defhost = None, defport = None): host = None port = None + af = 0 m = None # IPv6 syntax. if not m: - m = re.match(ur'^\[(.+)\]:(\d+)$', spec) + m = re.match(ur'^\[(.+)\]:(\d*)$', spec) if m: host, port = m.groups() af = socket.AF_INET6 if not m: - m = re.match(ur'^\[(.+)\]:?$', spec) + m = re.match(ur'^\[(.+)\]$', spec) if m: host, = m.groups() af = socket.AF_INET6 - # IPv4 syntax. + # IPv4/hostname/port-only syntax. if not m: - m = re.match(ur'^(.+):(\d+)$', spec) - if m: - host, port = m.groups() + try: + host, port = spec.split(":", 1) + except ValueError: + host = spec + if re.match(ur'^[\d.]+$', host): af = socket.AF_INET - if not m: - m = re.match(ur'^:?(\d+)$', spec) - if m: - port, = m.groups() + else: af = 0 - if not m: - host = spec - af = 0 host = host or defhost port = port or defport if port is not None:

1 0

[flashproxy/master] Make the remote addr a command-line argument in registration helpers.
by dcf＠torproject.org 11 Sep '12

11 Sep '12

commit f63a12411756bbb72f8ac53c22ec9afa6f243dab Author: David Fifield <david(a)bamsoftware.com> Date: Tue Sep 11 07:05:49 2012 -0700 Make the remote addr a command-line argument in registration helpers. Before, you registered a remote :1111 with fac.example.com like so: flashproxy-reg-http -a :1111 fac.example.com Now it is like this: flashproxy-reg-http -f fac.example.com :1111 Not all registration helpers will have knowledge of a facilitator address, and I want them to have as uniform an interface as possible. Using -f for the facilitator address also matches flashproxy-client usage. --- flashproxy-client | 4 ++-- flashproxy-reg-http | 17 +++++++++-------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/flashproxy-client b/flashproxy-client index dfe060f..f5c9a8b 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -639,8 +639,8 @@ def register(): if options.facilitator_addr is None: log(u"Registering \"%s\"." % spec) else: - command += [format_addr(options.facilitator_addr)] - command += ["-a", spec] + command += ["-f", format_addr(options.facilitator_addr)] + command += [spec] try: p = subprocess.Popen(command) except OSError, e: diff --git a/flashproxy-reg-http b/flashproxy-reg-http index 1c989c0..e17abdf 100755 --- a/flashproxy-reg-http +++ b/flashproxy-reg-http @@ -18,12 +18,13 @@ class options(object): def usage(f = sys.stdout): print >> f, """\ -Usage: %(progname)s [HOSTNAME][:PORT] +Usage: %(progname)s [REMOTE][:PORT] Register with a flash proxy facilitator using an HTTP POST. By default the -facilitator address is "%(fac_addr)s". +remote address registered is "%(remote_addr)s". - -a, --address=ADDRESS register the given address instead of \"%(remote_addr)s\". - -h, --help show this help. \ + -f, --facilitator=HOST[:PORT] register with the given facilitator (by + default "%(fac_addr)s".) + -h, --help show this help. \ """ % { "progname": sys.argv[0], "fac_addr": format_addr((DEFAULT_FACILITATOR_HOST, DEFAULT_FACILITATOR_PORT)), @@ -86,10 +87,10 @@ def format_addr(addr): options.facilitator_addr = (DEFAULT_FACILITATOR_HOST, DEFAULT_FACILITATOR_PORT) options.remote_addr = (DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT) -opts, args = getopt.gnu_getopt(sys.argv[1:], "a:h", ["address=", "help"]) +opts, args = getopt.gnu_getopt(sys.argv[1:], "f:h", ["facilitator=", "help"]) for o, a in opts: - if o == "-a" or o == "--address": - options.remote_addr = parse_addr_spec(a, DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT) + if o == "-f" or o == "--facilitator": + options.facilitator_addr = parse_addr_spec(a, DEFAULT_FACILITATOR_HOST, DEFAULT_FACILITATOR_PORT) elif o == "-h" or o == "--help": usage() sys.exit() @@ -97,7 +98,7 @@ for o, a in opts: if len(args) == 0: pass elif len(args) == 1: - options.facilitator_addr = parse_addr_spec(args[0], DEFAULT_FACILITATOR_HOST, DEFAULT_FACILITATOR_PORT) + options.remote_addr = parse_addr_spec(args[0], DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT) else: usage(sys.stderr) sys.exit(1)

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 11 Sep '12

11 Sep '12

commit 2293bc5112bcb0098df9835a84d8ebfc58316f83 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 11 12:45:36 2012 +0000 Update translations for https_everywhere_completed --- eu/https-everywhere.properties | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/eu/https-everywhere.properties b/eu/https-everywhere.properties index 54bb6eb..c065c6f 100644 --- a/eu/https-everywhere.properties +++ b/eu/https-everywhere.properties @@ -1,3 +1,5 @@ https-everywhere.menu.globalEnable = HTTPS Everywhere gaitu https-everywhere.menu.globalDisable = HTTPS Everywhere ezgaitu - +https-everywhere.menu.enableDisable = Gaitu / Ezgaitu arauak +https-everywhere.menu.noRules = (Araurik ez gune honetarako) +https-everywhere.menu.unknownRules = (Gune honetarako arauak ezezagunak)

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 11 Sep '12

11 Sep '12

commit a8aecf81327a2d3e71e5368fc1b776cb7cc7d482 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 11 12:45:33 2012 +0000 Update translations for https_everywhere --- eu/https-everywhere.properties | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eu/https-everywhere.properties b/eu/https-everywhere.properties index 1abaa0a..c065c6f 100644 --- a/eu/https-everywhere.properties +++ b/eu/https-everywhere.properties @@ -1,5 +1,5 @@ https-everywhere.menu.globalEnable = HTTPS Everywhere gaitu https-everywhere.menu.globalDisable = HTTPS Everywhere ezgaitu -# https-everywhere.menu.enableDisable = Enable / Disable Rules -# https-everywhere.menu.noRules = (No Rules for This Page) -# https-everywhere.menu.unknownRules = (Rules for This Page Unknown) +https-everywhere.menu.enableDisable = Gaitu / Ezgaitu arauak +https-everywhere.menu.noRules = (Araurik ez gune honetarako) +https-everywhere.menu.unknownRules = (Gune honetarako arauak ezezagunak)

1 0

[flashproxy/master] Remove unused Badge.set_color.
by dcf＠torproject.org 11 Sep '12

11 Sep '12

commit 0cb225d316daa1fac671bcdd5dc19c55b2259c47 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Sep 10 21:35:28 2012 -0700 Remove unused Badge.set_color. --- flashproxy.js | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index 7e5a28d..32eb534 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -784,10 +784,6 @@ function Badge() { this.elem.className = "dead"; this.disable_button.style.display = "none"; } - - this.set_color = function(color) { - this.elem.style.backgroundColor = color; - }; } function quote(s) {

1 0

[flashproxy/master] Check PATH info for a path of /.
by dcf＠torproject.org 11 Sep '12

11 Sep '12

commit a6cc1d6108a82131473fe295ca785f98eb140388 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Sep 10 21:03:51 2012 -0700 Check PATH info for a path of /. --- facilitator/facilitator.cgi | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/facilitator/facilitator.cgi b/facilitator/facilitator.cgi index 39566d3..6ccb479 100755 --- a/facilitator/facilitator.cgi +++ b/facilitator/facilitator.cgi @@ -2,6 +2,7 @@ import cgi import os +import os.path import socket import sys import urllib @@ -68,14 +69,19 @@ def get_reg(proxy_addr): exit_error(500) method = os.environ.get("REQUEST_METHOD") +path_info = os.environ.get("PATH_INFO") proxy_addr = (os.environ.get("REMOTE_ADDR"), None) -if not method or not proxy_addr[0]: +if not method or not path_info or not proxy_addr[0]: exit_error(400) +path = os.path.normpath(path_info) + fs = cgi.FieldStorage() def do_get(): + if path != "/": + exit_error(400) try: reg = get_reg(proxy_addr) or "" except: @@ -90,6 +96,8 @@ Access-Control-Allow-Origin: *\r sys.stdout.write(urllib.urlencode(reg)) def do_post(): + if path != "/": + exit_error(400) client_specs = fs.getlist("client") if len(client_specs) != 1: exit_error(400)

1 0

[tor/master] Bump version to 0.2.4.2-alpha-dev
by nickm＠torproject.org 10 Sep '12

10 Sep '12

commit 99cb9696ac617a42a78d9ebfa3f169fd8e4a3d88 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 10 19:49:20 2012 -0400 Bump version to 0.2.4.2-alpha-dev --- configure.ac | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 990fba9..ab291b1 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2012, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.4.2-alpha]) +AC_INIT([tor],[0.2.4.2-alpha-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AM_INIT_AUTOMAKE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 904a022..96e27b4 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.4.2-alpha" +!define VERSION "0.2.4.2-alpha-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 1a2ae57..beebc6d 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.4.2-alpha" +#define VERSION "0.2.4.2-alpha-dev"

1 0

r25788: {website} i guess we need to bump the version here too (website/trunk)
by Roger Dingledine 10 Sep '12

10 Sep '12

Author: arma Date: 2012-09-10 22:56:01 +0000 (Mon, 10 Sep 2012) New Revision: 25788 Modified: website/trunk/Makefile Log: i guess we need to bump the version here too Modified: website/trunk/Makefile =================================================================== --- website/trunk/Makefile 2012-09-09 01:11:48 UTC (rev 25787) +++ website/trunk/Makefile 2012-09-10 22:56:01 UTC (rev 25788) @@ -11,7 +11,7 @@ # 5. ./publish export STABLETAG=tor-0.2.2.38 -export DEVTAG=tor-0.2.3.20-rc +export DEVTAG=tor-0.2.3.21-rc WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate torbutton

1 0