- tor-commits - lists.torproject.org

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 23 Dec '12

23 Dec '12

commit 865cff381b933e4c5192bdc5a7c808ac7f11cb58 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 23 11:45:23 2012 +0000 Update translations for vidalia_alpha --- es/vidalia_es.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 7afd1a7..f3a13c8 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ 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-12-23 04:28+0000\n" +"PO-Revision-Date: 2012-12-23 11:41+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -2220,11 +2220,11 @@ msgstr "Guardar todo" msgctxt "MessageLog" msgid "Save all messages to a file" -msgstr "Guarda todos los mensajes en un archivo" +msgstr "Guardar todos los mensajes en un archivo" msgctxt "MessageLog" msgid "Save Selected" -msgstr "Guardar seleccionados" +msgstr "Guardar selección" msgctxt "MessageLog" msgid "Save selected messages to a file" @@ -2236,7 +2236,7 @@ msgstr "Preferencias" msgctxt "MessageLog" msgid "Adjust Message Log Settings" -msgstr "Ajustar las preferencias del registro de mensajes (log)" +msgstr "Ajustar las preferencias del registro de mensajes" msgctxt "MessageLog" msgid "Ctrl+T"

1 0

[translation/vidalia_completed] Update translations for vidalia_completed
by translation＠torproject.org 23 Dec '12

23 Dec '12

commit 3a0eed874b46ae29bdee74da0e70eb0c2ddc76ff Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 23 11:45:20 2012 +0000 Update translations for vidalia_completed --- es/vidalia_es.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 20f4d43..4896c0e 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -11,7 +11,7 @@ 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:52+0000\n" -"PO-Revision-Date: 2012-12-23 04:31+0000\n" +"PO-Revision-Date: 2012-12-23 11:39+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -2267,7 +2267,7 @@ msgstr "Guardar todos los mensajes en un archivo" msgctxt "MessageLog" msgid "Save Selected" -msgstr "Guardar la selección" +msgstr "Guardar selección" msgctxt "MessageLog" msgid "Save selected messages to a file"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 23 Dec '12

23 Dec '12

commit 860c9e6b7cff60e89cee792d00ad9ab0173f0e4a Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 23 11:45:16 2012 +0000 Update translations for vidalia --- es/vidalia_es.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 20f4d43..4896c0e 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -11,7 +11,7 @@ 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:52+0000\n" -"PO-Revision-Date: 2012-12-23 04:31+0000\n" +"PO-Revision-Date: 2012-12-23 11:39+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -2267,7 +2267,7 @@ msgstr "Guardar todos los mensajes en un archivo" msgctxt "MessageLog" msgid "Save Selected" -msgstr "Guardar la selección" +msgstr "Guardar selección" msgctxt "MessageLog" msgid "Save selected messages to a file"

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 23 Dec '12

23 Dec '12

commit 8e38043c9007f4ab85113d83a282ef959b9baa05 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 23 10:15:06 2012 +0000 Update translations for gettor --- vi/gettor.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vi/gettor.po b/vi/gettor.po index 498a376..45be93e 100644 --- a/vi/gettor.po +++ b/vi/gettor.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2012-12-20 04:34+0000\n" +"PO-Revision-Date: 2012-12-23 09:47+0000\n" "Last-Translator: Clytie Siddall <clytie(a)riverland.net.au>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -289,7 +289,7 @@ msgstr "" 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 "" +msgstr "Tiếc là chúng tôi hiện thời gặp vấn đề" #: lib/gettor/i18n.py:188 msgid ""

1 0

[flashproxy/master] Completing get_reg_for_proxy and put_reg in facilitator
by dcf＠torproject.org 23 Dec '12

23 Dec '12

