September 2012 - tor-commits - lists.torproject.org

[translation/vidalia_completed] Update translations for vidalia_completed
by translation＠torproject.org 20 Sep '12

20 Sep '12

commit 137453d15491a70b6847d2a4e4ed156dcf2dd029 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 20 15:45:16 2012 +0000 Update translations for vidalia_completed --- it/vidalia_it.po | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/it/vidalia_it.po b/it/vidalia_it.po index 29f3790..c8d4b6c 100644 --- a/it/vidalia_it.po +++ b/it/vidalia_it.po @@ -2,6 +2,7 @@ # Translators: # Alessandro <luccaronia(a)gmail.com>, 2012. # <a.n0on3(a)gmail.com>, 2011. +# <jan.reister(a)unimi.it>, 2012. # <luccaronia(a)gmail.com>, 2012. # runasand <runa.sandvik(a)gmail.com>, 2011. # <sergiopelino(a)gmail.com>, 2011. @@ -11,14 +12,14 @@ 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-06-10 16:01+0000\n" -"Last-Translator: Alessandro <luccaronia(a)gmail.com>\n" -"Language-Team: Italian (http://www.transifex.net/projects/p/torproject/language/it/)\n" +"PO-Revision-Date: 2012-09-20 15:16+0000\n" +"Last-Translator: jan <jan.reister(a)unimi.it>\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" @@ -31,7 +32,7 @@ msgstr "Licenza" msgctxt "AboutDialog" msgid "Vidalia 0.2.0" -msgstr "Vidalia" +msgstr "Vidalia 0.2.0" msgctxt "AboutDialog" msgid "Tor 0.2.0.32" @@ -39,7 +40,7 @@ msgstr "Tor 0.2.0.32" msgctxt "AboutDialog" msgid "Qt 4.4.2" -msgstr "4.4.2" +msgstr "Qt 4.4.2" msgctxt "AdvancedPage" msgid "'%1' is not a valid IP address."

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 20 Sep '12

20 Sep '12

commit 8018dec69c4ec56027d78e4893461d0833bae7a1 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 20 15:45:14 2012 +0000 Update translations for vidalia --- it/vidalia_it.po | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/it/vidalia_it.po b/it/vidalia_it.po index 29f3790..c8d4b6c 100644 --- a/it/vidalia_it.po +++ b/it/vidalia_it.po @@ -2,6 +2,7 @@ # Translators: # Alessandro <luccaronia(a)gmail.com>, 2012. # <a.n0on3(a)gmail.com>, 2011. +# <jan.reister(a)unimi.it>, 2012. # <luccaronia(a)gmail.com>, 2012. # runasand <runa.sandvik(a)gmail.com>, 2011. # <sergiopelino(a)gmail.com>, 2011. @@ -11,14 +12,14 @@ 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-06-10 16:01+0000\n" -"Last-Translator: Alessandro <luccaronia(a)gmail.com>\n" -"Language-Team: Italian (http://www.transifex.net/projects/p/torproject/language/it/)\n" +"PO-Revision-Date: 2012-09-20 15:16+0000\n" +"Last-Translator: jan <jan.reister(a)unimi.it>\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" @@ -31,7 +32,7 @@ msgstr "Licenza" msgctxt "AboutDialog" msgid "Vidalia 0.2.0" -msgstr "Vidalia" +msgstr "Vidalia 0.2.0" msgctxt "AboutDialog" msgid "Tor 0.2.0.32" @@ -39,7 +40,7 @@ msgstr "Tor 0.2.0.32" msgctxt "AboutDialog" msgid "Qt 4.4.2" -msgstr "4.4.2" +msgstr "Qt 4.4.2" msgctxt "AdvancedPage" msgid "'%1' is not a valid IP address."

1 0

[translation/orbot_completed] Update translations for orbot_completed
by translation＠torproject.org 20 Sep '12

20 Sep '12

