commit 5c185a06eb766055211a942cc3e3c80deb677a38
Author: David Fifield <david(a)bamsoftware.com>
Date: Sun May 25 11:18:33 2014 -0700
Add some commented test cases to think about.
It may make sense for use to ensure that the proxy URL has a separable
host name and port. On the other hand, that's one of the error
conditions the application is going to have to check for anyway when it
goes to connect to the proxy.
---
meek-client/proxy_test.go | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/meek-client/proxy_test.go b/meek-client/proxy_test.go
index d26362d..77123b9 100644
--- a/meek-client/proxy_test.go
+++ b/meek-client/proxy_test.go
@@ -40,6 +40,16 @@ func TestGetProxyURL(t *testing.T) {
{"socks4a://localhost:1080", "socks4a://localhost:1080"},
{"unknown://localhost/whatever", "unknown://localhost/whatever"},
}
+ /*
+ No port: reject; or infer from scheme?
+ http://localhost
+ socks4a://localhost
+ socks5://localhost
+ Port without host: probably reject?
+ http://:8080
+ socks4a://:1080
+ socks5://:1080
+ */
os.Clearenv()
u, err := PtGetProxyURL()
commit fd2943a050c66f918287b05d144916bec47c111d
Author: David Fifield <david(a)bamsoftware.com>
Date: Sun May 25 10:17:20 2014 -0700
Add proxy URL tests using IP addresses.
I assumed that you should be able to give a proxy host as a domain name,
but it turns out that proposal 232 doesn't actually say that
(https://trac.torproject.org/projects/tor/ticket/12125#comment:3). Add
some IP addresses in addition to host names so we have that covered as
well.
---
meek-client/proxy_test.go | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/meek-client/proxy_test.go b/meek-client/proxy_test.go
index 9e8fcf9..01ad37d 100644
--- a/meek-client/proxy_test.go
+++ b/meek-client/proxy_test.go
@@ -8,14 +8,28 @@ import (
func TestGetProxyURL(t *testing.T) {
badTests := [...]string{
"bogus",
+ "http:",
+ "://127.0.0.1",
+ "//127.0.0.1",
+ "http:127.0.0.1",
+ "://[::1]",
+ "//[::1]",
+ "http:[::1]",
"://localhost",
"//localhost",
- "http:",
"http:localhost",
}
goodTests := [...]struct {
input, expected string
}{
+ {"http://127.0.0.1", "http://127.0.0.1"},
+ {"http://127.0.0.1:3128", "http://127.0.0.1:3128"},
+ {"http://127.0.0.1:3128/", "http://127.0.0.1:3128/"},
+ {"http://127.0.0.1:3128/path", "http://127.0.0.1:3128/path"},
+ {"http://[::1]", "http://[::1]"},
+ {"http://[::1]:3128", "http://[::1]:3128"},
+ {"http://[::1]:3128/", "http://[::1]:3128/"},
+ {"http://[::1]:3128/path", "http://[::1]:3128/path"},
{"http://localhost", "http://localhost"},
{"http://localhost:3128", "http://localhost:3128"},
{"http://localhost:3128/", "http://localhost:3128/"},
commit bcd9325b3e3b6ba70fd131a7c9cbd0160cfd7c52
Author: Translation commit bot <translation(a)torproject.org>
Date: Sun May 25 17:15:49 2014 +0000
Update translations for tails-misc
---
ca.po | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/ca.po b/ca.po
index 7a80805..52234bd 100644
--- a/ca.po
+++ b/ca.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-04-27 19:29+0200\n"
-"PO-Revision-Date: 2014-05-25 16:45+0000\n"
+"PO-Revision-Date: 2014-05-25 16:50+0000\n"
"Last-Translator: ELOI95\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/torproject/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -327,18 +327,18 @@ msgstr "Iniciant I2P..."
#: config/chroot_local-includes/usr/local/bin/tails-start-i2p:63
msgid "The I2P router console will be opened on start."
-msgstr ""
+msgstr "La consola I2P s'obrirà a l'Inici."
#: config/chroot_local-includes/usr/local/bin/tails-start-i2p:82
#: config/chroot_local-includes/usr/local/bin/tails-start-i2p:124
msgid "I2P failed to start"
-msgstr ""
+msgstr "Error per iniciar I2P."
#: config/chroot_local-includes/usr/local/bin/tails-start-i2p:83
msgid ""
"Make sure that you have a working Internet connection, then try to start I2P"
" again."
-msgstr ""
+msgstr "Assegura't que et funciona la connexió a internet, desprès torna a iniciar I2P."
#: config/chroot_local-includes/usr/local/bin/tails-start-i2p:125
msgid ""
@@ -388,7 +388,7 @@ msgstr ""
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:68
msgid "Do you really want to launch the Unsafe Browser?"
-msgstr ""
+msgstr "De debò vols obrir el Browser Insegur?"
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
msgid ""
@@ -403,7 +403,7 @@ msgstr ""
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:72
msgid "_Exit"
-msgstr ""
+msgstr "_Surt"
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:82
msgid "Starting the Unsafe Browser..."
@@ -411,7 +411,7 @@ msgstr "Iniciant el Navegador Insegur..."
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:83
msgid "This may take a while, so please be patient."
-msgstr ""
+msgstr "Això pot portar una estona, siusplau esperi."
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:101
msgid "Failed to setup chroot."
@@ -430,11 +430,11 @@ msgstr ""
msgid ""
"This may take a while, and you may not restart the Unsafe Browser until it "
"is properly shut down."
-msgstr ""
+msgstr "Això pot tardar una mica, no reinicii el Browser Insegur fins que no s'hagi tancat correctament."
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:228
msgid "Failed to restart Tor."
-msgstr ""
+msgstr "Error al reiniciar Tor."
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:236
msgid ""
commit 41e13f9b6945014205aac4383907a47df4f8c572
Author: Translation commit bot <translation(a)torproject.org>
Date: Sun May 25 17:15:07 2014 +0000
Update translations for gettor
---
ca/gettor.po | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/ca/gettor.po b/ca/gettor.po
index fe91b0f..d164a23 100644
--- a/ca/gettor.po
+++ b/ca/gettor.po
@@ -14,7 +14,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: 2014-05-25 16:42+0000\n"
+"PO-Revision-Date: 2014-05-25 17:04+0000\n"
"Last-Translator: ELOI95\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/torproject/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -150,7 +150,7 @@ msgid ""
" \n"
" windows\n"
" split"
-msgstr ""
+msgstr "Simplement inclou la paraula clau \"dividit\" en una nova línia (això és\nimportant) com per exemple:\n\nwindows\ndividir"
#: lib/gettor/i18n.py:107
msgid ""
@@ -226,7 +226,7 @@ msgid ""
"The output should look somewhat like this:\n"
"\n"
" gpg: Good signature from 'Erinn Clark <...>'"
-msgstr ""
+msgstr "El resultat hauria de ser alguna cosa com:\n\ngpg: Bona signatura de 'Erinn Clark <...>'"
#: lib/gettor/i18n.py:152
msgid ""
@@ -356,7 +356,7 @@ msgid ""
"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 ""
+msgstr "windows\nEl paquet de Tor Browser Bundle per a sistemes operatius Windows. Si utilitza\nalguna versió de Windows, com el Windows XP, Windows Vista o\nWindows 7, és el paquet que hauries de rebre."
#: lib/gettor/i18n.py:227
msgid ""