tor-commits January 2012

tor-commits@lists.torproject.org

14 participants
852 discussions

[tor/master] clean up a comment that confused arturo
by arma＠torproject.org 07 Jan '12

07 Jan '12

commit 19c372daf0aa66219b662a4caeec09bb7bdfc029 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Jan 7 07:41:46 2012 -0500 clean up a comment that confused arturo --- src/or/rendservice.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index bbc9c91..7dcc68d 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -2063,8 +2063,8 @@ upload_service_descriptor(rend_service_t *service) service->desc_is_dirty = 0; } -/** Return the number of INTRODUCE2 cells an intro point has - * received. */ +/** Return the number of INTRODUCE2 cells this hidden service has received + * from this intro point. */ static int intro_point_accepted_intro_count(rend_intro_point_t *intro) {

1 0

[tor/master] fold in some new changelog stanzas
by arma＠torproject.org 07 Jan '12

07 Jan '12

commit 36721e940d77c8331ce13ad96ed3a6c80b13958b Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Jan 7 07:42:07 2012 -0500 fold in some new changelog stanzas --- ChangeLog | 150 +++++++++++++++++++++++++++++++++++++++++- changes/bug1101 | 3 - changes/bug1240 | 8 -- changes/bug1297b | 20 ------ changes/bug1827 | 9 --- changes/bug2571 | 3 - changes/bug3825b | 7 -- changes/bug4531_take2 | 5 -- changes/bug4653 | 4 - changes/bug4697 | 5 -- changes/bug4733 | 6 -- changes/bug4759 | 14 ---- changes/bug4779 | 4 - changes/bug4786 | 9 --- changes/bug4788 | 6 -- changes/bug4796 | 7 -- changes/bug4803 | 4 - changes/bug4822 | 13 ---- changes/clang_30_options | 5 -- changes/feature2411 | 12 ---- changes/geoip-january2012 | 3 - changes/portability_01_haiku | 14 ---- changes/prop110 | 7 -- changes/timersub_bug | 7 -- 24 files changed, 148 insertions(+), 177 deletions(-) diff --git a/ChangeLog b/ChangeLog index 667a953..9d20a8a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,150 @@ -Changes in version 0.2.3.11-alpha - 201?-??-?? +Changes in version 0.2.3.11-alpha - 2012-01-0? + o Major features: + - Now that Tor 0.2.0.x is completely deprecated, enable the final + part of "Proposal 110: Avoiding infinite length circuits" by + refusing all circuit-extend requests that do not use a relay_early + cell. This change helps Tor resist a class of denial-of-service + attacks by limiting the maximum circuit length. + - Adjust the number of introduction points that a hidden service + will try to maintain based on how long its introduction points + remain in use and how many introductions they handle. Fixes + part of bug 3825. + - Try to use system facilities for enumerating local interface + addresses, before falling back to our old approach (which was + binding a UDP socket, and calling getsockname() on it). That + approach was scaring OS X users whose draconian firewall + software warned about binding to UDP sockets, regardless of + whether packets were sent. Now we try to use getifaddrs(), + SIOCGIFCONF, or GetAdaptersAddresses(), depending on what the + system supports. Resolves ticket 1827. + + 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 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 disable SSLv3 entirely + to make sure that the bug can't happen. + + o Major bugfixes: + - 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 and 0.2.3.1-alpha; fixes bug 4778. + - Do not use OpenSSL 1.0.0's counter mode: it has a critical bug + that was fixed in OpenSSL 1.0.0a. Fixes bug 4779; bugfix on + Tor 0.2.3.9-alpha. Found by Pascal. + + o Minor features: + - Directory servers now reject versions of Tor older than 0.2.1.30, + and Tor versions between 0.2.2.1-alpha and 0.2.2.20-alpha + (inclusive). These versions accounted for only a small fraction of + the Tor network, and have numerous known security issues. Resolves + issue 4788. + - Use absolute path names when reporting the torrc filename in the + control protocol, so a controller can more easily find the torrc + file. Resolves bug 1101. + - If EntryNodes are given, but UseEntryGuards is set to 0, warn that + EntryNodes will have no effect. Resolves issue 2571. + - Extend the control protocol to report flags that control a circuit's + path selection in CIRC events and in replies to 'GETINFO + circuit-status'. Implements part of ticket 2411. + - Extend the control protocol to report the hidden service address + and current state of a hidden-service-related circuit in CIRC + events and in replies to 'GETINFO circuit-status'. Implements part + of ticket 2411. + - Update to the January 3 2012 Maxmind GeoLite Country database. + + o Minor bugfixes (hidden services): + - Don't close hidden service client circuits which have almost + finished connecting to their destination when they reach + the normal circuit-build timeout. Previously, we would close + introduction circuits which are waiting for an acknowledgement + from the introduction point, and rendezvous circuits which have + been specified in an INTRODUCE1 cell sent to a hidden service, + after the normal CBT. Now, we mark them as 'timed out', and launch + another rendezvous attempt in parallel. This behavior change can + be disabled using the new CloseHSClientCircuitsImmediatelyOnTimeout + option. Fixes part of bug 1297. + - Don't close hidden-service-side rendezvous circuits when they + reach the normal circuit-build timeout. This behaviour change can + be disabled using the new + CloseHSServiceRendCircuitsImmediatelyOnTimeout option. Fixes the + remaining part of bug 1297. + - Make sure we never mark the wrong rendezvous circuit as having + had its introduction cell acknowleged by the introduction-point + relay. Previously, when we received an INTRODUCE_ACK cell on a + client-side hidden-service introduction circuit, we might have + marked a rendezvous circuit other than the one we specified in + the INTRODUCE1 cell as INTRO_ACKED, which would have produced + a warning message and interfered with the hidden service + connection-establishment process. Bugfix on 0.2.3.3-alpha, when we + added the stream-isolation feature which might cause Tor to open + multiple rendezvous circuits for the same hidden service. Fixes + bug 4759. + - Don't trigger an assertion failure when we mark a new client-side + hidden-service introduction circuit for close during the process + of creating it. Bugfix on 0.2.3.6-alpha. Fixes bug 4796; reported + by murb. + + o Minor bugfixes (other): + - Fix null-pointer access that could occur if TLS allocation failed. + Fixes bug 4531; bugfix on 0.2.0.20-rc. Found by "troll_un". This was + erroneously listed as fixed in 0.2.3.9-alpha, but the fix had + accidentally been reverted. + - Fix an assertion failure when, while running with bufferevents, a + connection finishes connecting after it is marked for close, but + before it is closed. Fixes bug 4697; bugfix on 0.2.3.1-alpha. + - 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". + - test_util_spawn_background_ok() hardcoded the expected value + for ENOENT to 2. This isn't portable as error numbers are + platform specific, and particularly the hurd has ENOENT at + 0x40000002. Construct expected string at runtime, using the correct + value for ENOENT. Fixes bug 4733; bugfix on 0.2.3.1-alpha. + - Correctly spell "connect" in a log message on failure to create a + controlsocket. Fixes bug 4803; bugfix on 0.2.2.26-beta and + 0.2.3.2-alpha. + - During configure, search for library containing cos function as + libm lives in libcore on some platforms (BeOS/Haiku). + Linking against libm was hard-coded before. Bugfix on + 0.2.2.2-alpha; fixes the first part of bug 4727. Patch and + analysis by Martin Hebnes Pedersen. + - Preprocessor directives should not be put inside the arguments + of a macro. This would break compilation with GCC releases prior + to version 3.3. We would never recommend such an old GCC + version, but it is apparently required for binary compatibility + on some platforms (namely, certain builds of Haiku). Bugfix on + 0.2.3.3-alpha; fixes the other part of bug 4727. Patch and + analysis by Martin Hebnes Pedersen. + + - Feature removal: + - When sending or relaying a RELAY_EARLY cell, we used to convert + it to a RELAY cell if the connection was using the v1 link + protocol. This was a workaround for older versions of Tor, which + 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, + remove this workaround. Addresses bug 4786. + + o Code simplifications and refactoring: + - During configure, detect when we're building with clang version + 3.0 or lower and disable the -Wnormalized=id and -Woverride-init + CFLAGS. clang doesn't support them yet. + - 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. Changes in version 0.2.3.10-alpha - 2011-12-16 @@ -786,7 +932,7 @@ Changes in version 0.2.1.31 - 2011-10-26 circuit EXTEND request. Now relays can protect clients from the CVE-2011-2768 issue even if the clients haven't upgraded yet. - Bridges now refuse CREATE or CREATE_FAST cells on OR connections - that they initiated. Relays could distinguish incoming bridge + that they initiated. Relays could distinguish incoming bridge connections from client connections, creating another avenue for enumerating bridges. Fixes CVE-2011-2769. Bugfix on 0.2.0.3-alpha. Found by "frosty_un". diff --git a/changes/bug1101 b/changes/bug1101 deleted file mode 100644 index 784ae08..0000000 --- a/changes/bug1101 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features: - - Use absolute path names when reporting the torrc filename, so - that a controller can more easily find it. Resolves bug 1101. diff --git a/changes/bug1240 b/changes/bug1240 deleted file mode 100644 index 6570664..0000000 --- a/changes/bug1240 +++ /dev/null @@ -1,8 +0,0 @@ - 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, - 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". diff --git a/changes/bug1297b b/changes/bug1297b deleted file mode 100644 index fb0d00c..0000000 --- a/changes/bug1297b +++ /dev/null @@ -1,20 +0,0 @@ - o Minor bugfixes: - - - Don't close hidden service client circuits which have almost - finished connecting to their destination when they reach the - normal circuit-build timeout. Previously, we would close - introduction circuits which are waiting for an acknowledgement - from the introduction-point relay and rendezvous circuits which - have been specified in an INTRODUCE1 cell sent to a hidden - service after the normal CBT; now, we mark them as 'timed out', - and launch another rendezvous attempt in parallel. This - behaviour change can be disabled using the new - CloseHSClientCircuitsImmediatelyOnTimeout option. Fixes part of - bug 1297. - - - Don't close hidden-service-side rendezvous circuits when they - reach the normal circuit-build timeout. Previously, we would - close them. This behaviour change can be disabled using the new - CloseHSServiceRendCircuitsImmediatelyOnTimeout option. Fixes - the remaining part of bug 1297. - diff --git a/changes/bug1827 b/changes/bug1827 deleted file mode 100644 index 0701876..0000000 --- a/changes/bug1827 +++ /dev/null @@ -1,9 +0,0 @@ - - Minor features: - - Try to use system facilities for enumerating local interface - addresses, before falling back to our old approach (which was - binding a UDP socket, and calling getsockname() on it). That - approach was confusing people whose draconian firewall software - didn't like binding to UDP sockets, regardless of whether - packets were sent. Now we try to use getifaddrs(), SIOCGIFCONF, - or GetAdaptersAddresses(), depending on what the system - supports. Resolves ticket #1827. diff --git a/changes/bug2571 b/changes/bug2571 deleted file mode 100644 index dfb4f3b..0000000 --- a/changes/bug2571 +++ /dev/null @@ -1,3 +0,0 @@ - - Minor features: - - If EntryNodes are given, but UseEntryGuards is set to 0, warn that - EntryNodes will have no effect. Resolves issue 2571. diff --git a/changes/bug3825b b/changes/bug3825b deleted file mode 100644 index 08c0c2d..0000000 --- a/changes/bug3825b +++ /dev/null @@ -1,7 +0,0 @@ - o Major features: - - - Adjust the number of introduction points that a hidden service - will try to maintain based on how long its introduction points - remain in use and how many introductions they handle. Fixes - part of bug 3825. - diff --git a/changes/bug4531_take2 b/changes/bug4531_take2 deleted file mode 100644 index fd4f5f0..0000000 --- a/changes/bug4531_take2 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Fix null-pointer access that could occur if TLS allocation failed. - Fixes bug 4531; bugfix on 0.2.0.20-rc. Found by "troll_un". This was - erroneously listed as fixed in 0.2.3.9-alpha, but the fix had - accidentally been reverted. diff --git a/changes/bug4653 b/changes/bug4653 deleted file mode 100644 index 3c0596f..0000000 --- a/changes/bug4653 +++ /dev/null @@ -1,4 +0,0 @@ - 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. diff --git a/changes/bug4697 b/changes/bug4697 deleted file mode 100644 index c3c940d..0000000 --- a/changes/bug4697 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Fix an assertion failure when, while running with bufferevents, a - connection finishes connecting after it is marked for close, but - before it is closed. Fix for bug 4697; Bugfix on 0.2.3.1-alpha. - diff --git a/changes/bug4733 b/changes/bug4733 deleted file mode 100644 index 672cfbc..0000000 --- a/changes/bug4733 +++ /dev/null @@ -1,6 +0,0 @@ - o Minor fix: - test_util_spawn_background_ok() hardcoded the expected value - for ENOENT to 2. This isn't portable as error numbers are - platform specific, and particularly the hurd has ENOENT at - 0x40000002. Construct expected string at runtime, using the - correct value for ENOENT (closes: #4733). Bugfix on 0.2.3.1-alpha. diff --git a/changes/bug4759 b/changes/bug4759 deleted file mode 100644 index 19138ab..0000000 --- a/changes/bug4759 +++ /dev/null @@ -1,14 +0,0 @@ - o Minor bugfixes: - - - Make sure we never mark the wrong rendezvous circuit as having - had its introduction cell acknowleged by the introduction-point - relay. Previously, when we received an INTRODUCE_ACK cell on a - client-side hidden-service introduction circuit, we might have - marked a rendezvous circuit other than the one we specified in - the INTRODUCE1 cell as INTRO_ACKED, which would have produced a - warning message and interfered with the hidden service - connection-establishment process. Bugfix on 0.2.3.3-alpha, when - the stream-isolation feature which might cause Tor to open - multiple rendezvous circuits for the same hidden service was - added. Fixes bug 4759. - diff --git a/changes/bug4779 b/changes/bug4779 deleted file mode 100644 index 4535a2b..0000000 --- a/changes/bug4779 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes: - - Do not use OpenSSL 1.0.0's counter mode: it has a critical bug - that was fixed in OpenSSL 1.0.0a. Fixes bug 4779; bugfix on - Tor 0.2.3.9-alpha. Found by Pascal. diff --git a/changes/bug4786 b/changes/bug4786 deleted file mode 100644 index 7c1c60f..0000000 --- a/changes/bug4786 +++ /dev/null @@ -1,9 +0,0 @@ - - Feature removal: - - When sending or relaying a RELAY_EARLY cell, we used to convert - it to a RELAY cell if the connection was using the v1 link - protocol. This was a workaround for older versions of Tor, which - 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. - diff --git a/changes/bug4788 b/changes/bug4788 deleted file mode 100644 index d65c001..0000000 --- a/changes/bug4788 +++ /dev/null @@ -1,6 +0,0 @@ - o Minor features (directory server): - - Directory servers now reject versions of Tor older than 0.2.1.30, - and Tor versions between 0.2.2.1-alpha and 0.2.2.20-alpha - (inclusive). These versions accounted for only a small fraction of - the Tor network, and have numerous known security issues. Resolves - issue #4788. diff --git a/changes/bug4796 b/changes/bug4796 deleted file mode 100644 index bcb795f..0000000 --- a/changes/bug4796 +++ /dev/null @@ -1,7 +0,0 @@ - o Minor bugfixes: - - - Don't exit with an assertion failure when we mark a new - client-side hidden-service introduction circuit for close during - the process of creating it. Bugfix on 0.2.3.6-alpha. Fixes bug - 4796; reported by murb. - diff --git a/changes/bug4803 b/changes/bug4803 deleted file mode 100644 index cd25266..0000000 --- a/changes/bug4803 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes: - - Correctly spell "connect" in a log message when creating a controlsocket - fails. Fixes bug 4803; bugfix on 0.2.2.26-beta/0.2.3.2-alpha. - diff --git a/changes/bug4822 b/changes/bug4822 deleted file mode 100644 index 73f43f0..0000000 --- a/changes/bug4822 +++ /dev/null @@ -1,13 +0,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 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 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. diff --git a/changes/clang_30_options b/changes/clang_30_options deleted file mode 100644 index e8e34c8..0000000 --- a/changes/clang_30_options +++ /dev/null @@ -1,5 +0,0 @@ - o Code simplifications and refactoring: - - During configure, detect when we're building with clang version 3.0 or - lower and disable the -Wnormalized=id and -Woverride-init CFLAGS. - clang doesn't support them yet. - diff --git a/changes/feature2411 b/changes/feature2411 deleted file mode 100644 index 633a5ce..0000000 --- a/changes/feature2411 +++ /dev/null @@ -1,12 +0,0 @@ - o Minor features: - - - Report flags that control a circuit's path selection to - controllers in CIRC events and in replies to 'GETINFO - circuit-status'. Implements part of ticket 2411. - - - Report the hidden service address and current state of a - hidden-service-related circuit to controllers in CIRC events and - in replies to 'GETINFO circuit-status'. Implements part of - ticket 2411. - - diff --git a/changes/geoip-january2012 b/changes/geoip-january2012 deleted file mode 100644 index 2f4180e..0000000 --- a/changes/geoip-january2012 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features: - - Update to the January 3 2012 Maxmind GeoLite Country database. - diff --git a/changes/portability_01_haiku b/changes/portability_01_haiku deleted file mode 100644 index 74887fe..0000000 --- a/changes/portability_01_haiku +++ /dev/null @@ -1,14 +0,0 @@ - o Minor buxfixes: - - During configure, search for library containing cos function as - libm lives in libcore on some platforms (BeOS/Haiku). - Linking against libm was hard-coded before. Bugfix on - 0.2.2.2-alpha, fixes the first part of bug 4727. Patch and - analysis by Martin Hebnes Pedersen. - - Preprocessor directives should not be put inside the arguments - of a macro. This would break compilation with GCC releases prior - to version 3.3. We would never recommend such an old GCC - version, but it is apparently required for binary compatibility - on some platforms (namely, certain builds of Haiku). Bugfix on - 0.2.3.3-alpha, fixes the other part of bug 4727. Patch and - analysis by Martin Hebnes Pedersen. - diff --git a/changes/prop110 b/changes/prop110 deleted file mode 100644 index 843595e..0000000 --- a/changes/prop110 +++ /dev/null @@ -1,7 +0,0 @@ - o Major features: - - Now that Tor 0.2.0.x is completely deprecated, we can enable the - final part of "Proposal 110: Avoiding infinite length circuits" - by refusing all circuit-extend requests that do not appear in a - "relay_early" cell. This change helps Tor to resist a class of - denial-of-service attacks by limiting the maximum circuit length. - diff --git a/changes/timersub_bug b/changes/timersub_bug deleted file mode 100644 index 9183862..0000000 --- a/changes/timersub_bug +++ /dev/null @@ -1,7 +0,0 @@ - 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. -

1 0

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

07 Jan '12

commit bff5956adeab59d360ac69fc3a00ebe8be1f3a1a Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 7 12:15:03 2012 +0000 Update translations for gettor --- fa/gettor.po | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/fa/gettor.po b/fa/gettor.po index 596a9fb..9a4cefc 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 11:21+0000\n" +"PO-Revision-Date: 2012-01-07 12:07+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" @@ -463,44 +463,56 @@ msgid "" "This is an older installer (the \"Vidalia bundle\") for older Macs running\n" "OS X on PowerPC CPUs. Note that this package will be deprecated soon." msgstr "" +"macos-ppc:\n" +"برای کامپیوتر‌های MAC قدیمی‌تر که سیستم عمل OS X را بر روی پردازشگر PowerPC اجرا میکنند، از این بستهسفده کنید. توجه کنید که این بسته به زودی از رده خارج میشود. " #: lib/gettor/i18n.py:226 msgid "" "linux-i386:\n" "The Tor Browser Bundle package for Linux, 32bit versions." msgstr "" +"linux-i386:\n" +"مرورگر TOR برای سیستم عمل لینوکس ۳۲ بیتی." #: lib/gettor/i18n.py:229 msgid "" "Note that this package is rather large and needs your email provider to \n" "allow for attachments of about 30MB in size." msgstr "" +"توجه داشته باشید که این بسته بزرگ است و مستلزم آن است که ایمیل شما بتواند " +"اتچمنت‌های بیش از ۳۰MB را قبول کند." #: lib/gettor/i18n.py:232 msgid "" "linux-x86_64:\n" "The Tor Browser Bundle package for Linux, 64bit versions." msgstr "" +"linux-x86_64:\n" +"مرورگر TOR برای سیستم عمل لینوکس ۶۴ بیتی." #: lib/gettor/i18n.py:235 msgid "" "source:\n" "The Tor source code, for experts. Most users do not want this package." msgstr "" +"کدِ اصلی‌:\n" +"کد ا اصلی‌ نرم افزار TOR. این کد مربوط به کاربرانِ با تجربه تر می‌باشد." #: lib/gettor/i18n.py:238 msgid "" "FREQUENTLY ASKED QUESTIONS\n" "==========================" msgstr "" +"سوال‌های مشترک کاربران:\n" +"================" #: lib/gettor/i18n.py:241 msgid "What is Tor?" -msgstr "" +msgstr "TOR چیست؟" #: lib/gettor/i18n.py:243 msgid "The name \"Tor\" can refer to several different components." -msgstr "" +msgstr "نام TOR میتواند به چندین جز متفاوت مربوط شود:" #: lib/gettor/i18n.py:245 msgid ""

1 0

[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

← Newer
1
...
66
67
68
69
70
71
72
...
86
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits January 2012