commit acd1748c982341a200d425710498ee845fb8fb05 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 20 15:45:10 2012 +0000 Update translations for orbot_completed --- values-it/strings.xml | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/values-it/strings.xml b/values-it/strings.xml index 0932cde..ce071c8 100644 --- a/values-it/strings.xml +++ b/values-it/strings.xml @@ -119,8 +119,9 @@ <string name="pref_entrance_node">Nodi di entrata</string> <string name="pref_entrance_node_summary">Identificativi, nicknames, paesi ed indirizzi del primo hop</string> <string name="pref_entrance_node_dialog">Inserisci nodi di entrata</string> - <string name="pref_use_whispercore">Usa WhisperCore</string> - <string name="pref_use_whispercore_summary">Utilizza le API proprietarie NetFilter fornite da WhisperSystems (è richiesto che sul dispositivo sia installato WhisperCore)</string> +  + <string name="pref_proxy_title">Proxy di rete in uscita</string> <string name="pref_proxy_type_title">Tipo proxy</string> <string name="pref_proxy_type_summary">Protocolli da utilizzare per i server proxy: HTTP, HTTPS, Socks4, Socks5</string> <string name="pref_proxy_type_dialog">Inserisci tipo proxy</string>

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 20 Sep '12

20 Sep '12

commit 7c210e0ab8941ba082afafbccc9b32034c2f1269 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 20 15:45:07 2012 +0000 Update translations for orbot --- values-it/strings.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/values-it/strings.xml b/values-it/strings.xml index 5684001..ce071c8 100644 --- a/values-it/strings.xml +++ b/values-it/strings.xml @@ -121,7 +121,7 @@ <string name="pref_entrance_node_dialog">Inserisci nodi di entrata</string>  - <string name="pref_proxy_title">Outbound Network Proxy</string> + <string name="pref_proxy_title">Proxy di rete in uscita</string> <string name="pref_proxy_type_title">Tipo proxy</string> <string name="pref_proxy_type_summary">Protocolli da utilizzare per i server proxy: HTTP, HTTPS, Socks4, Socks5</string> <string name="pref_proxy_type_dialog">Inserisci tipo proxy</string>

1 0

[tor-cloud/master] Corrected ami id
by runa＠torproject.org 20 Sep '12

20 Sep '12

