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

r26200: {website} fix the perlism. (website/trunk)
by Andrew Lewman 30 May '13

30 May '13

Author: phobos Date: 2013-05-30 16:54:56 +0000 (Thu, 30 May 2013) New Revision: 26200 Modified: website/trunk/update-mirrors.pl Log: fix the perlism. Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2013-05-30 16:53:22 UTC (rev 26199) +++ website/trunk/update-mirrors.pl 2013-05-30 16:54:56 UTC (rev 26200) @@ -41,7 +41,7 @@ sub FetchDate { my $url = shift; # Base url for mirror my $trace = "project/trace/www-master.torproject.org"; # this file should always exist - $url = "$url*/*$trace"; + $url = "$url/$trace"; print "Fetching possible date from: $url\n";

1 0

r26199: {website} unicorns found by creep.im admin. (website/trunk)
by Andrew Lewman 30 May '13

30 May '13

Author: phobos Date: 2013-05-30 16:53:22 +0000 (Thu, 30 May 2013) New Revision: 26199 Modified: website/trunk/update-mirrors.pl Log: unicorns found by creep.im admin. Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2013-05-28 22:39:35 UTC (rev 26198) +++ website/trunk/update-mirrors.pl 2013-05-30 16:53:22 UTC (rev 26199) @@ -41,7 +41,7 @@ sub FetchDate { my $url = shift; # Base url for mirror my $trace = "project/trace/www-master.torproject.org"; # this file should always exist - $url = "$url$trace"; + $url = "$url*/*$trace"; print "Fetching possible date from: $url\n"; @@ -1168,7 +1168,7 @@ if ( "$m{$server}{'updateDate'}" ne "Unknown") { if ( $m{$server}{'updateDate'} > $tortime ) { $time = "Up to date"; - } else { $time = "Out of date"; } + } else { $time = "DO NOT USE. Out of date."; } } else { $time = "Unknown"; } print OUT <<"END"; \n<tr>\n @@ -1184,7 +1184,7 @@ rsyncWebsiteMirror => "rsync", httpDistMirror => "http", httpsDistMirror => "https", - rsyncDistMirrors => "rsync", ); + rsyncDistMirror => "rsync", ); foreach my $precious ( sort keys %prettyNames ) {

1 0

[flashproxy/master] Save bin/obfsproxy as obfsproxy.bin in macosx and gnulinux bundles.
by dcf＠torproject.org 30 May '13

30 May '13

commit d1fb9271c7d500add09bd4164293140c9b584284 Author: David Fifield <david(a)bamsoftware.com> Date: Thu May 30 09:35:45 2013 -0700 Save bin/obfsproxy as obfsproxy.bin in macosx and gnulinux bundles. This is to avoid a name conflict with the obfsproxy module. See #8944. --- doc/Makefile | 6 ++++-- doc/bundle-torrc-gnulinux | 2 +- doc/bundle-torrc-macosx | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index 85800a1..df62882 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -110,7 +110,8 @@ $(PT_BUNDLE_MACOSX_I686): cp -r "$(MACOSX_BUNDLE_ROOT)"/usr/lib/python2.7/site-packages/M2Crypto "$(TBBDIR)"/Contents/MacOS mkdir -p "$(TBBDIR)"/Contents/Resources/Docs/FlashProxy cp "$(FLASHPROXY_DIST)"/{doc/*,README,LICENSE,ChangeLog} "$(TBBDIR)"/Contents/Resources/Docs/FlashProxy - cp -r "$(OBFSPROXY_DIST)"/{obfsproxy,bin/obfsproxy} "$(TBBDIR)"/Contents/MacOs + cp -r "$(OBFSPROXY_DIST)"/obfsproxy "$(TBBDIR)"/Contents/MacOs + cp -r "$(OBFSPROXY_DIST)"/bin/obfsproxy "$(TBBDIR)"/Contents/MacOs/obfsproxy.bin cp -r "$(MACOSX_BUNDLE_ROOT)"/usr/lib/python2.7/site-packages/{Crypto,pyptlib} "$(TBBDIR)"/Contents/MacOS cp "$(MACOSX_BUNDLE_ROOT)"/argparse-1.2.1/argparse.py "$(TBBDIR)"/Contents/MacOS mkdir -p "$(TBBDIR)"/Contents/Resources/Docs/PyObfsproxy @@ -138,7 +139,8 @@ $(PT_BUNDLE_GNULINUX_I686) $(PT_BUNDLE_GNULINUX_X86_64): cp -rL /usr/lib/pymodules/python2.6/M2Crypto "$(TBBDIR)"/App mkdir -p "$(TBBDIR)"/Docs/FlashProxy cp "$(FLASHPROXY_DIST)"/{doc/*,README,LICENSE,ChangeLog} "$(TBBDIR)"/Docs/FlashProxy - cp -rL "$(OBFSPROXY_DIST)"/{obfsproxy,bin/obfsproxy} "$(TBBDIR)"/App + cp -rL "$(OBFSPROXY_DIST)"/obfsproxy "$(TBBDIR)"/App + cp -rL "$(OBFSPROXY_DIST)"/bin/obfsproxy "$(TBBDIR)"/App/obfsproxy.bin cp -rL /usr/lib/python2.6/dist-packages/{Crypto,twisted,zope} "$(TBBDIR)"/App cp -rL /usr/lib/pymodules/python2.6/argparse.py "$(TBBDIR)"/App cp -rL /usr/local/lib/python2.6/dist-packages/pyptlib "$(TBBDIR)"/App diff --git a/doc/bundle-torrc-gnulinux b/doc/bundle-torrc-gnulinux index 3dc7b16..fac4cb5 100644 --- a/doc/bundle-torrc-gnulinux +++ b/doc/bundle-torrc-gnulinux @@ -23,4 +23,4 @@ CircuitBuildTimeout 60 # receive connections from the Internet (the port for which you # configured port forwarding). ClientTransportPlugin websocket exec ./App/flashproxy-client --register :0 :9000 -ClientTransportPlugin obfs2,obfs3 exec ./App/pyobfsproxy managed +ClientTransportPlugin obfs2,obfs3 exec ./App/obfsproxy.bin managed diff --git a/doc/bundle-torrc-macosx b/doc/bundle-torrc-macosx index 4624f68..73e2866 100644 --- a/doc/bundle-torrc-macosx +++ b/doc/bundle-torrc-macosx @@ -23,4 +23,4 @@ CircuitBuildTimeout 60 # receive connections from the Internet (the port for which you # configured port forwarding). ClientTransportPlugin websocket exec flashproxy-client --register :0 :9000 -ClientTransportPlugin obfs2,obfs3 exec pyobfsproxy managed +ClientTransportPlugin obfs2,obfs3 exec obfsproxy.bin managed

1 0

[flashproxy/master] pyobfsproxy → obfsproxy in windows torrc.
by dcf＠torproject.org 30 May '13

30 May '13

commit da8dae6049a57934dc6b26a04f7a4dd104fa41ba Author: David Fifield <david(a)bamsoftware.com> Date: Thu May 30 09:40:09 2013 -0700 pyobfsproxy → obfsproxy in windows torrc. --- doc/bundle-torrc-windows | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/bundle-torrc-windows b/doc/bundle-torrc-windows index 4624f68..fad5aa2 100644 --- a/doc/bundle-torrc-windows +++ b/doc/bundle-torrc-windows @@ -23,4 +23,4 @@ CircuitBuildTimeout 60 # receive connections from the Internet (the port for which you # configured port forwarding). ClientTransportPlugin websocket exec flashproxy-client --register :0 :9000 -ClientTransportPlugin obfs2,obfs3 exec pyobfsproxy managed +ClientTransportPlugin obfs2,obfs3 exec obfsproxy managed

1 0

[flashproxy/master] More pyobfsproxy → obfsproxy.
by dcf＠torproject.org 30 May '13

30 May '13

commit cf5c0836c319767d5427e8da9e8e68063f4b4e77 Author: David Fifield <david(a)bamsoftware.com> Date: Thu May 30 09:41:30 2013 -0700 More pyobfsproxy → obfsproxy. --- doc/Makefile | 12 ++++++------ doc/bundle-gnulinux.txt | 4 ++-- doc/bundle-macosx.txt | 4 ++-- doc/bundle-windows.txt | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index df62882..9a6cee9 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -86,8 +86,8 @@ $(PT_BUNDLE_WINDOWS): mkdir -p "$(TBBDIR)"/Docs/FlashProxy cp "$(FLASHPROXY_DIST_WIN32)"/{doc/*,README,LICENSE,ChangeLog} "$(TBBDIR)"/Docs/FlashProxy cp -nr "$(OBFSPROXY_DIST_WIN32)"/{*.pyd,*.dll,*.exe,*.zip} "$(TBBDIR)"/App - mkdir -p "$(TBBDIR)"/Docs/PyObfsproxy - cp "$(OBFSPROXY_DIST)"/{LICENSE,README} "$(TBBDIR)"/Docs/PyObfsproxy + mkdir -p "$(TBBDIR)"/Docs/Obfsproxy + cp "$(OBFSPROXY_DIST)"/{LICENSE,README} "$(TBBDIR)"/Docs/Obfsproxy cat bundle-torrc-windows >> "$(TBBDIR)"/Data/Tor/torrc @@ -114,8 +114,8 @@ $(PT_BUNDLE_MACOSX_I686): cp -r "$(OBFSPROXY_DIST)"/bin/obfsproxy "$(TBBDIR)"/Contents/MacOs/obfsproxy.bin cp -r "$(MACOSX_BUNDLE_ROOT)"/usr/lib/python2.7/site-packages/{Crypto,pyptlib} "$(TBBDIR)"/Contents/MacOS cp "$(MACOSX_BUNDLE_ROOT)"/argparse-1.2.1/argparse.py "$(TBBDIR)"/Contents/MacOS - mkdir -p "$(TBBDIR)"/Contents/Resources/Docs/PyObfsproxy - cp "$(OBFSPROXY_DIST)"/{LICENSE,README} "$(TBBDIR)"/Contents/Resources/Docs/PyObfsproxy + mkdir -p "$(TBBDIR)"/Contents/Resources/Docs/Obfsproxy + cp "$(OBFSPROXY_DIST)"/{LICENSE,README} "$(TBBDIR)"/Contents/Resources/Docs/Obfsproxy find "$(TBBDIR)"/Contents/MacOS -name '*.pyc' | xargs rm -f cat bundle-torrc-macosx >> "$(TBBDIR)"/Library/Vidalia/torrc @@ -144,8 +144,8 @@ $(PT_BUNDLE_GNULINUX_I686) $(PT_BUNDLE_GNULINUX_X86_64): cp -rL /usr/lib/python2.6/dist-packages/{Crypto,twisted,zope} "$(TBBDIR)"/App cp -rL /usr/lib/pymodules/python2.6/argparse.py "$(TBBDIR)"/App cp -rL /usr/local/lib/python2.6/dist-packages/pyptlib "$(TBBDIR)"/App - mkdir -p "$(TBBDIR)"/Docs/PyObfsproxy - cp "$(OBFSPROXY_DIST)"/{LICENSE,README} "$(TBBDIR)"/Docs/PyObfsproxy + mkdir -p "$(TBBDIR)"/Docs/Obfsproxy + cp "$(OBFSPROXY_DIST)"/{LICENSE,README} "$(TBBDIR)"/Docs/Obfsproxy find "$(TBBDIR)"/App -name '*.pyc' | xargs rm -f cat bundle-torrc-gnulinux >> "$(TBBDIR)"/Data/Tor/torrc diff --git a/doc/bundle-gnulinux.txt b/doc/bundle-gnulinux.txt index 84520be..818e7aa 100644 --- a/doc/bundle-gnulinux.txt +++ b/doc/bundle-gnulinux.txt @@ -81,9 +81,9 @@ Clone and build the flashproxy source. $ cd flashproxy $ make dist -Clone pyobfsproxy. +Clone obfsproxy. - $ git clone https://git.torproject.org/pluggable-transports/pyobfsproxy.git + $ git clone https://git.torproject.org/pluggable-transports/obfsproxy.git Update your Debian. diff --git a/doc/bundle-macosx.txt b/doc/bundle-macosx.txt index 943b2ad..0051542 100644 --- a/doc/bundle-macosx.txt +++ b/doc/bundle-macosx.txt @@ -71,9 +71,9 @@ Clone and build the flashproxy source. $ cd flashproxy $ make dist -Clone pyobfsproxy. +Clone obfsproxy. - $ git clone https://git.torproject.org/pluggable-transports/pyobfsproxy.git + $ git clone https://git.torproject.org/pluggable-transports/obfsproxy.git Enter the doc directory and edit the top of Makefile to set the version numbers you want to use. diff --git a/doc/bundle-windows.txt b/doc/bundle-windows.txt index f05c05b..4859769 100644 --- a/doc/bundle-windows.txt +++ b/doc/bundle-windows.txt @@ -117,7 +117,7 @@ fe4807b4698ec89f82de7d85d32deaa4c772fc871537e31fb0fccf4473455cb8 7z920.msi === PyCrypto -This is a dependency of pyobfsproxy and Twisted. +This is a dependency of obfsproxy and Twisted. https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/pycrypto-2.6.tar.gz https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/pycrypto-2.6.tar.gz.asc @@ -174,10 +174,10 @@ Clone and build the flashproxy source. $ cd flashproxy $ make dist-exe PYTHON=/cygdrive/c/Python27/python -Clone pyobfsproxy and run py2exe on it. +Clone obfsproxy and run py2exe on it. - $ git clone https://git.torproject.org/pluggable-transports/pyobfsproxy.git - $ cd pyobfsproxy + $ git clone https://git.torproject.org/pluggable-transports/obfsproxy.git + $ cd obfsproxy $ /cygdrive/c/Python27/python.exe setup_py2exe.py py2exe Enter the doc directory and edit the top of Makefile to set the version

1 0

[stem/master] Minor fixes for ONLINE testing fixes
by atagar＠torproject.org 30 May '13

30 May '13

commit 2257f7954a0d9dba46905a4813b828fcc0b52086 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 30 08:43:10 2013 -0700 Minor fixes for ONLINE testing fixes Just some minor tweaks to fix the style checker and s/range()/xrange(). --- test/integ/control/controller.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 2c4016f..bc9619c 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -797,7 +797,8 @@ class TestController(unittest.TestCase): s = None response = None - for _ in range(10): # Try up to 10 times, to rule out failures due to temporary network issues + # try up to 10 times to rule out transient network failures + for _ in xrange(10): try: s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) s.settimeout(30) @@ -805,6 +806,7 @@ class TestController(unittest.TestCase): test.network.negotiate_socks(s, '1.2.1.2', 80) s.sendall(test.network.ip_request) # make the http request for the ip address response = s.recv(1000) + if response: break except (stem.ProtocolError, socket.timeout): @@ -814,11 +816,11 @@ class TestController(unittest.TestCase): s.close() self.assertTrue(response) - + # everything after the blank line is the 'data' in a HTTP response. # The response data for our request for request should be an IP address + '\n' ip_addr = response[response.find("\r\n\r\n"):].strip() - + self.assertTrue(stem.util.connection.is_valid_ipv4_address(ip_addr)) def test_get_microdescriptor(self): @@ -993,13 +995,15 @@ class TestController(unittest.TestCase): controller.attach_stream(stream.id, circuit_id) with test.runner.get_runner().get_tor_controller() as controller: - for i in range(10): # Try 10 times to build a circuit we can connect through + # try 10 times to build a circuit we can connect through + for i in xrange(10): controller.add_event_listener(handle_streamcreated, stem.control.EventType.STREAM) controller.set_conf("__LeaveStreamsUnattached", "1") try: circuit_id = controller.new_circuit(await_build = True) socks_listener = controller.get_socks_listeners()[0] + with test.network.Socks(socks_listener) as s: s.settimeout(30) s.connect((host, port))

1 0

[stem/master] Made attachstream and mapaddress tests more robust
by atagar＠torproject.org 30 May '13

30 May '13

commit b5273658f6470a643b70b7ef96654248788eef2f Author: Jeremy <saturn5971(a)gmail.com> Date: Wed May 29 23:53:11 2013 -0400 Made attachstream and mapaddress tests more robust Modified the attachstream and mapaddress integ tests so that they don't fail as easily in the face of minor network failures unrelated to stem (like temporary issues building a circuit, or an exit node having a different IP from the one Tor reports). This is to address... https://trac.torproject.org/8692 --- test/integ/control/controller.py | 68 ++++++++++++++++++++++++++------------ 1 file changed, 47 insertions(+), 21 deletions(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 50c0cc7..2c4016f 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -794,16 +794,31 @@ class TestController(unittest.TestCase): with runner.get_tor_controller() as controller: controller.map_address({'1.2.1.2': 'ifconfig.me'}) - s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - s.connect(('127.0.0.1', int(controller.get_conf('SocksListenAddress').rsplit(':', 1)[1]))) - test.network.negotiate_socks(s, '1.2.1.2', 80) - s.sendall(test.network.ip_request) # make the http request for the ip address - response = s.recv(1000) + s = None + response = None + for _ in range(10): # Try up to 10 times, to rule out failures due to temporary network issues + try: + s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + s.settimeout(30) + s.connect(('127.0.0.1', int(controller.get_conf('SocksListenAddress').rsplit(':', 1)[1]))) + test.network.negotiate_socks(s, '1.2.1.2', 80) + s.sendall(test.network.ip_request) # make the http request for the ip address + response = s.recv(1000) + if response: + break + except (stem.ProtocolError, socket.timeout): + continue + finally: + if s: + s.close() + + self.assertTrue(response) + # everything after the blank line is the 'data' in a HTTP response. # The response data for our request for request should be an IP address + '\n' ip_addr = response[response.find("\r\n\r\n"):].strip() - + self.assertTrue(stem.util.connection.is_valid_ipv4_address(ip_addr)) def test_get_microdescriptor(self): @@ -968,6 +983,9 @@ class TestController(unittest.TestCase): elif test.runner.require_version(self, Requirement.EXTENDCIRCUIT_PATH_OPTIONAL): return + host = "38.229.72.14" # www.torproject.org + port = 80 + circuit_id = None def handle_streamcreated(stream): @@ -975,22 +993,30 @@ class TestController(unittest.TestCase): controller.attach_stream(stream.id, circuit_id) with test.runner.get_runner().get_tor_controller() as controller: - controller.set_conf("__LeaveStreamsUnattached", "1") - controller.add_event_listener(handle_streamcreated, stem.control.EventType.STREAM) + for i in range(10): # Try 10 times to build a circuit we can connect through + controller.add_event_listener(handle_streamcreated, stem.control.EventType.STREAM) + controller.set_conf("__LeaveStreamsUnattached", "1") - try: - circuit_id = controller.new_circuit(await_build = True) - socksport = controller.get_socks_listeners()[0][1] - - ip = test.network.external_ip('127.0.0.1', socksport) - exit_circuit = controller.get_circuit(circuit_id) - self.assertTrue(exit_circuit) - exit_ip = controller.get_network_status(exit_circuit.path[2][0]).address - - self.assertEquals(exit_ip, ip) - finally: - controller.remove_event_listener(handle_streamcreated) - controller.reset_conf("__LeaveStreamsUnattached") + try: + circuit_id = controller.new_circuit(await_build = True) + socks_listener = controller.get_socks_listeners()[0] + with test.network.Socks(socks_listener) as s: + s.settimeout(30) + s.connect((host, port)) + streams = controller.get_streams() + break + except (stem.CircuitExtensionFailed, socket.timeout): + continue + finally: + controller.remove_event_listener(handle_streamcreated) + controller.reset_conf("__LeaveStreamsUnattached") + + our_stream = [stream for stream in streams if stream.target_address == host][0] + + self.assertTrue(our_stream.circ_id) + self.assertTrue(circuit_id) + + self.assertEquals(our_stream.circ_id, circuit_id) def test_get_circuits(self): """

1 0

[translation/vidalia_completed] Update translations for vidalia_completed
by translation＠torproject.org 30 May '13

30 May '13

commit f91732ef431f34c245535459bb155d8488711fea Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 30 13:15:24 2013 +0000 Update translations for vidalia_completed --- uk/qt_uk.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uk/qt_uk.po b/uk/qt_uk.po index a83cc7c..27199d8 100644 --- a/uk/qt_uk.po +++ b/uk/qt_uk.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: 2008-08-20 03:25+0000\n" -"PO-Revision-Date: 2013-05-22 12:43+0000\n" +"PO-Revision-Date: 2013-05-30 13:00+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/torproject/language/uk/)\n" "MIME-Version: 1.0\n"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 30 May '13

30 May '13

commit 5a8a86c7e9dd4205f6560d99ab97a027516d6ab8 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 30 13:15:20 2013 +0000 Update translations for vidalia --- uk/qt_uk.po | 2 +- uk/vidalia_uk.po | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/uk/qt_uk.po b/uk/qt_uk.po index a83cc7c..27199d8 100644 --- a/uk/qt_uk.po +++ b/uk/qt_uk.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: 2008-08-20 03:25+0000\n" -"PO-Revision-Date: 2013-05-22 12:43+0000\n" +"PO-Revision-Date: 2013-05-30 13:00+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/torproject/language/uk/)\n" "MIME-Version: 1.0\n" diff --git a/uk/vidalia_uk.po b/uk/vidalia_uk.po index 6af7118..d730869 100644 --- a/uk/vidalia_uk.po +++ b/uk/vidalia_uk.po @@ -8,7 +8,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: 2013-05-22 12:51+0000\n" +"PO-Revision-Date: 2013-05-30 13:00+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/torproject/language/uk/)\n" "MIME-Version: 1.0\n"

1 0

[translation/gettor_completed] Update translations for gettor_completed
by translation＠torproject.org 30 May '13

30 May '13

commit 8b746bc875aa7bc2602671784ba6c5a8fb4e104f Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 30 12:45:15 2013 +0000 Update translations for gettor_completed --- pt_BR/gettor.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt_BR/gettor.po b/pt_BR/gettor.po index 0e0f6e8..c786e3c 100644 --- a/pt_BR/gettor.po +++ b/pt_BR/gettor.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-05-28 13:50+0000\n" +"PO-Revision-Date: 2013-05-30 12:40+0000\n" "Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -248,7 +248,7 @@ msgid "" "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 "Se sua conexão com a Internet bloqueia o acesso à rede Tor, você pode\nprecisar de uma ponte retransmissora. Pontes retransmissoras (ou pontes\npara encurtar) são retransmissores que não estão listados no diretório\nprincipal. Como não há uma lista pública deles, mesmo que seu ISP\nesteja filtrando conexões para todos os retransmissores Tor conhecidos,\neles provavelmente não serão capazes de bloquear todas as pontes." +msgstr "Se sua conexão Internet bloqueia o acesso à rede Tor, talvez você precise de retransmissores de pontes.Retransmissores de pontes (ou 'pontes', para abreviar) são retransmissores não listados no diretório\nprincipal. Já que não há uma lista pública deles, mesmo se o seu ISP\nestiver filtrando conexões para todos os retransmissores Tor conhecidos,\neles provavelmente não serão capazes de bloquear todas as pontes." #: lib/gettor/i18n.py:167 msgid "" @@ -262,7 +262,7 @@ msgstr "Você pode adquirir uma ponte enviando um e-mail que contenha a frase\n\ msgid "" "It is also possible to fetch bridges with a web browser at the following\n" "url: https://bridges.torproject.org/" -msgstr "Também é possível encontrar pontes através de um navegador web na\nseguinte url: https://bridges.torproject.org/" +msgstr "Também é possível encontrar pontes utilizando um navegador web no\nseguinte endereço: https://bridges.torproject.org/" #: lib/gettor/i18n.py:175 msgid ""

1 0