commit 4f80fdbb96413952bde21c47dc88763ea669263e Author: Jorge Couchet <jorge.couchet(a)gmail.com> Date: Fri Dec 21 18:16:15 2012 -0300 Completing get_reg_for_proxy and put_reg in facilitator --- facilitator/facilitator | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/facilitator/facilitator b/facilitator/facilitator index 916271c..0fa33e9 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -322,11 +322,17 @@ def addr_af(addr_str): def get_reg_for_proxy(proxy_addr): """Get a client registration appropriate for the given proxy (one of a matching address family).""" - return REGS_IPV4.fetch() + addr_str = proxy_addr[0] + af = addr_af(addr_str) + REGS = regs_for_af(af) + return REGS.fetch() def put_reg(reg): """Add a registration.""" - REGS_IPV4.add(reg) + addr_str = reg.host + af = addr_af(addr_str) + REGS = regs_for_af(af) + REGS.add(reg) def main(): opts, args = getopt.gnu_getopt(sys.argv[1:], "dhl:p:r:",

1 0

[flashproxy/master] ChangeLog for #6124.
by dcf＠torproject.org 23 Dec '12

23 Dec '12

commit c71ef52f35bab98acf763f3fe7b8a0568b20dcc0 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Dec 23 01:04:42 2012 -0800 ChangeLog for #6124. --- ChangeLog | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 418e487..5e5e6e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,12 @@ Changes in version 0.11 flashproxy-reg-email.) These options cause registrations helpers to use IPv4 or IPv6 only. Fixes bug 7622. Patch by Jorge Couchet. + o The facilitator now gives only IPv4 clients to proxies requesting + over IPv4, and IPv6 clients to proxies requesting over IPv6. This is + to avoid the situation where an IPv4-only proxy is given an IPv6 + address it cannot connect to. Fixes bug 6124. Patch by Jorge Couchet + and David Fifield. + Changes in version 0.10 o Fixed a bug in flashproxy-client that made it susceptible to a denial of service (program crash) when receiving large WebSocket

1 0

[flashproxy/master] Add abstractions for using IPv4/IPv6 reg pools.
by dcf＠torproject.org 23 Dec '12

23 Dec '12

commit c3f883a72a5a9972cad507eb0479073a04dab6c3 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 19 19:20:36 2012 -0800 Add abstractions for using IPv4/IPv6 reg pools. Still always going to the IPv4 pool. --- facilitator/facilitator | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 43 insertions(+), 2 deletions(-) diff --git a/facilitator/facilitator b/facilitator/facilitator index c1cf89a..a0538d2 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -234,7 +234,24 @@ class Handler(SocketServer.StreamRequestHandler): print >> self.wfile, "ERROR" def do_GET(self, params): - reg = REGS_IPV4.fetch() + proxy_spec = fac.param_first("FROM", params) + if proxy_spec is None: + log(u"GET missing FROM param") + self.send_error() + return False + try: + proxy_addr = fac.parse_addr_spec(proxy_spec, defport=0) + except ValueError, e: + log(u"syntax error in proxy address %s: %s" % (safe_str(repr(proxy_spec)), safe_str(repr(str(e))))) + self.send_error() + return False + + try: + reg = get_reg_for_proxy(proxy_addr) + except Exception, e: + log(u"error getting reg for proxy address %s: %s" % (safe_str(repr(proxy_spec)), safe_str(repr(str(e))))) + self.send_error() + return False if reg: log(u"proxy gets %s, relay %s (now %d)" % (safe_str(unicode(reg)), options.relay_spec, num_regs())) @@ -260,7 +277,13 @@ class Handler(SocketServer.StreamRequestHandler): self.send_error() return False - if REGS_IPV4.add(reg): + try: + ok = put_reg(reg) + except Exception, e: + log(u"error putting reg %s: %s" % (safe_str(repr(client_spec)), safe_str(repr(str(e))))) + self.send_error() + return False + if ok: log(u"client %s (now %d)" % (safe_str(unicode(reg)), num_regs())) else: log(u"client %s (already present, now %d)" % (safe_str(unicode(reg)), num_regs())) @@ -281,6 +304,24 @@ def num_regs(): """Return the total number of registrations.""" return len(REGS_IPV4) + len(REGS_IPV6) +def regs_for_af(af): + """Return the correct regs pool for the given address family.""" + if af == socket.AF_INET: + return REGS_IPV4 + elif af == socket.AF_INET6: + return REGS_IPV6 + else: + raise ValueError("unknown address family %d" % af) + +def get_reg_for_proxy(proxy_addr): + """Get a client registration appropriate for the given proxy (one of a + matching address family).""" + return REGS_IPV4.fetch() + +def put_reg(reg): + """Add a registration.""" + REGS_IPV4.add(reg) + def main(): opts, args = getopt.gnu_getopt(sys.argv[1:], "dhl:p:r:", ["debug", "help", "log=", "port=", "pidfile=", "relay=", "unsafe-logging"])

1 0

[flashproxy/master] Add a simple function to guess an address family.
by dcf＠torproject.org 23 Dec '12

23 Dec '12

commit 23e1a91fecbda15ec0c01c50e10480b26f752205 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 19 19:26:30 2012 -0800 Add a simple function to guess an address family. --- facilitator/facilitator | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/facilitator/facilitator b/facilitator/facilitator index a0538d2..916271c 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -313,6 +313,12 @@ def regs_for_af(af): else: raise ValueError("unknown address family %d" % af) +def addr_af(addr_str): + """Return the address family for an address string. This is a plain string, + not a tuple, and IPv6 addresses are not bracketed.""" + addrs = socket.getaddrinfo(addr_str, 0, 0, socket.SOCK_STREAM, socket.IPPROTO_TCP, socket.AI_NUMERICHOST) + return addrs[0][0] + def get_reg_for_proxy(proxy_addr): """Get a client registration appropriate for the given proxy (one of a matching address family)."""

1 0

[flashproxy/master] Make separate reg pools for IPv4 and IPv6.
by dcf＠torproject.org 23 Dec '12

23 Dec '12

commit 356b4e5e52403e07e4d7c3ae677620413cfef8f2 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 19 19:16:43 2012 -0800 Make separate reg pools for IPv4 and IPv6. This is only cosmetic at the moment, as all regs will go into the IPv4 pool. --- facilitator/facilitator | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/facilitator/facilitator b/facilitator/facilitator index 97155ca..c1cf89a 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -234,10 +234,10 @@ class Handler(SocketServer.StreamRequestHandler): print >> self.wfile, "ERROR" def do_GET(self, params): - reg = REGS.fetch() + reg = REGS_IPV4.fetch() if reg: log(u"proxy gets %s, relay %s (now %d)" % - (safe_str(unicode(reg)), options.relay_spec, len(REGS))) + (safe_str(unicode(reg)), options.relay_spec, num_regs())) print >> self.wfile, fac.render_transaction("OK", ("CLIENT", str(reg)), ("RELAY", options.relay_spec)) else: log(u"proxy gets none") @@ -260,10 +260,10 @@ class Handler(SocketServer.StreamRequestHandler): self.send_error() return False - if REGS.add(reg): - log(u"client %s (now %d)" % (safe_str(unicode(reg)), len(REGS))) + if REGS_IPV4.add(reg): + log(u"client %s (now %d)" % (safe_str(unicode(reg)), num_regs())) else: - log(u"client %s (already present, now %d)" % (safe_str(unicode(reg)), len(REGS))) + log(u"client %s (already present, now %d)" % (safe_str(unicode(reg)), num_regs())) self.send_ok() return True @@ -273,7 +273,13 @@ class Handler(SocketServer.StreamRequestHandler): class Server(SocketServer.ThreadingMixIn, SocketServer.TCPServer): allow_reuse_address = True -REGS = RegSet() +# Separate pools for IPv4 and IPv6 clients. +REGS_IPV4 = RegSet() +REGS_IPV6 = RegSet() + +def num_regs(): + """Return the total number of registrations.""" + return len(REGS_IPV4) + len(REGS_IPV6) def main(): opts, args = getopt.gnu_getopt(sys.argv[1:], "dhl:p:r:",