commit a3631542fee5a5173b2374c361e04f21aa300aeb Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Thu Sep 20 15:35:46 2012 +0100 Corrected ami id --- html/fa/index.html | 25 +++++++++++++------------ html/index.html | 22 +++++++++++----------- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/html/fa/index.html b/html/fa/index.html index 912bb3b..0b4ff79 100644 --- a/html/fa/index.html +++ b/html/fa/index.html @@ -108,25 +108,26 @@ <h3>Normal bridges</h3> <ul class="region-nav"> <ul class="region-nav"> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-east-1#launchAmi=ami-b433…" target="_blank">us-east-1 Virginia</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-1#launchAmi=ami-b433…" target="_blank">us-west-1 N. California</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-2#launchAmi=ami-b433…" target="_blank">us-west-2 Oregon</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-b433…" target="_blank">eu-west-1 Ireland</a></li> + <ul class="region-nav"> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-east-1#launchAmi=ami-37a7…" target="_blank">us-east-1 Virginia</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-1#launchAmi=ami-5f70…" target="_blank">us-west-1 N. California</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-2#launchAmi=ami-4c53…" target="_blank">us-west-2 Oregon</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-611c…" target="_blank">eu-west-1 Ireland</a></li> <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchAmi=ami…" target="_blank">ap-northeast-1 Tokyo</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchAmi=ami…" target="_blank">ap-southeast-1 Singapore</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=sa-east-1#launchAmi=ami-b433…" target="_blank">sa-east-1 Sao Paulo</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchAmi=ami…" target="_blank">ap-southeast-1 Singapore</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=sa-east-1#launchAmi=ami-d0c6…" target="_blank">sa-east-1 Sao Paulo</a></li> </ul> <h3>Private bridges</h3> <ul class="region-nav"> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-east-1#launchAmi=ami-b433…" target="_blank">us-east-1 Virginia</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-1#launchAmi=ami-b433…" target="_blank">us-west-1 N. California</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-2#launchAmi=ami-b433…" target="_blank">us-west-2 Oregon</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-b433…" target="_blank">eu-west-1 Ireland</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-east-1#launchAmi=ami-1188…" target="_blank">us-east-1 Virginia</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-1#launchAmi=ami-037b…" target="_blank">us-west-1 N. California</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-2#launchAmi=ami-246f…" target="_blank">us-west-2 Oregon</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-a71a…" target="_blank">eu-west-1 Ireland</a></li> <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchAmi=ami…" target="_blank">ap-northeast-1 Tokyo</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchAmi=ami…" target="_blank">ap-southeast-1 Singapore</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=sa-east-1#launchAmi=ami-b433…" target="_blank">sa-east-1 Sao Paulo</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchAmi=ami…" target="_blank">ap-southeast-1 Singapore</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=sa-east-1#launchAmi=ami-86f8…" target="_blank">sa-east-1 Sao Paulo</a></li> </ul>  <hgroup> diff --git a/html/index.html b/html/index.html index 682dd8a..118bd51 100644 --- a/html/index.html +++ b/html/index.html @@ -139,25 +139,25 @@ information about pricing. <h3>Normal bridges</h3> <ul class="region-nav"> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-east-1#launchAmi=ami-b433…" target="_blank">us-east-1 Virginia</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-1#launchAmi=ami-b433…" target="_blank">us-west-1 N. California</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-2#launchAmi=ami-b433…" target="_blank">us-west-2 Oregon</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-b433…" target="_blank">eu-west-1 Ireland</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-east-1#launchAmi=ami-37a7…" target="_blank">us-east-1 Virginia</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-1#launchAmi=ami-5f70…" target="_blank">us-west-1 N. California</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-2#launchAmi=ami-4c53…" target="_blank">us-west-2 Oregon</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-611c…" target="_blank">eu-west-1 Ireland</a></li> <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchAmi=ami…" target="_blank">ap-northeast-1 Tokyo</a></li> <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchAmi=ami…" target="_blank">ap-southeast-1 Singapore</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=sa-east-1#launchAmi=ami-b433…" target="_blank">sa-east-1 Sao Paulo</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=sa-east-1#launchAmi=ami-d0c6…" target="_blank">sa-east-1 Sao Paulo</a></li> </ul> <h3>Private bridges</h3> <ul class="region-nav"> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-east-1#launchAmi=ami-b433…" target="_blank">us-east-1 Virginia</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-1#launchAmi=ami-b433…" target="_blank">us-west-1 N. California</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-2#launchAmi=ami-b433…" target="_blank">us-west-2 Oregon</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-b433…" target="_blank">eu-west-1 Ireland</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-east-1#launchAmi=ami-1188…" target="_blank">us-east-1 Virginia</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-1#launchAmi=ami-037b…" target="_blank">us-west-1 N. California</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-2#launchAmi=ami-246f…" target="_blank">us-west-2 Oregon</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-a71a…" target="_blank">eu-west-1 Ireland</a></li> <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchAmi=ami…" target="_blank">ap-northeast-1 Tokyo</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchAmi=ami…" target="_blank">ap-southeast-1 Singapore</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=sa-east-1#launchAmi=ami-b433…" target="_blank">sa-east-1 Sao Paulo</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchAmi=ami…" target="_blank">ap-southeast-1 Singapore</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=sa-east-1#launchAmi=ami-86f8…" target="_blank">sa-east-1 Sao Paulo</a></li> </ul> <hgroup>

1 0

[tor-cloud/master] New Tor Cloud images
by runa＠torproject.org 20 Sep '12

20 Sep '12

