- tor-commits - lists.torproject.org

[translation/gettor] Update translations for gettor
by translation＠torproject.org 07 Jan '12

07 Jan '12

commit 5a024a02f1a5ac750eafcf9facad4c3ad52f39bc Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 7 11:45:02 2012 +0000 Update translations for gettor --- fa/gettor.po | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/fa/gettor.po b/fa/gettor.po index 93fbba3..596a9fb 100644 --- a/fa/gettor.po +++ b/fa/gettor.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: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2012-01-07 10:50+0000\n" +"PO-Revision-Date: 2012-01-07 11:21+0000\n" "Last-Translator: martin luther king <sabztunnel(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -453,6 +453,9 @@ msgid "" "The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n" "general, newer Mac hardware will require you to use this package." msgstr "" +"macros-i۳۸۶:\n" +"\n" +"بسته مرورگر TOR برای سیستم عامل OS X برای پردازشگر اینتل. به طور کلی‌، کامپیوتر‌های MAC جدید مستلزم استفاده از این بسته است. " #: lib/gettor/i18n.py:222 msgid ""

1 0

[tor/release-0.2.2] clean up the changelog some more
by arma＠torproject.org 07 Jan '12

07 Jan '12

commit 031ac2a49e38ced438a17e95855ed66c25836f73 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Jan 7 06:35:44 2012 -0500 clean up the changelog some more --- ChangeLog | 35 +++++++++++++++++------------------ 1 files changed, 17 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index cb1b764..f3c9e84 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,35 +1,34 @@ -Changes in version 0.2.2.36 - 2012-01-06 +Changes in version 0.2.2.36 - 2012-01-0? o Major security workaround: - When building or running with any version of OpenSSL earlier than 0.9.8s or 1.0.0f, disable SSLv3 support. These OpenSSL - versions had a bug (CVE-2011-4576) in which their block cipher - padding included uninitialized data, potentially leaking sensitive - information to any peer with whom they made a SSLv3 connection. Tor + versions have a bug (CVE-2011-4576) in which their block cipher + padding includes uninitialized data, potentially leaking sensitive + information to any peer with whom they make a SSLv3 connection. Tor does not use SSL v3 by default, but a hostile client or server could force an SSLv3 connection in order to gain information that they shouldn't have been able to get. The best solution here is to upgrade to OpenSSL 0.9.8s or 1.0.0f (or later). But when building - or running with a non-upgraded OpenSSL, we should instead make - sure that the bug can't happen by disabling SSLv3 entirely. + or running with a non-upgraded OpenSSL, we disable SSLv3 entirely + to make sure that the bug can't happen. o Major bugfixes: - - Provide correct replacements for the timeradd() and timersub() - functions for platforms that lack them (for example, windows). The - timersub() function is used when expiring circuits, timeradd() is - currently unused. Patch written by Vektor, who also reported the - bug. Thanks! Bugfix on 0.2.2.24-alpha/0.2.3.1-alpha, fixes bug 4778. + - Correct our replacements for the timeradd() and timersub() functions + on platforms that lack them (for example, Windows). The timersub() + function is used when expiring circuits, while timeradd() is + currently unused. Bug report and patch by Vektor. Bugfix on + 0.2.2.24-alpha; fixes bug 4778. o Minor bugfixes: - - When running with an older Linux kernel that erroneously responds - to strange nmap behavior by having accept() return successfully - with a zero-length socket, just close the connection. Previously, + - Older Linux kernels erroneously respond to strange nmap behavior + by having accept() return successfully with a zero-length + socket. When this happens, just close the connection. Previously, we would try harder to learn the remote address: but there was no such remote address to learn, and our method for trying to learn it was incorrect. Fixes bugs 1240, 4745, and 4747. Bugfix on 0.1.0.3-rc. Reported and diagnosed by "r1eo". - - Correctly spell "connect" in a log message when creating a - controlsocket fails. Fixes bug 4803; bugfix on 0.2.2.26-beta and - 0.2.3.2-alpha. + - Correctly spell "connect" in a log message on failure to create a + controlsocket. Fixes bug 4803; bugfix on 0.2.2.26-beta. o Minor features: - Directory servers now reject versions of Tor older than 0.2.1.30, @@ -46,7 +45,7 @@ Changes in version 0.2.2.36 - 2012-01-06 didn't handle RELAY_EARLY cells properly. Now that all supported versions can handle RELAY_EARLY cells, and now that we're enforcing the "no RELAY_EXTEND commands except in RELAY_EARLY cells" rule, - we're removing this workaround. Addresses bug 4786. + remove this workaround. Addresses bug 4786. o Code simplifications and refactoring: - During configure, detect when we're building with clang version

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 07 Jan '12

07 Jan '12

commit 9569943d031a6506205e4e10142d7bd6e426447f Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 7 11:15:02 2012 +0000 Update translations for gettor --- fa/gettor.po | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/fa/gettor.po b/fa/gettor.po index 1728c3e..93fbba3 100644 --- a/fa/gettor.po +++ b/fa/gettor.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: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2012-01-07 10:37+0000\n" +"PO-Revision-Date: 2012-01-07 10:50+0000\n" "Last-Translator: martin luther king <sabztunnel(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -443,6 +443,9 @@ msgid "" "running some version of Windows, like Windows XP, Windows Vista or \n" "Windows 7, this is the package you should get." msgstr "" +"بسته نرم افزاری حاوی مرورگر TOR برای سیستم عامل ویندوز. در صورتی‌ که از یکی‌" +" از نسخه‌های سیستم عمل ویندوز مثلِ ویندوز اکسپی یا ویندوز ۷ و یا ویندوز " +"ویستا استفاده می‌کنید از این بسته استفاده کنید." #: lib/gettor/i18n.py:218 msgid ""

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 07 Jan '12

07 Jan '12

commit 8ce5f1433b48bebd535e3c460f9dc68371f31481 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 7 10:45:02 2012 +0000 Update translations for gettor --- fa/gettor.po | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/fa/gettor.po b/fa/gettor.po index ac2e84a..1728c3e 100644 --- a/fa/gettor.po +++ b/fa/gettor.po @@ -5,13 +5,13 @@ # Translators: # <behravanhamed(a)gmail.com>, 2011. # Jacob Appelbaum <jacob(a)appelbaum.net>, 2009. -# martin luther king <sabztunnel(a)gmail.com>, 2011. +# martin luther king <sabztunnel(a)gmail.com>, 2011, 2012. msgid "" 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: 2011-12-27 18:52+0000\n" +"PO-Revision-Date: 2012-01-07 10:37+0000\n" "Last-Translator: martin luther king <sabztunnel(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -391,6 +391,9 @@ msgid "" "UNPACKING THE FILES\n" "===================" msgstr "" +"باز کردن بسته فایل \n" +"\n" +"-------------------------" #: lib/gettor/i18n.py:196 msgid ""

1 0

r25288: {website} add a new mirror in iceland, update the list of available mi (in website/trunk: . include)
by Andrew Lewman 07 Jan '12

07 Jan '12

Author: phobos Date: 2012-01-07 03:54:35 +0000 (Sat, 07 Jan 2012) New Revision: 25288 Modified: website/trunk/include/mirrors-table.wmi website/trunk/update-mirrors.pl Log: add a new mirror in iceland, update the list of available mirrors. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2012-01-05 23:45:04 UTC (rev 25287) +++ website/trunk/include/mirrors-table.wmi 2012-01-07 03:54:35 UTC (rev 25288) @@ -1,6 +1,74 @@ <tr> + <td>NL</td> + + <td>Amorphis</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.amorphis.eu/dist/">http</a></td> + <td><a href="http://tor.amorphis.eu/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>NL</td> + + <td>torproject.nl</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://www.torproject.nl/dist/">http</a></td> + <td><a href="http://www.torproject.nl/">http</a></td> + <td><a href="https://www.torproject.nl/dist/">https</a></td> + <td><a href="https://www.torproject.nl/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>NL</td> + + <td>CCC</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.ccc.de/dist/">http</a></td> + <td><a href="http://tor.ccc.de/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>DK</td> + + <td>Zentrum der Gesundheit</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.idnr.ws/dist/">http</a></td> + <td><a href="http://tor.idnr.ws/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>EE</td> <td>CyberSIDE</td> @@ -18,6 +86,23 @@ <tr> + <td>IS</td> + + <td>torproject.is</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://torproject.is/dist/">http</a></td> + <td><a href="http://torproject.is/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>US</td> <td>BarkerJr</td> @@ -52,6 +137,23 @@ <tr> + <td>IS</td> + + <td></td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.myrl.net/dist/">http</a></td> + <td><a href="http://tor.myrl.net/">http</a></td> + <td><a href="https://tor.myrl.net/dist/">https</a></td> + <td><a href="https://tor.myrl.net/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>DE</td> <td>CCC-Hanau</td> @@ -86,6 +188,23 @@ <tr> + <td>LT</td> + + <td></td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.vesta.nu/dist/">http</a></td> + <td><a href="http://tor.vesta.nu/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>FR</td> <td>BarkerJr</td> @@ -103,6 +222,23 @@ <tr> + <td>AT</td> + + <td>cyberarmy</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.cyberarmy.at/dist/">http</a></td> + <td><a href="http://tor.cyberarmy.at/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>US</td> <td>searchprivate</td> @@ -222,32 +358,32 @@ <tr> - <td>IL</td> + <td>US</td> - <td>Host4site</td> + <td>Xpdm</td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirror.host4site.co.il/torproject.org/dist/">http</a></td> - <td><a href="http://mirror.host4site.co.il/torproject.org/">http</a></td> + <td><a href="http://torproj.xpdm.us/dist/">http</a></td> + <td><a href="http://torproj.xpdm.us/">http</a></td> + <td><a href="https://torproj.xpdm.us/dist/">https</a></td> + <td><a href="https://torproj.xpdm.us/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>FR</td> + <td>IL</td> - <td>LazyTiger</td> + <td>Host4site</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.taiga-san.net/dist/">http</a></td> - <td><a href="http://tor.taiga-san.net/">http</a></td> + <td><a href="http://mirror.host4site.co.il/torproject.org/dist/">http</a></td> + <td><a href="http://mirror.host4site.co.il/torproject.org/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -256,15 +392,15 @@ <tr> - <td>INT</td> + <td>FR</td> - <td>CoralCDN</td> + <td>LazyTiger</td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> - <td><a href="http://www.torproject.org.nyud.net/">http</a></td> + <td><a href="http://tor.taiga-san.net/dist/">http</a></td> + <td><a href="http://tor.taiga-san.net/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -273,15 +409,15 @@ <tr> - <td>NL</td> + <td>IS</td> - <td>Amorphis</td> + <td>TheOnionRouter</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.amorphis.eu/dist/">http</a></td> - <td><a href="http://tor.amorphis.eu/">http</a></td> + <td><a href="http://theonionrouter.com/dist/">http</a></td> + <td><a href="http://theonionrouter.com/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -290,100 +426,49 @@ <tr> - <td>NL</td> + <td>SE</td> - <td>torproject.nl</td> + <td>homosu</td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.torproject.nl/dist/">http</a></td> - <td><a href="http://www.torproject.nl/">http</a></td> - <td><a href="https://www.torproject.nl/dist/">https</a></td> - <td><a href="https://www.torproject.nl/">https</a></td> + <td><a href="http://tor.homosu.net/dist/">http</a></td> + <td><a href="http://tor.homosu.net/">http</a></td> <td> - </td> <td> - </td> -</tr> - -<tr> - - <td>NL</td> - - <td>CCC</td> - - <td>Up to date</td> - <td> - </td> - <td><a href="http://tor.ccc.de/dist/">http</a></td> - <td><a href="http://tor.ccc.de/">http</a></td> <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>DK</td> - - <td>Zentrum der Gesundheit</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.idnr.ws/dist/">http</a></td> - <td><a href="http://tor.idnr.ws/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>IS</td> - - <td>torproject.is</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://torproject.is/dist/">http</a></td> - <td><a href="http://torproject.is/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>DE</td> - <td>torservers</td> + <td>[[:bbs:]]</td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.torservers.net/mirrors/torproject.org/dist/">http</a></td> - <td><a href="http://www.torservers.net/mirrors/torproject.org/">http</a></td> - <td><a href="https://www.torservers.net/mirrors/torproject.org/dist/">https</a></td> - <td><a href="https://www.torservers.net/mirrors/torproject.org/">https</a></td> + <td><a href="http://tor.blingblingsquad.net/dist">http</a></td> + <td><a href="http://tor.blingblingsquad.net/">http</a></td> + <td><a href="https://tor.blingblingsquad.net/dist">https</a></td> + <td><a href="https://tor.blingblingsquad.net/">https</a></td> <td> - </td> <td> - </td> </tr> <tr> - <td>LT</td> + <td>INT</td> - <td></td> + <td>CoralCDN</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.vesta.nu/dist/">http</a></td> - <td><a href="http://tor.vesta.nu/">http</a></td> + <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> + <td><a href="http://www.torproject.org.nyud.net/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -392,19 +477,19 @@ <tr> - <td>AT</td> + <td>IS</td> - <td>cyberarmy</td> + <td>crypto.is</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.cyberarmy.at/dist/">http</a></td> - <td><a href="http://tor.cyberarmy.at/">http</a></td> + <td><a href="https://torproject.crypto.is/dist/">http</a></td> + <td><a href="https://torproject.crypto.is/">http</a></td> + <td><a href="https://torproject.crypto.is/dist/">https</a></td> + <td><a href="https://torproject.crypto.is/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> @@ -413,7 +498,7 @@ <td>AskApache</td> - <td>Up to date</td> + <td>Out of date</td> <td> - </td> <td><a href="http://tor.askapache.com/dist/">http</a></td> @@ -426,57 +511,6 @@ <tr> - <td>IS</td> - - <td>TheOnionRouter</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://theonionrouter.com/dist/">http</a></td> - <td><a href="http://theonionrouter.com/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>SE</td> - - <td>homosu</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.homosu.net/dist/">http</a></td> - <td><a href="http://tor.homosu.net/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>DE</td> - - <td>[[:bbs:]]</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.blingblingsquad.net/dist">http</a></td> - <td><a href="http://tor.blingblingsquad.net/">http</a></td> - <td><a href="https://tor.blingblingsquad.net/dist">https</a></td> - <td><a href="https://tor.blingblingsquad.net/">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>IN</td> <td>India Tor Fans</td> @@ -562,6 +596,23 @@ <tr> + <td>DE</td> + + <td>torservers</td> + + <td>Unknown</td> + + <td> - </td> + <td><a href="http://www.torservers.net/mirrors/torproject.org/dist/">http</a></td> + <td><a href="http://www.torservers.net/mirrors/torproject.org/">http</a></td> + <td><a href="https://www.torservers.net/mirrors/torproject.org/dist/">https</a></td> + <td><a href="https://www.torservers.net/mirrors/torproject.org/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>IR</td> <td>Ninjas</td> @@ -610,37 +661,3 @@ <td> - </td> <td> - </td> </tr> - -<tr> - - <td>US</td> - - <td>Xpdm</td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://torproj.xpdm.us/dist/">http</a></td> - <td><a href="http://torproj.xpdm.us/">http</a></td> - <td><a href="https://torproj.xpdm.us/dist/">https</a></td> - <td><a href="https://torproj.xpdm.us/">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>IS</td> - - <td>crypto.is</td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="https://torproject.crypto.is/dist/">http</a></td> - <td><a href="https://torproject.crypto.is/">http</a></td> - <td><a href="https://torproject.crypto.is/dist/">https</a></td> - <td><a href="https://torproject.crypto.is/">https</a></td> - <td> - </td> - <td> - </td> -</tr> Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2012-01-05 23:45:04 UTC (rev 25287) +++ website/trunk/update-mirrors.pl 2012-01-07 03:54:35 UTC (rev 25288) @@ -803,6 +803,24 @@ httpsDistMirror => "", rsyncDistMirror => "", hiddenServiceMirror => "", + }, + mirror049 => { + adminContact => "IceBear", + orgName => "", + isoCC => "IS", + subRegion => "", + region => "IS", + ipv4 => "True", + ipv6 => "False", + loadBalanced => "No", + httpWebsiteMirror => "http://tor.myrl.net/", + httpsWebsiteMirror => "https://tor.myrl.net/", + rsyncWebsiteMirror => "", + ftpWebsiteMirror => "", + httpDistMirror => "http://tor.myrl.net/dist/", + httpsDistMirror => "https://tor.myrl.net/dist/", + rsyncDistMirror => "", + hiddenServiceMirror => "", } );

1 0

[vidalia-plugins/master] Make thandy.js check for tor and firefox when updating
by chiiph＠torproject.org 06 Jan '12

06 Jan '12

commit a8f881f1558bd44545f812e4655b9b4b106e1837 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Jan 6 15:38:00 2012 -0300 Make thandy.js check for tor and firefox when updating --- thandy/thandy.js | 37 ++++++++++++++++++++++++++++++++++++- 1 files changed, 36 insertions(+), 1 deletions(-) diff --git a/thandy/thandy.js b/thandy/thandy.js index 8bf0d22..773c103 100644 --- a/thandy/thandy.js +++ b/thandy/thandy.js @@ -42,8 +42,11 @@ var thandy = { // BootstrapUpdateParams = update,--controller-log-format,--install,/bundleinfo/bootstrapper/ // VidaliaBundle = "Vidalia Bundle" // BootstrapBundle = "Bootstrapper" + // TorBundle = "Tor" + // FirefoxBundle = "Firefox" // ThpDbRoot = "" // ThpInstallRoot = "" + // RestartCmd = ../rel/path/to/app this.chkPeriodicallyCheck.setCheckState((this.tab.getSetting("PeriodicallyCheck", "true") == "true")?Qt.Checked:Qt.Unchecked); this.spnMin.value = this.tab.getSetting("CheckInterval", 1); this.chkDownload.setCheckState((this.tab.getSetting("Download", "true") == "true")?Qt.Checked:Qt.Unchecked); @@ -53,8 +56,11 @@ var thandy = { this.bootstrapUpdateParams = this.tab.getSetting("BootstrapUpdateParams", "").toString().split(","); this.vidaliaBundle = this.tab.getSetting("VidaliaBundle", "Vidalia Bundle"); this.bootstrapBundle = this.tab.getSetting("BootstrapBundle", "Bootstrap"); + this.torBundle = this.tab.getSetting("TorBundle", "Tor"); + this.firefoxBundle = this.tab.getSetting("FirefoxBundle", "Firefox"); this.thpDbRoot = this.tab.getSetting("ThpDbRoot", ""); this.thpInstallRoot = this.tab.getSetting("ThpInstallRoot", ""); + this.restartCmd = this.tab.getSetting("RestartCmd", ""); }, save: function() { @@ -93,7 +99,36 @@ var thandy = { vdebug("Thandy@closeAndUpdate"); var params = ["--datadir", this.dataDir]; if(this.ready_bundles.indexOf(this.vidaliaBundle) != -1) - params = params.concat(["--wait", "5"]); + params = params.concat(["--wait", "5", "--restartcmd", "\""+this.restartCmd.replace("$vidalia_dir",QCoreApplication.applicationDirPath())+"\""]); + + // If there's a tbb, then we need to check for firefox + var running_apps = ""; + var firefox = false; + var tor = false; + if(typeof(tbb) == "object") { + if((tbb.browserProcess.state() != QProcess.NotRunning) && + (this.ready_bundles.indexOf(this.firefoxBundle) != -1)) { + firefox = true; + running_apps = "Firefox"; + } + } + + if(torControl.isRunning() && (this.ready_bundles.indexOf(this.torBundle) != -1)) { + tor = true; + running_apps = running_apps + ", Tor"; + } + + if(this.running_apps.length > 0) { + var ret = QMessageBox.question(0, "Applications are still running", + "The following applications are still running and have to update: \n" + running_apps + "\nThey need to be stopped. Do you want to proceed?", + QMessageBox.StandardButtons(QMessageBox.Yes, QMessageBox.No)); + if(ret == QMessageBox.Yes) { + if(firefox) + tbb.browserProcess.terminate(); + if(tor) + torControl.stop(); + } + } if(this.ready_bundles.indexOf(this.bootstrapBundle) != -1) { this.ready_bundles.splice(this.ready_bundles.indexOf(this.bootstrapBundle), 1);

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 06 Jan '12

06 Jan '12

commit 34a5ee51e4908e764d45644d08b1377b3931fc3a Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 6 16:45:04 2012 +0000 Update translations for tsum --- tr/tsum.po | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/tr/tsum.po b/tr/tsum.po index ac3b04d..2a99e92 100644 --- a/tr/tsum.po +++ b/tr/tsum.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: 2011-11-05 17:16+0000\n" -"PO-Revision-Date: 2012-01-06 09:12+0000\n" +"PO-Revision-Date: 2012-01-06 16:36+0000\n" "Last-Translator: canacar <canacar(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -252,6 +252,8 @@ msgid "" "### How to verify that you have the right version\n" "Before running the Tor Browser Bundle, you should make sure that you have the right version." msgstr "" +"### Tor sürümünü kontrol etmek\n" +"Tor Tarayıcı Paketini çalıştırmadan önce doğru sürümü kullandığınızdan emin olun." #. type: Plain text #: en/tsum.text:102 @@ -380,6 +382,10 @@ msgid "" "about where you downloaded the package from, how you verified the signature," " and the output from GnuPG in an email to help(a)rt.torproject.org." msgstr "" +"Çıktıda *\"Good signature\"* yazmalıdır. Doğrulanamayan, kötü bir imza dosya" +" ile oynandığı anlamına gelir. Eğer kötü bir imzaya rastlarsanız, paketi " +"nereden indirdiğinizi, imzayı nasıl kontrol ettiğinizi ve GnuPG komutunun " +"çıktısını içeren bir e-postayı help(a)rt.torproject.org adresine gönderin." #. type: Plain text #: en/tsum.text:147

1 0

[tor/master] Change to use SSL_state_string_long() instead of homebrew ssl_state_to_string() function.
by nickm＠torproject.org 06 Jan '12

06 Jan '12

commit d7eaa4b396c559871ef06a704304afcbc2ecebfb Author: Emile Snyder <emile.snyder(a)gmail.com> Date: Fri Jan 6 05:31:34 2012 -0800 Change to use SSL_state_string_long() instead of homebrew ssl_state_to_string() function. --- src/common/Makefile.am | 1 - src/common/tortls.c | 36 +--- src/common/tortls_states.h | 414 -------------------------------------------- 3 files changed, 9 insertions(+), 442 deletions(-) diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 2920e73..04c4115 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -51,7 +51,6 @@ noinst_HEADERS = \ torint.h \ torlog.h \ tortls.h \ - tortls_states.h \ util.h common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS) diff --git a/src/common/tortls.c b/src/common/tortls.c index b7cd835..81de5c1 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -237,22 +237,6 @@ static int tls_library_is_initialized = 0; #define _TOR_TLS_SYSCALL (_MIN_TOR_TLS_ERROR_VAL - 2) #define _TOR_TLS_ZERORETURN (_MIN_TOR_TLS_ERROR_VAL - 1) -#include "tortls_states.h" - -/** Return the symbolic name of an OpenSSL state. */ -static const char * -ssl_state_to_string(int ssl_state) -{ - static char buf[40]; - int i; - for (i = 0; state_map[i].name; ++i) { - if (state_map[i].state == ssl_state) - return state_map[i].name; - } - tor_snprintf(buf, sizeof(buf), "Unknown state %d", ssl_state); - return buf; -} - /** Write a description of the current state of tls into the * sz-byte buffer at buf. */ void @@ -266,7 +250,7 @@ tor_tls_get_state_description(tor_tls_t *tls, char *buf, size_t sz) return; } - ssl_state = ssl_state_to_string(tls->ssl->state); + ssl_state = SSL_state_string_long(tls->ssl); switch (tls->state) { #define CASE(st) case TOR_TLS_ST_##st: tortls_state = " in "#st ; break CASE(HANDSHAKE); @@ -293,10 +277,8 @@ tor_tls_log_one_error(tor_tls_t *tls, unsigned long err, { const char *state = NULL, *addr; const char *msg, *lib, *func; - int st; - st = (tls && tls->ssl) ? tls->ssl->state : -1; - state = (st>=0)?ssl_state_to_string(st):"---"; + state = (tls && tls->ssl)?SSL_state_string_long(tls->ssl):"---"; addr = tls ? tls->address : NULL; @@ -433,14 +415,14 @@ tor_tls_get_error(tor_tls_t *tls, int r, int extra, return _TOR_TLS_SYSCALL; if (r == 0) { log(severity, LD_NET, "TLS error: unexpected close while %s (%s)", - doing, ssl_state_to_string(tls->ssl->state)); + doing, SSL_state_string_long(tls->ssl)); tor_error = TOR_TLS_ERROR_IO; } else { int e = tor_socket_errno(tls->socket); log(severity, LD_NET, "TLS error: <syscall error while %s> (errno=%d: %s; state=%s)", doing, e, tor_socket_strerror(e), - ssl_state_to_string(tls->ssl->state)); + SSL_state_string_long(tls->ssl)); tor_error = tor_errno_to_tls_error(e); } tls_log_errors(tls, severity, domain, doing); @@ -449,7 +431,7 @@ tor_tls_get_error(tor_tls_t *tls, int r, int extra, if (extra&CATCH_ZERO) return _TOR_TLS_ZERORETURN; log(severity, LD_NET, "TLS connection closed while %s in state %s", - doing, ssl_state_to_string(tls->ssl->state)); + doing, SSL_state_string_long(tls->ssl)); tls_log_errors(tls, severity, domain, doing); return TOR_TLS_CLOSE; default: @@ -1350,7 +1332,7 @@ static void tor_tls_debug_state_callback(const SSL *ssl, int type, int val) { log_debug(LD_HANDSHAKE, "SSL %p is now in state %s [type=%d,val=%d].", - ssl, ssl_state_to_string(ssl->state), type, val); + ssl, SSL_state_string_long(ssl), type, val); } /** Invoked when we're accepting a connection on ssl, and the connection @@ -1755,16 +1737,16 @@ tor_tls_handshake(tor_tls_t *tls) oldstate = tls->ssl->state; if (tls->isServer) { log_debug(LD_HANDSHAKE, "About to call SSL_accept on %p (%s)", tls, - ssl_state_to_string(tls->ssl->state)); + SSL_state_string_long(tls->ssl)); r = SSL_accept(tls->ssl); } else { log_debug(LD_HANDSHAKE, "About to call SSL_connect on %p (%s)", tls, - ssl_state_to_string(tls->ssl->state)); + SSL_state_string_long(tls->ssl)); r = SSL_connect(tls->ssl); } if (oldstate != tls->ssl->state) log_debug(LD_HANDSHAKE, "After call, %p was in state %s", - tls, ssl_state_to_string(tls->ssl->state)); + tls, SSL_state_string_long(tls->ssl)); /* We need to call this here and not earlier, since OpenSSL has a penchant * for clearing its flags when you say accept or connect. */ tor_tls_unblock_renegotiation(tls); diff --git a/src/common/tortls_states.h b/src/common/tortls_states.h deleted file mode 100644 index dcff247..0000000 --- a/src/common/tortls_states.h +++ /dev/null @@ -1,414 +0,0 @@ -/* Copyright (c) 2003, Roger Dingledine - * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. - * Copyright (c) 2007-2011, The Tor Project, Inc. */ -/* See LICENSE for licensing information */ - -/* Helper file: included only in tortls.c */ - -#ifndef _TORTLS_STATES_H -#define _TORTLS_STATES_H - -/* The main body of this file was mechanically generated with this - perl script: - - my %keys = (); - for $fn (@ARGV) { - open(F, $fn); - while (<F>) { - next unless /^#define ((?:SSL|DTLS)\w*_ST_\w*)/; - $keys{$1} = 1; - } - close(F); - } - for $k (sort keys %keys) { - print "#ifdef $k\n S($k),\n#endif\n" - } -*/ - -/** Mapping from allowed value of SSL.state to the name of C macro for that - * state. Used for debugging an openssl connection. */ -static const struct { int state; const char *name; } state_map[] = { -#define S(state) { state, #state } -#ifdef DTLS1_ST_CR_HELLO_VERIFY_REQUEST_A - S(DTLS1_ST_CR_HELLO_VERIFY_REQUEST_A), -#endif -#ifdef DTLS1_ST_CR_HELLO_VERIFY_REQUEST_B - S(DTLS1_ST_CR_HELLO_VERIFY_REQUEST_B), -#endif -#ifdef DTLS1_ST_SW_HELLO_VERIFY_REQUEST_A - S(DTLS1_ST_SW_HELLO_VERIFY_REQUEST_A), -#endif -#ifdef DTLS1_ST_SW_HELLO_VERIFY_REQUEST_B - S(DTLS1_ST_SW_HELLO_VERIFY_REQUEST_B), -#endif -#ifdef SSL23_ST_CR_SRVR_HELLO_A - S(SSL23_ST_CR_SRVR_HELLO_A), -#endif -#ifdef SSL23_ST_CR_SRVR_HELLO_B - S(SSL23_ST_CR_SRVR_HELLO_B), -#endif -#ifdef SSL23_ST_CW_CLNT_HELLO_A - S(SSL23_ST_CW_CLNT_HELLO_A), -#endif -#ifdef SSL23_ST_CW_CLNT_HELLO_B - S(SSL23_ST_CW_CLNT_HELLO_B), -#endif -#ifdef SSL23_ST_SR_CLNT_HELLO_A - S(SSL23_ST_SR_CLNT_HELLO_A), -#endif -#ifdef SSL23_ST_SR_CLNT_HELLO_B - S(SSL23_ST_SR_CLNT_HELLO_B), -#endif -#ifdef SSL2_ST_CLIENT_START_ENCRYPTION - S(SSL2_ST_CLIENT_START_ENCRYPTION), -#endif -#ifdef SSL2_ST_GET_CLIENT_FINISHED_A - S(SSL2_ST_GET_CLIENT_FINISHED_A), -#endif -#ifdef SSL2_ST_GET_CLIENT_FINISHED_B - S(SSL2_ST_GET_CLIENT_FINISHED_B), -#endif -#ifdef SSL2_ST_GET_CLIENT_HELLO_A - S(SSL2_ST_GET_CLIENT_HELLO_A), -#endif -#ifdef SSL2_ST_GET_CLIENT_HELLO_B - S(SSL2_ST_GET_CLIENT_HELLO_B), -#endif -#ifdef SSL2_ST_GET_CLIENT_HELLO_C - S(SSL2_ST_GET_CLIENT_HELLO_C), -#endif -#ifdef SSL2_ST_GET_CLIENT_MASTER_KEY_A - S(SSL2_ST_GET_CLIENT_MASTER_KEY_A), -#endif -#ifdef SSL2_ST_GET_CLIENT_MASTER_KEY_B - S(SSL2_ST_GET_CLIENT_MASTER_KEY_B), -#endif -#ifdef SSL2_ST_GET_SERVER_FINISHED_A - S(SSL2_ST_GET_SERVER_FINISHED_A), -#endif -#ifdef SSL2_ST_GET_SERVER_FINISHED_B - S(SSL2_ST_GET_SERVER_FINISHED_B), -#endif -#ifdef SSL2_ST_GET_SERVER_HELLO_A - S(SSL2_ST_GET_SERVER_HELLO_A), -#endif -#ifdef SSL2_ST_GET_SERVER_HELLO_B - S(SSL2_ST_GET_SERVER_HELLO_B), -#endif -#ifdef SSL2_ST_GET_SERVER_VERIFY_A - S(SSL2_ST_GET_SERVER_VERIFY_A), -#endif -#ifdef SSL2_ST_GET_SERVER_VERIFY_B - S(SSL2_ST_GET_SERVER_VERIFY_B), -#endif -#ifdef SSL2_ST_SEND_CLIENT_CERTIFICATE_A - S(SSL2_ST_SEND_CLIENT_CERTIFICATE_A), -#endif -#ifdef SSL2_ST_SEND_CLIENT_CERTIFICATE_B - S(SSL2_ST_SEND_CLIENT_CERTIFICATE_B), -#endif -#ifdef SSL2_ST_SEND_CLIENT_CERTIFICATE_C - S(SSL2_ST_SEND_CLIENT_CERTIFICATE_C), -#endif -#ifdef SSL2_ST_SEND_CLIENT_CERTIFICATE_D - S(SSL2_ST_SEND_CLIENT_CERTIFICATE_D), -#endif -#ifdef SSL2_ST_SEND_CLIENT_FINISHED_A - S(SSL2_ST_SEND_CLIENT_FINISHED_A), -#endif -#ifdef SSL2_ST_SEND_CLIENT_FINISHED_B - S(SSL2_ST_SEND_CLIENT_FINISHED_B), -#endif -#ifdef SSL2_ST_SEND_CLIENT_HELLO_A - S(SSL2_ST_SEND_CLIENT_HELLO_A), -#endif -#ifdef SSL2_ST_SEND_CLIENT_HELLO_B - S(SSL2_ST_SEND_CLIENT_HELLO_B), -#endif -#ifdef SSL2_ST_SEND_CLIENT_MASTER_KEY_A - S(SSL2_ST_SEND_CLIENT_MASTER_KEY_A), -#endif -#ifdef SSL2_ST_SEND_CLIENT_MASTER_KEY_B - S(SSL2_ST_SEND_CLIENT_MASTER_KEY_B), -#endif -#ifdef SSL2_ST_SEND_REQUEST_CERTIFICATE_A - S(SSL2_ST_SEND_REQUEST_CERTIFICATE_A), -#endif -#ifdef SSL2_ST_SEND_REQUEST_CERTIFICATE_B - S(SSL2_ST_SEND_REQUEST_CERTIFICATE_B), -#endif -#ifdef SSL2_ST_SEND_REQUEST_CERTIFICATE_C - S(SSL2_ST_SEND_REQUEST_CERTIFICATE_C), -#endif -#ifdef SSL2_ST_SEND_REQUEST_CERTIFICATE_D - S(SSL2_ST_SEND_REQUEST_CERTIFICATE_D), -#endif -#ifdef SSL2_ST_SEND_SERVER_FINISHED_A - S(SSL2_ST_SEND_SERVER_FINISHED_A), -#endif -#ifdef SSL2_ST_SEND_SERVER_FINISHED_B - S(SSL2_ST_SEND_SERVER_FINISHED_B), -#endif -#ifdef SSL2_ST_SEND_SERVER_HELLO_A - S(SSL2_ST_SEND_SERVER_HELLO_A), -#endif -#ifdef SSL2_ST_SEND_SERVER_HELLO_B - S(SSL2_ST_SEND_SERVER_HELLO_B), -#endif -#ifdef SSL2_ST_SEND_SERVER_VERIFY_A - S(SSL2_ST_SEND_SERVER_VERIFY_A), -#endif -#ifdef SSL2_ST_SEND_SERVER_VERIFY_B - S(SSL2_ST_SEND_SERVER_VERIFY_B), -#endif -#ifdef SSL2_ST_SEND_SERVER_VERIFY_C - S(SSL2_ST_SEND_SERVER_VERIFY_C), -#endif -#ifdef SSL2_ST_SERVER_START_ENCRYPTION - S(SSL2_ST_SERVER_START_ENCRYPTION), -#endif -#ifdef SSL2_ST_X509_GET_CLIENT_CERTIFICATE - S(SSL2_ST_X509_GET_CLIENT_CERTIFICATE), -#endif -#ifdef SSL2_ST_X509_GET_SERVER_CERTIFICATE - S(SSL2_ST_X509_GET_SERVER_CERTIFICATE), -#endif -#ifdef SSL3_ST_CR_CERT_A - S(SSL3_ST_CR_CERT_A), -#endif -#ifdef SSL3_ST_CR_CERT_B - S(SSL3_ST_CR_CERT_B), -#endif -#ifdef SSL3_ST_CR_CERT_REQ_A - S(SSL3_ST_CR_CERT_REQ_A), -#endif -#ifdef SSL3_ST_CR_CERT_REQ_B - S(SSL3_ST_CR_CERT_REQ_B), -#endif -#ifdef SSL3_ST_CR_CERT_STATUS_A - S(SSL3_ST_CR_CERT_STATUS_A), -#endif -#ifdef SSL3_ST_CR_CERT_STATUS_B - S(SSL3_ST_CR_CERT_STATUS_B), -#endif -#ifdef SSL3_ST_CR_CHANGE_A - S(SSL3_ST_CR_CHANGE_A), -#endif -#ifdef SSL3_ST_CR_CHANGE_B - S(SSL3_ST_CR_CHANGE_B), -#endif -#ifdef SSL3_ST_CR_FINISHED_A - S(SSL3_ST_CR_FINISHED_A), -#endif -#ifdef SSL3_ST_CR_FINISHED_B - S(SSL3_ST_CR_FINISHED_B), -#endif -#ifdef SSL3_ST_CR_KEY_EXCH_A - S(SSL3_ST_CR_KEY_EXCH_A), -#endif -#ifdef SSL3_ST_CR_KEY_EXCH_B - S(SSL3_ST_CR_KEY_EXCH_B), -#endif -#ifdef SSL3_ST_CR_SESSION_TICKET_A - S(SSL3_ST_CR_SESSION_TICKET_A), -#endif -#ifdef SSL3_ST_CR_SESSION_TICKET_B - S(SSL3_ST_CR_SESSION_TICKET_B), -#endif -#ifdef SSL3_ST_CR_SRVR_DONE_A - S(SSL3_ST_CR_SRVR_DONE_A), -#endif -#ifdef SSL3_ST_CR_SRVR_DONE_B - S(SSL3_ST_CR_SRVR_DONE_B), -#endif -#ifdef SSL3_ST_CR_SRVR_HELLO_A - S(SSL3_ST_CR_SRVR_HELLO_A), -#endif -#ifdef SSL3_ST_CR_SRVR_HELLO_B - S(SSL3_ST_CR_SRVR_HELLO_B), -#endif -#ifdef SSL3_ST_CW_CERT_A - S(SSL3_ST_CW_CERT_A), -#endif -#ifdef SSL3_ST_CW_CERT_B - S(SSL3_ST_CW_CERT_B), -#endif -#ifdef SSL3_ST_CW_CERT_C - S(SSL3_ST_CW_CERT_C), -#endif -#ifdef SSL3_ST_CW_CERT_D - S(SSL3_ST_CW_CERT_D), -#endif -#ifdef SSL3_ST_CW_CERT_VRFY_A - S(SSL3_ST_CW_CERT_VRFY_A), -#endif -#ifdef SSL3_ST_CW_CERT_VRFY_B - S(SSL3_ST_CW_CERT_VRFY_B), -#endif -#ifdef SSL3_ST_CW_CHANGE_A - S(SSL3_ST_CW_CHANGE_A), -#endif -#ifdef SSL3_ST_CW_CHANGE_B - S(SSL3_ST_CW_CHANGE_B), -#endif -#ifdef SSL3_ST_CW_CLNT_HELLO_A - S(SSL3_ST_CW_CLNT_HELLO_A), -#endif -#ifdef SSL3_ST_CW_CLNT_HELLO_B - S(SSL3_ST_CW_CLNT_HELLO_B), -#endif -#ifdef SSL3_ST_CW_FINISHED_A - S(SSL3_ST_CW_FINISHED_A), -#endif -#ifdef SSL3_ST_CW_FINISHED_B - S(SSL3_ST_CW_FINISHED_B), -#endif -#ifdef SSL3_ST_CW_FLUSH - S(SSL3_ST_CW_FLUSH), -#endif -#ifdef SSL3_ST_CW_KEY_EXCH_A - S(SSL3_ST_CW_KEY_EXCH_A), -#endif -#ifdef SSL3_ST_CW_KEY_EXCH_B - S(SSL3_ST_CW_KEY_EXCH_B), -#endif -#ifdef SSL3_ST_SR_CERT_A - S(SSL3_ST_SR_CERT_A), -#endif -#ifdef SSL3_ST_SR_CERT_B - S(SSL3_ST_SR_CERT_B), -#endif -#ifdef SSL3_ST_SR_CERT_VRFY_A - S(SSL3_ST_SR_CERT_VRFY_A), -#endif -#ifdef SSL3_ST_SR_CERT_VRFY_B - S(SSL3_ST_SR_CERT_VRFY_B), -#endif -#ifdef SSL3_ST_SR_CHANGE_A - S(SSL3_ST_SR_CHANGE_A), -#endif -#ifdef SSL3_ST_SR_CHANGE_B - S(SSL3_ST_SR_CHANGE_B), -#endif -#ifdef SSL3_ST_SR_CLNT_HELLO_A - S(SSL3_ST_SR_CLNT_HELLO_A), -#endif -#ifdef SSL3_ST_SR_CLNT_HELLO_B - S(SSL3_ST_SR_CLNT_HELLO_B), -#endif -#ifdef SSL3_ST_SR_CLNT_HELLO_C - S(SSL3_ST_SR_CLNT_HELLO_C), -#endif -#ifdef SSL3_ST_SR_FINISHED_A - S(SSL3_ST_SR_FINISHED_A), -#endif -#ifdef SSL3_ST_SR_FINISHED_B - S(SSL3_ST_SR_FINISHED_B), -#endif -#ifdef SSL3_ST_SR_KEY_EXCH_A - S(SSL3_ST_SR_KEY_EXCH_A), -#endif -#ifdef SSL3_ST_SR_KEY_EXCH_B - S(SSL3_ST_SR_KEY_EXCH_B), -#endif -#ifdef SSL3_ST_SW_CERT_A - S(SSL3_ST_SW_CERT_A), -#endif -#ifdef SSL3_ST_SW_CERT_B - S(SSL3_ST_SW_CERT_B), -#endif -#ifdef SSL3_ST_SW_CERT_REQ_A - S(SSL3_ST_SW_CERT_REQ_A), -#endif -#ifdef SSL3_ST_SW_CERT_REQ_B - S(SSL3_ST_SW_CERT_REQ_B), -#endif -#ifdef SSL3_ST_SW_CERT_STATUS_A - S(SSL3_ST_SW_CERT_STATUS_A), -#endif -#ifdef SSL3_ST_SW_CERT_STATUS_B - S(SSL3_ST_SW_CERT_STATUS_B), -#endif -#ifdef SSL3_ST_SW_CHANGE_A - S(SSL3_ST_SW_CHANGE_A), -#endif -#ifdef SSL3_ST_SW_CHANGE_B - S(SSL3_ST_SW_CHANGE_B), -#endif -#ifdef SSL3_ST_SW_FINISHED_A - S(SSL3_ST_SW_FINISHED_A), -#endif -#ifdef SSL3_ST_SW_FINISHED_B - S(SSL3_ST_SW_FINISHED_B), -#endif -#ifdef SSL3_ST_SW_FLUSH - S(SSL3_ST_SW_FLUSH), -#endif -#ifdef SSL3_ST_SW_HELLO_REQ_A - S(SSL3_ST_SW_HELLO_REQ_A), -#endif -#ifdef SSL3_ST_SW_HELLO_REQ_B - S(SSL3_ST_SW_HELLO_REQ_B), -#endif -#ifdef SSL3_ST_SW_HELLO_REQ_C - S(SSL3_ST_SW_HELLO_REQ_C), -#endif -#ifdef SSL3_ST_SW_KEY_EXCH_A - S(SSL3_ST_SW_KEY_EXCH_A), -#endif -#ifdef SSL3_ST_SW_KEY_EXCH_B - S(SSL3_ST_SW_KEY_EXCH_B), -#endif -#ifdef SSL3_ST_SW_SESSION_TICKET_A - S(SSL3_ST_SW_SESSION_TICKET_A), -#endif -#ifdef SSL3_ST_SW_SESSION_TICKET_B - S(SSL3_ST_SW_SESSION_TICKET_B), -#endif -#ifdef SSL3_ST_SW_SRVR_DONE_A - S(SSL3_ST_SW_SRVR_DONE_A), -#endif -#ifdef SSL3_ST_SW_SRVR_DONE_B - S(SSL3_ST_SW_SRVR_DONE_B), -#endif -#ifdef SSL3_ST_SW_SRVR_HELLO_A - S(SSL3_ST_SW_SRVR_HELLO_A), -#endif -#ifdef SSL3_ST_SW_SRVR_HELLO_B - S(SSL3_ST_SW_SRVR_HELLO_B), -#endif -#ifdef SSL_ST_ACCEPT - S(SSL_ST_ACCEPT), -#endif -#ifdef SSL_ST_BEFORE - S(SSL_ST_BEFORE), -#endif -#ifdef SSL_ST_CONNECT - S(SSL_ST_CONNECT), -#endif -#ifdef SSL_ST_INIT - S(SSL_ST_INIT), -#endif -#ifdef SSL_ST_MASK - S(SSL_ST_MASK), -#endif -#ifdef SSL_ST_OK - S(SSL_ST_OK), -#endif -#ifdef SSL_ST_READ_BODY - S(SSL_ST_READ_BODY), -#endif -#ifdef SSL_ST_READ_DONE - S(SSL_ST_READ_DONE), -#endif -#ifdef SSL_ST_READ_HEADER - S(SSL_ST_READ_HEADER), -#endif -#ifdef SSL_ST_RENEGOTIATE - S(SSL_ST_RENEGOTIATE), -#endif - { 0, NULL } -}; - -#endif -

1 0

[tor/master] Add a changes file for bug4563
by nickm＠torproject.org 06 Jan '12

06 Jan '12

commit 37c90319e2ac0ecb71c9986ff55d07fe3da86ee6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 6 11:42:00 2012 -0500 Add a changes file for bug4563 --- changes/bug4653 | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/changes/bug4653 b/changes/bug4653 new file mode 100644 index 0000000..3c0596f --- /dev/null +++ b/changes/bug4653 @@ -0,0 +1,4 @@ + o Code simplification and refactoring: + - Use OpenSSL's built-in SSL_state_string_long() instead of our + own homebrewed ssl_state_to_string() replacement. Patch from + Emile Snyder. Fixes bug 4653.

1 0

[vidalia/master] Remove call to validateBridge
by chiiph＠torproject.org 06 Jan '12

06 Jan '12

commit 4f0ebe5104121f3da84fc8730a9df2a0f3285365 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Jan 6 12:47:02 2012 -0300 Remove call to validateBridge --- src/vidalia/config/NetworkPage.cpp | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/src/vidalia/config/NetworkPage.cpp b/src/vidalia/config/NetworkPage.cpp index c51d1b6..b40cbdd 100644 --- a/src/vidalia/config/NetworkPage.cpp +++ b/src/vidalia/config/NetworkPage.cpp @@ -387,9 +387,6 @@ NetworkPage::bridgeRequestFinished(const QStringList &bridges) QString normalized; foreach (QString bridge, bridges) { - if (! validateBridge(bridge, &normalized)) - continue; - QString address = normalized.split(" ").at(0); if (ui.listBridges->findItems(address, Qt::MatchContains).isEmpty()) { ui.listBridges->addItem(normalized);

1 0