1 0

[translation/vidalia_alpha_completed] Update translations for vidalia_alpha_completed
by translation＠torproject.org 23 Dec '12

23 Dec '12

commit 5b3d033ebaa44a5bb25e613baea74305e55fd75e Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 23 04:45:24 2012 +0000 Update translations for vidalia_alpha_completed --- es/vidalia_es.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 0bf2a9e..7afd1a7 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ 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-12-23 04:14+0000\n" +"PO-Revision-Date: 2012-12-23 04:28+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -2076,7 +2076,7 @@ msgid "" "Vidalia detected that the Tor software exited unexpectedly.\n" "\n" "Please check the message log for recent warning or error messages." -msgstr "Vidalia detectó que el software de Tor se detuvo de forma inesperada.\n\nVerifique si hay mensajes de error recientes en el registro de mensajes (log)." +msgstr "Vidalia detectó que el software de Tor se cerró de forma inesperada.\n\nVerifique si hay advertencias o mensajes de error recientes en el registro de mensajes (log)." msgctxt "MainWindow" msgid "failed (%1)" @@ -2124,7 +2124,7 @@ msgstr "Se requiere un nombre para el archivo de registro" msgctxt "MessageLog" msgid "You must enter a filename to be able to save log messages to a file." -msgstr "Debe introducir un nombre de archivo para poder guardar en él los mensajes del registro (log)" +msgstr "Debe introducir un nombre de archivo para poder guardar en él los mensajes del registro (log)." msgctxt "MessageLog" msgid "Select Log File"

1 0