commit 6f73d86505c770ccf5828f81b7333b265e32808d Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Thu Sep 20 15:31:19 2012 +0100 New Tor Cloud images --- html/fa/index.html | 29 +++++++++++++++-------------- html/index.html | 28 ++++++++++++++-------------- 2 files changed, 29 insertions(+), 28 deletions(-) diff --git a/html/fa/index.html b/html/fa/index.html index ec9b28e..912bb3b 100644 --- a/html/fa/index.html +++ b/html/fa/index.html @@ -107,25 +107,26 @@  <h3>Normal bridges</h3> <ul class="region-nav"> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-east-1#launchAmi=ami-c781…" target="_blank">us-east-1 Virginia</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-1#launchAmi=ami-d37f…" target="_blank">us-west-1 N. California</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-2#launchAmi=ami-021d…" target="_blank">us-west-2 Oregon</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-0bd8…" target="_blank">eu-west-1 Ireland</a></li> + <ul class="region-nav"> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-east-1#launchAmi=ami-b433…" target="_blank">us-east-1 Virginia</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-1#launchAmi=ami-b433…" target="_blank">us-west-1 N. California</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-2#launchAmi=ami-b433…" target="_blank">us-west-2 Oregon</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-b433…" target="_blank">eu-west-1 Ireland</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchAmi=ami…" target="_blank">ap-northeast-1 Tokyo</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchAmi=ami…" target="_blank">ap-southeast-1 Singapore</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=sa-east-1#launchAmi=ami-4463…" target="_blank">sa-east-1 Sao Paulo</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchAmi=ami…" target="_blank">ap-northeast-1 Tokyo</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchAmi=ami…" target="_blank">ap-southeast-1 Singapore</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=sa-east-1#launchAmi=ami-b433…" target="_blank">sa-east-1 Sao Paulo</a></li> </ul> <h3>Private bridges</h3> <ul class="region-nav"> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-east-1#launchAmi=ami-596d…" target="_blank">us-east-1 Virginia</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-1#launchAmi=ami-237b…" target="_blank">us-west-1 N. California</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-2#launchAmi=ami-da1b…" target="_blank">us-west-2 Oregon</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-2fe1…" target="_blank">eu-west-1 Ireland</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-east-1#launchAmi=ami-b433…" target="_blank">us-east-1 Virginia</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-1#launchAmi=ami-b433…" target="_blank">us-west-1 N. California</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-2#launchAmi=ami-b433…" target="_blank">us-west-2 Oregon</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-b433…" target="_blank">eu-west-1 Ireland</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchAmi=ami…" target="_blank">ap-northeast-1 Tokyo</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchAmi=ami…" target="_blank">ap-southeast-1 Singapore</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=sa-east-1#launchAmi=ami-9660…" target="_blank">sa-east-1 Sao Paulo</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchAmi=ami…" target="_blank">ap-northeast-1 Tokyo</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchAmi=ami…" target="_blank">ap-southeast-1 Singapore</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=sa-east-1#launchAmi=ami-b433…" target="_blank">sa-east-1 Sao Paulo</a></li> </ul>  <hgroup> diff --git a/html/index.html b/html/index.html index 232b013..682dd8a 100644 --- a/html/index.html +++ b/html/index.html @@ -139,25 +139,25 @@ information about pricing. <h3>Normal bridges</h3> <ul class="region-nav"> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-east-1#launchAmi=ami-c781…" target="_blank">us-east-1 Virginia</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-1#launchAmi=ami-d37f…" target="_blank">us-west-1 N. California</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-2#launchAmi=ami-021d…" target="_blank">us-west-2 Oregon</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-0bd8…" target="_blank">eu-west-1 Ireland</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-east-1#launchAmi=ami-b433…" target="_blank">us-east-1 Virginia</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-1#launchAmi=ami-b433…" target="_blank">us-west-1 N. California</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-2#launchAmi=ami-b433…" target="_blank">us-west-2 Oregon</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-b433…" target="_blank">eu-west-1 Ireland</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchAmi=ami…" target="_blank">ap-northeast-1 Tokyo</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchAmi=ami…" target="_blank">ap-southeast-1 Singapore</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=sa-east-1#launchAmi=ami-4463…" target="_blank">sa-east-1 Sao Paulo</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchAmi=ami…" target="_blank">ap-northeast-1 Tokyo</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchAmi=ami…" target="_blank">ap-southeast-1 Singapore</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=sa-east-1#launchAmi=ami-b433…" target="_blank">sa-east-1 Sao Paulo</a></li> </ul> <h3>Private bridges</h3> <ul class="region-nav"> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-east-1#launchAmi=ami-596d…" target="_blank">us-east-1 Virginia</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-1#launchAmi=ami-237b…" target="_blank">us-west-1 N. California</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-2#launchAmi=ami-da1b…" target="_blank">us-west-2 Oregon</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-2fe1…" target="_blank">eu-west-1 Ireland</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-east-1#launchAmi=ami-b433…" target="_blank">us-east-1 Virginia</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-1#launchAmi=ami-b433…" target="_blank">us-west-1 N. California</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-2#launchAmi=ami-b433…" target="_blank">us-west-2 Oregon</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-b433…" target="_blank">eu-west-1 Ireland</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchAmi=ami…" target="_blank">ap-northeast-1 Tokyo</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchAmi=ami…" target="_blank">ap-southeast-1 Singapore</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=sa-east-1#launchAmi=ami-9660…" target="_blank">sa-east-1 Sao Paulo</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchAmi=ami…" target="_blank">ap-northeast-1 Tokyo</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchAmi=ami…" target="_blank">ap-southeast-1 Singapore</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=sa-east-1#launchAmi=ami-b433…" target="_blank">sa-east-1 Sao Paulo</a></li> </ul> <hgroup>

1 0

[flashproxy/master] Be more tolerant of whitespace in HTTP reg messages.
by dcf＠torproject.org 20 Sep '12

20 Sep '12

commit cb88fe655ffdff5a21130a7b65eab2bf0cafc76a Author: David Fifield <david(a)bamsoftware.com> Date: Wed Sep 19 15:49:27 2012 -0700 Be more tolerant of whitespace in HTTP reg messages. --- facilitator/facilitator.cgi | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/facilitator/facilitator.cgi b/facilitator/facilitator.cgi index 6ccb479..8975aa7 100755 --- a/facilitator/facilitator.cgi +++ b/facilitator/facilitator.cgi @@ -101,7 +101,7 @@ def do_post(): client_specs = fs.getlist("client") if len(client_specs) != 1: exit_error(400) - client_spec = client_specs[0] + client_spec = client_specs[0].strip() try: client_addr = fac.parse_addr_spec(client_spec, defhost=proxy_addr[0]) except ValueError:

1 0

[flashproxy/master] Use $NAME once more in init.d/facilitator.
by dcf＠torproject.org 20 Sep '12

20 Sep '12

commit 0ac67a1686a2f7a8d5b387eda0c1037b8881dc8f Author: David Fifield <david(a)bamsoftware.com> Date: Wed Sep 19 16:53:15 2012 -0700 Use $NAME once more in init.d/facilitator. --- facilitator/init.d/facilitator | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/facilitator/init.d/facilitator b/facilitator/init.d/facilitator index fbb30c5..5228d1d 100755 --- a/facilitator/init.d/facilitator +++ b/facilitator/init.d/facilitator @@ -21,7 +21,7 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin DESC="Flash proxy facilitator" NAME=facilitator PIDFILE=/var/run/$NAME.pid -LOGFILE=/var/log/facilitator.log +LOGFILE=/var/log/$NAME.log DAEMON=/usr/local/bin/$NAME DAEMON_ARGS="-r $RELAY --log $LOGFILE --pidfile $PIDFILE" SCRIPTNAME=/etc/init.d/$NAME

1 0

[metrics-db/master] Correctly parse IPv6 addresses with :: in the middle.
by karsten＠torproject.org 19 Sep '12

19 Sep '12

commit f0b4f989a175ac8a2771f7a157e74e0c67b124ee Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Sep 19 17:47:55 2012 -0400 Correctly parse IPv6 addresses with :: in the middle. --- .../ernie/db/SanitizedBridgesWriter.java | 70 +++++++++++-------- 1 files changed, 40 insertions(+), 30 deletions(-) diff --git a/src/org/torproject/ernie/db/SanitizedBridgesWriter.java b/src/org/torproject/ernie/db/SanitizedBridgesWriter.java index 4f72c6a..afafe11 100644 --- a/src/org/torproject/ernie/db/SanitizedBridgesWriter.java +++ b/src/org/torproject/ernie/db/SanitizedBridgesWriter.java @@ -201,43 +201,53 @@ public class SanitizedBridgesWriter { return null; } byte[] hashInput = new byte[16 + 20 + 19]; - StringBuilder hex = new StringBuilder(); - String[] parts = address.substring(1, address.length() - 1). - split(":", -1); - if (parts.length < 1 || parts.length > 8) { + String[] doubleColonSeparatedParts = address.substring(1, + address.length() - 1).split("::", -1); + if (doubleColonSeparatedParts.length > 2) { /* Invalid IPv6 address. */ return null; } - for (int i = 0; i < parts.length; i++) { - String part = parts[i]; - if (part.contains(".")) { - String[] ipParts = part.split("\\."); - byte[] ipv4Bytes = new byte[4]; - if (ipParts.length != 4) { - /* Invalid IPv4 part in IPv6 address. */ - return null; - } - for (int m = 0; m < 4; m++) { - ipv4Bytes[m] = (byte) Integer.parseInt(ipParts[m]); - } - hex.append(Hex.encodeHexString(ipv4Bytes)); - } else if (part.length() > 4) { + List<String> hexParts = new ArrayList<String>(); + for (String doubleColonSeparatedPart : doubleColonSeparatedParts) { + StringBuilder hexPart = new StringBuilder(); + String[] parts = doubleColonSeparatedPart.split(":", -1); + if (parts.length < 1 || parts.length > 8) { /* Invalid IPv6 address. */ return null; - } else if (part.length() < 1) { - int j = parts.length - 1; - if (address.contains(".")) { - j++; - } - for (; j < 8; j++) { - hex.append("0000"); - } - } else { - for (int k = part.length(); k < 4; k++) { - hex.append("0"); + } + for (int i = 0; i < parts.length; i++) { + String part = parts[i]; + if (part.contains(".")) { + String[] ipParts = part.split("\\."); + byte[] ipv4Bytes = new byte[4]; + if (ipParts.length != 4) { + /* Invalid IPv4 part in IPv6 address. */ + return null; + } + for (int m = 0; m < 4; m++) { + ipv4Bytes[m] = (byte) Integer.parseInt(ipParts[m]); + } + hexPart.append(Hex.encodeHexString(ipv4Bytes)); + } else if (part.length() > 4) { + /* Invalid IPv6 address. */ + return null; + } else { + for (int k = part.length(); k < 4; k++) { + hexPart.append("0"); + } + hexPart.append(part); } - hex.append(part); } + hexParts.add(hexPart.toString()); + } + StringBuilder hex = new StringBuilder(); + hex.append(hexParts.get(0)); + if (hexParts.size() == 2) { + for (int i = 32 - hexParts.get(0).length() + - hexParts.get(1).length(); i > 0; i--) { + hex.append("0"); + } + hex.append(hexParts.get(1)); } byte[] ipBytes = null; try {

1 0

[tor/master] Make ./configure -q really silent
by nickm＠torproject.org 19 Sep '12

19 Sep '12

commit cff3b8c93cf312956e629b4caab8f5e48d1e10dd Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 19 11:47:59 2012 -0400 Make ./configure -q really silent Our updateVersions script was being verbose, which might have made sense back when I wrote it, but doesn't any more. Final fix for bug 6599 --- contrib/updateVersions.pl | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/contrib/updateVersions.pl b/contrib/updateVersions.pl index 710d7d9..9dae1ff 100755 --- a/contrib/updateVersions.pl +++ b/contrib/updateVersions.pl @@ -4,6 +4,8 @@ $CONFIGURE_IN = './configure.ac'; $ORCONFIG_H = './src/win32/orconfig.h'; $TOR_NSI = './contrib/tor-mingw.nsi.in'; +$quiet = 1; + sub demand { my $fn = shift; die "Missing file $fn" unless (-f $fn); @@ -24,7 +26,7 @@ while (<F>) { } } die "No version found" unless $version; -print "Tor version is $version\n"; +print "Tor version is $version\n" unless $quiet; close F; sub correctversion { @@ -36,7 +38,7 @@ sub correctversion { if ($s =~ /^$defchar(?:)define\s+VERSION\s+\"([^\"]+)\"/m) { $oldver = $1; if ($oldver ne $version) { - print "Version mismatch in $fn: It thinks that the version is $oldver. Fixing.\n"; + print "Version mismatch in $fn: It thinks that the version is $oldver. I think it's $version. Fixing.\n"; $line = $defchar . "define VERSION \"$version\""; open(F, ">$fn.bak"); print F $s; @@ -44,9 +46,9 @@ sub correctversion { $s =~ s/^$defchar(?:)define\s+VERSION.*?$/$line/m; open(F, ">$fn"); print F $s; - close F; + close F; } else { - print "$fn has the correct version. Good.\n"; + print "$fn has the correct version. Good.\n" unless $quiet; } } else { print "Didn't find a version line in $fn -- uh oh.\n";

1 0