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

[obfsproxy/master] Update changelog for #5310.
by asn＠torproject.org 09 Mar '12

09 Mar '12

commit 754e669693a139908c34cc6616026e935cc54601 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Mar 9 01:55:45 2012 -0800 Update changelog for #5310. --- ChangeLog | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 17feada..2e5cfa7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ Changes in version 0.1.1 - <not yet released> Fixes bug #5312. Patch by Peter Palfrader. - Allow doxygen documentation to be built in out-of-source builds. Fixes bug #5315. Patch by Peter Palfrader. + - Fix out-of-source building of tester.py. Fixes bug #5310. Patch by + Peter Palfrader. Changes in version 0.1.0 - 2012-03-05

1 0

[obfsproxy/master] Makefile.am: Fix sed input
by asn＠torproject.org 09 Mar '12

09 Mar '12

commit 7abe6b72226b4462241d58324d75504c29ce9ba9 Author: Peter Palfrader <peter(a)palfrader.org> Date: Mon Mar 5 21:36:17 2012 +0100 Makefile.am: Fix sed input Fix the sed command that broke building the python test in a build-tree, since it was specifying a path to the input that assumed make was running in the top srcdir (re: #5310). --- Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.am b/Makefile.am index 4dba0a1..df46e08 100644 --- a/Makefile.am +++ b/Makefile.am @@ -87,7 +87,7 @@ noinst_PROGRAMS += tester.py tester_py_SOURCES = src/test/tester.py.in tester.py: src/test/tester.py.in Makefile - $(SED) -e 's,[@]PYTHON[@],$(PYTHON),' < src/test/tester.py.in > tester.py + $(SED) -e 's,[@]PYTHON[@],$(PYTHON),' < $(top_srcdir)/src/test/tester.py.in > tester.py chmod +x tester.py endif

1 0

[obfsproxy/master] Update license information for src/sha256.h.
by asn＠torproject.org 09 Mar '12

09 Mar '12

commit 05c5a804424de78287b1bd27ae14eda11b6df642 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Mar 6 12:55:19 2012 -0800 Update license information for src/sha256.h. --- LICENSE | 5 +++-- src/sha256.h | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index 5c0c790..d34b376 100644 --- a/LICENSE +++ b/LICENSE @@ -33,8 +33,9 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ======== -src/sha256.c is based on public-domain code in LibTomCrypt, modified by the Tor -Project. It is distributed under these terms: +src/sha256.c and src/sha256.h are based on public-domain code in +LibTomCrypt, modified by the Tor Project. It is distributed under +these terms: Copyright (c) 2009-2011, The Tor Project, Inc. diff --git a/src/sha256.h b/src/sha256.h index 033f00d..4756da8 100644 --- a/src/sha256.h +++ b/src/sha256.h @@ -1,8 +1,13 @@ +/* Copyright (c) 2009-2012, The Tor Project, Inc. */ /* See the LICENSE file for licensing information */ /** * \file sha256.h * \brief Headers for sha256.c. + * + * \details This SHA256 implementation is adapted from the public + * domain one in LibTomCrypt, version 1.6. Tor uses it on platforms + * where OpenSSL doesn't have a SHA256. **/ #ifndef SHA256_H

1 0

[metrics-tasks/master] Clean up bridge scaling report (#4499).
by karsten＠torproject.org 09 Mar '12

09 Mar '12

commit c4d7e99fa7f161926bb8eb0990da147533740116 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Mar 9 09:53:20 2012 +0100 Clean up bridge scaling report (#4499). --- task-4499/bridge-scaling.tex | 106 +++++++++++++++++++++++++---------------- 1 files changed, 65 insertions(+), 41 deletions(-) diff --git a/task-4499/bridge-scaling.tex b/task-4499/bridge-scaling.tex index 14dae1a..6acf2d7 100644 --- a/task-4499/bridge-scaling.tex +++ b/task-4499/bridge-scaling.tex @@ -4,7 +4,7 @@ \usepackage{graphics} \usepackage{color} \begin{document} -\title{Investigating scaling points to handle more bridges} +\title{What if the Tor network had 50,000 bridges?} \author{Karsten Loesing\\{\tt karsten(a)torproject.org}} \maketitle @@ -13,25 +13,32 @@ The current bridge infrastructure relies on a central bridge authority to collect, distribute, and publish bridge relay descriptors. +There are currently 1,000 bridges running in the Tor network.\footnote{% +\url{https://metrics.torproject.org/network.html#networksize}} We believe the current infrastructure can handle up to 10,000 bridges. +Potential performance bottlenecks include: -The scaling points involve the database of descriptors, the metrics portal -and its ability to handle this many descriptors for analysis, and the -reachability testing part of the code for the bridge authority. -We should investigate scaling points to handle more than 10,000 bridge -descriptors. +\begin{itemize} +\item the bridge authority Tonga, where all (public) bridges register and +which performs periodic reachability tests to confirm that bridges are +running, +\item BridgeDB, which stores currently running bridges and hands them out +to bridge users, and +\item metrics-db, which sanitizes bridge descriptors for later analysis +like statistics on daily connecting bridge users. +\end{itemize} -\section{Early results} +\section{Load-testing BridgeDB and metrics-db} We started this analysis by writing a small tool to generate sample data -for BridgeDB and metrics-db. +for BridgeDB and metrics-db to load-test them. This tool takes the contents from one of Tonga's bridge tarball as input, copies them a given number of times, and overwrites the first two bytes of relay fingerprints in every copy with 0000, 0001, etc. The tool also fixes references between network statuses, server descriptors, and extra-info descriptors. This is sufficient to trick BridgeDB and metrics-db into thinking that -relays in the copies are distinct relays. +bridges in the copies are distinct bridges. We used the tool to generate tarballs with 2, 4, 8, 16, 32, and 64 times as many bridge descriptors in them. @@ -41,12 +48,11 @@ tarball and writes them to a local database. metrics-db sanitizes two half-hourly created tarballs every hour, establishes an internal mapping between descriptors, and writes sanitized descriptors with fixed references to disk. - Figure~\ref{fig:bridgescaling} shows the results. \begin{figure}[t] \includegraphics[width=\textwidth]{bridge-scaling.png} -%\caption{} +\caption{Results from load-testing BridgeDB and metrics-db} \label{fig:bridgescaling} \end{figure} @@ -58,16 +64,15 @@ to the hosts transferring and storing bridge tarballs are growing with the tarballs. We'll want to pay extra attention to disk space running out on those hosts. +These tarballs have substantial overlap. +If we have tens of thousands of descriptors, we would want to get smarter +at sending diffs over to BridgeDB and metrics-db.\footnote{See comment at +\url{https://trac.torproject.org/projects/tor/ticket/4499#comment:7}} The middle graph shows how long BridgeDB takes to load descriptors from a tarball. This graph is linear, too, which indicates that BridgeDB can handle an increase in the number of bridges pretty well. -One thing we couldn't check is whether BridgeDB's ability to serve client -requests is in any way affected during the descriptor import. -We assume it'll be fine. -We should ask Aaron, if there are other things in BridgeDB that we -overlooked that may not scale. The lower graph shows how metrics-db can or cannot handle more bridges. The growth is slightly worse than linear. @@ -79,39 +84,58 @@ We might have to sanitize bridge descriptors in a different thread or process than the one that fetches all the other metrics data. We can also look into other Java libraries to handle .gz-compressed files that are faster than the one we're using. -So, we can probably handle 25K bridges somehow, and maybe even 50K. -Somehow. -Finally, note that we left out the most important part of this analysis: +\section{Looking at concurrency in BridgeDB} + +While performing the load-test on BridgeDB we were wondering whether it +can serve client requests while loading bridges. +Turns out BridgeDB's interaction with users freezes while it's reading a +new set of data. +This isn't that much of a problem with a few hundred bridges and unlucky +clients having to wait 10 seconds for their bridges. +But it becomes a problem when BridgeDB is busy for a minute or two, twice +an hour. +We started discussing importing bridges into BridgeDB in a separate thread +and database transaction.\footnote{% +\url{https://trac.torproject.org/projects/tor/ticket/5232}} + +\section{Scalability of the bridge authority Tonga} + +We left out the most important part of this analysis: can Tonga, or more generally, a single bridge authority handle this increase in bridges? +Tonga still does a reachability test on each bridge every 21~minutes or so. +Eventually the number of TLS handshakes it's doing will overwhelm its +CPU.\footnote{% +\url{https://trac.torproject.org/projects/tor/ticket/4499#comment:7}} + We're not sure how to test such a setting, or at least without running 50K bridges in a private network. We could imagine this requires some more sophisticated sample data generation including getting the crypto right and then talking to Tonga's DirPort. -If there's an easy way to test this, we'll do it. -If not, we can always hope for the best. -What can go wrong. - -\section{Work left to do} - -If we end up with way too many bridges, here are a few things we'll want -to look at updating: - -\begin{itemize} -\item Tonga still does a reachability test on each bridge every 21 minutes -or so. -Eventually the number of TLS handshakes it's doing will overwhelm its cpu. -\item The tarballs we make every half hour have substantial overlap. -If we have tens of thousands of descriptors, we would want to get smarter -at sending diffs over to bridgedb. -\item Somebody should check whether BridgeDB's interaction with users -freezes while it's reading a new set of data. -\end{itemize} - -%\bibliography{bridge-scaling} -%\bibliographystyle{plain} +We didn't find an easy way to test this. + +A possible fix would be to increase the reachability test interval from +21~minutes to some higher value. +A long-term fix would be to come up with a design that has more than one +single bridge authority. + +\section{Conclusion} + +In conclusion, we found that a massive increase in bridges in the Tor +network by a factor of 10 to 50 can be harmful to Tor's infrastructure. +We identified possible bottlenecks: Tonga's reachability test interval, +bridge tarball sizes for transfer between Tonga and BridgeDB/metrics-db, +loading bridges into BridgeDB, and sanitizing bridges in metrics-db. + +During this analysis we discovered a design bug in BridgeDB which makes it +freeze while reading new bridge descriptors. +This bug should be fixed regardless of scaling to 10K--50K bridges, +because it already affects users. +The suggested changes to Tonga, transfering tarballs between hosts, and +changes to metrics-db can be postponed until there's an actual problem, +not just a theoretical one. \end{document}

1 0

r25514: {website} Update links for torbel on the volunteer page (website/trunk/getinvolved/en)
by Sebastian Hahn 09 Mar '12

09 Mar '12

Author: sebastian Date: 2012-03-09 01:28:06 +0000 (Fri, 09 Mar 2012) New Revision: 25514 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Update links for torbel on the volunteer page Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2012-03-08 14:53:26 UTC (rev 25513) +++ website/trunk/getinvolved/en/volunteer.wml 2012-03-09 01:28:06 UTC (rev 25514) @@ -636,8 +636,8 @@ <a id="project-torbel"></a> <h3><a - href="https://trac.torproject.org/projects/tor/wiki/projects/TorBulkExitlist">TorBEL</a> (<a - href="https://gitweb.torproject.org/tordnsel.git">code</a>, <a + href="https://blog.torproject.org/blog/torbel-tor-bulk-exit-list-tools">TorBEL</a> (<a + href="https://gitweb.torproject.org/torbel.git">code</a>, <a href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug tracker</a>)</h3>

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 08 Mar '12

08 Mar '12

commit eccb29c44ac3d2ecdee9403b838792c7b53271ea Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 8 22:45:05 2012 +0000 Update translations for orbot --- values-fa/strings.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/values-fa/strings.xml b/values-fa/strings.xml index 09c0a8d..0db30bb 100644 --- a/values-fa/strings.xml +++ b/values-fa/strings.xml @@ -198,7 +198,7 @@ Orbot اگر فقط <string name="pref_use_persistent_notifications_title">Always-On Notifications</string> <string name="notification_using_bridges">پل ها فعال شدند!</string> <string name="default_bridges"></string> - <string name="set_locale_title">زبان محلی را انتخاب کنید</string> + <string name="set_locale_title">زبان محلی را مشخص کنید</string> <string name="set_locale_summary">Choose the locale and language for Orbot</string> <string name="wizard_locale_title">انتخاب زبان</string> <string name="wizard_locale_msg">Leave default or switch the current language</string>

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 08 Mar '12

08 Mar '12

commit 828ad9d37001d28acafba96e499d7a8296b3bfbf Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 8 21:15:06 2012 +0000 Update translations for orbot --- values-fa/strings.xml | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/values-fa/strings.xml b/values-fa/strings.xml index 9c85147..09c0a8d 100644 --- a/values-fa/strings.xml +++ b/values-fa/strings.xml @@ -116,7 +116,7 @@ Orbot اگر فقط <string name="pref_use_whispercore">WhisperCore استفاده از </string> <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string> <string name="pref_proxy_type_title">نوع پروکسی</string> - <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string> + <string name="pref_proxy_type_summary">پروتکل مورد استفاده برای پراکسی سرور: HTTP, HTTPS, Socks4, Socks5</string> <string name="pref_proxy_type_dialog">نوع پروکسی را وارد کنید</string> <string name="pref_proxy_host_title">میزبان پروکسی</string> <string name="pref_proxy_host_summary">نام سرور میزبان پروکسی</string> @@ -130,13 +130,13 @@ Orbot اگر فقط <string name="transparent_proxying_enabled">پروکسی شفاف فعال است</string> <string name="transproxy_enabled_for_tethering_">TransProxy enabled for Tethering!</string> <string name="warning_error_starting_transparent_proxying_">هشدار: خطا در هنگام راه اندازی پروکسی شفاف!</string> - <string name="transproxy_rules_cleared">TransProxy rules cleared</string> + <string name="transproxy_rules_cleared">قوانین TransProxy پاک شدند</string> <string name="couldn_t_start_tor_process_">: را آغاز کنمTor نتوانستم فرایند </string> <string name="privoxy_is_running_on_port_">پروکسی، روی پورت مقابل درحال اجراست:</string> <string name="setting_up_port_based_transparent_proxying_">نصب پروکسی شفاف مبتنی بر پورت...</string> <string name="bridge_error">خطای پل</string> <string name="bridge_requires_ip">برای استفاده از ویژگی پل، باید حداقل آدرس IP یک پل را وارد کنید.</string> - <string name="send_email_for_bridges">Send an email to bridges(a)torproject.org with the line \"get bridges\" by itself in the body of the mail from a gmail account.</string> + <string name="send_email_for_bridges">از یک حساب کاربری جیمیل، ایمیلی با متن \"get bridges\" به آدرس bridges(a)torproject.org بفرستید.</string> <string name="error">خطا</string> <string name="your_reachableaddresses_settings_caused_an_exception_">!تنظیمات شما برای آدرس قابل دسترسی باعث ایجاد خطا شده اند </string> <string name="your_relay_settings_caused_an_exception_">!تنظیمات رله شما موجب خطا شده اند</string> @@ -151,19 +151,19 @@ Orbot اگر فقط <string name="bridges">پل ها</string> <string name="use_bridges">از پل استفاده کن</string> <string name="bridges_obfuscated">پل های گیج کننده</string> - <string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</string> + <string name="enable_alternate_entrance_nodes_into_the_tor_network">گره ورودی متناوب به شبکه تور را فعال کنید</string> <string name="enable_if_configured_bridges_are_obfuscated_bridges">Enable if configured bridges are obfuscated bridges</string> - <string name="ip_address_and_port_of_bridges">IP address and port of bridges</string> + <string name="ip_address_and_port_of_bridges">آدرس آی پی و پورتِ پل ها</string> <string name="enter_bridge_addresses">آدرس پل ها را وارد کنید</string> <string name="relays">بازپخش کننده ها</string> <string name="relaying">درحال بازپخش</string> <string name="enable_your_device_to_be_a_non_exit_relay">دستگاه خود را برای یک بازپخش کننده غیر-خروجی فعال کنید</string> <string name="relay_port">پورت بازپخش کننده</string> <string name="listening_port_for_your_tor_relay">Listening port for your Tor relay</string> - <string name="enter_or_port">Enter OR port</string> + <string name="enter_or_port">پورت OR را وارد کنید</string> <string name="relay_nickname">نام مستعار بازپخش کننده</string> <string name="the_nickname_for_your_tor_relay">نام مستعار بازپخش کننده شما</string> - <string name="enter_a_custom_relay_nickname">Enter a custom relay nickname</string> + <string name="enter_a_custom_relay_nickname">یک نام مستعار دلخواه برای بازپخش کننده وارد کنید</string> <string name="reachable_addresses">آدرس های قابل دسترس</string> <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Run as a client behind a firewall with restrictive policies</string> <string name="reachable_ports">پورت‌های قابل دسترس</string> @@ -171,7 +171,7 @@ Orbot اگر فقط <string name="enter_ports">پورت‌ها را وارد کنید</string> <string name="enable_hidden_services">سرویس‌های مخفی را فعال کن</string> <string name="run_servers_accessible_via_the_tor_network">run servers accessible via the Tor network</string> - <string name="enter_localhost_ports_for_hidden_services">enter localhost ports for hidden services</string> + <string name="enter_localhost_ports_for_hidden_services">پورت های لوکال هاست را برای سرویس مخفی وارد کنید</string> <string name="hidden_service_ports">پورت‌های سرویس مخفی</string> <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">the addressable name for your hidden service (generated automatically)</string> <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">enable debug log to output (must use adb or aLogCat to view)</string> @@ -194,11 +194,11 @@ Orbot اگر فقط <string name="pref_use_sys_iptables_title">از Iptables پیشفرض استفاده کن</string> <string name="pref_use_sys_iptables_summary">use the built-in iptables binary instead of the one bundled with Orbot</string> <string name="error_installing_binares">The Tor binaries were not able to be installed or upgraded.</string> - <string name="pref_use_persistent_notifications">Always keep the icon in toolbar when Orbot is connected</string> + <string name="pref_use_persistent_notifications">وقتی اوربوت متصل است، همیشه آیکون مربوط را در نوار ابزار نگه دار.</string> <string name="pref_use_persistent_notifications_title">Always-On Notifications</string> <string name="notification_using_bridges">پل ها فعال شدند!</string> <string name="default_bridges"></string> - <string name="set_locale_title">Set Locale</string> + <string name="set_locale_title">زبان محلی را انتخاب کنید</string> <string name="set_locale_summary">Choose the locale and language for Orbot</string> <string name="wizard_locale_title">انتخاب زبان</string> <string name="wizard_locale_msg">Leave default or switch the current language</string>

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 08 Mar '12

08 Mar '12

commit 187ed17b6173f663edfce66b1835b0e14891adee Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 8 20:45:04 2012 +0000 Update translations for orbot --- values-fa/strings.xml | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/values-fa/strings.xml b/values-fa/strings.xml index 02c46b8..9c85147 100644 --- a/values-fa/strings.xml +++ b/values-fa/strings.xml @@ -99,7 +99,7 @@ Orbot اگر فقط <string name="wizard_tips_orweb">ORWEB (فقط آندروید 1.x) - مرورگر طراحی شده برای حفظ حریم خصوصی و افزونساز اوربات</string> <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> <string name="wizard_transproxy_title">پروکسی کردن شفاف</string> - <string name="wizard_transproxy_msg">This allows your apps to automatically run through the Tor network without any configuration.</string> + <string name="wizard_transproxy_msg">این به برنامه های شما اجازه میدهد که بدون هیچ تنظیمی، بصورت خودکار از طریق شبکه تور اجرا شوند</string> <string name="wizard_transproxy_hint">(اگر هیچ ایده‌ای ندارید که راجع به چه چیزی حرف میزنیم این گزینه را انتخاب کنید)</string> <string name="wizard_transproxy_none">هیـچ</string> <string name="pref_transparent_tethering_title">Tor تترینگ از طریق </string> @@ -109,9 +109,9 @@ Orbot اگر فقط <string name="pref_select_apps">انتخاب برنامه ها</string> <string name="pref_select_apps_summary">Tor انتخاب اپلیکیشن برای مسیریابی از طریق </string> <string name="pref_node_configuration">تنظیمات گره</string> - <string name="pref_node_configuration_summary">These are advanced settings that can reduce your anonymity</string> + <string name="pref_node_configuration_summary">اینها تنظیمات پیشرفته ای هستند که ممکن است گمنامی شما را کاهش دهند</string> <string name="pref_entrance_node">گره های ورودی</string> - <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string> + <string name="pref_entrance_node_summary">اثرانگشت ها، اسامی مستعار، کشورها و آدرسهای هاپ اول</string> <string name="pref_entrance_node_dialog">گره های ورودی را وارد کنید</string> <string name="pref_use_whispercore">WhisperCore استفاده از </string> <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string> @@ -149,19 +149,19 @@ Orbot اگر فقط <string name="strict_nodes">گره های محدود</string> <string name="use_only_these_specified_nodes">فقط * از این گره های مشخص شده استفاده کنید* </string> <string name="bridges">پل ها</string> - <string name="use_bridges">Use Bridges</string> - <string name="bridges_obfuscated">Obfuscated Bridges</string> + <string name="use_bridges">از پل استفاده کن</string> + <string name="bridges_obfuscated">پل های گیج کننده</string> <string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</string> <string name="enable_if_configured_bridges_are_obfuscated_bridges">Enable if configured bridges are obfuscated bridges</string> <string name="ip_address_and_port_of_bridges">IP address and port of bridges</string> - <string name="enter_bridge_addresses">Enter Bridge Addresses</string> + <string name="enter_bridge_addresses">آدرس پل ها را وارد کنید</string> <string name="relays">بازپخش کننده ها</string> - <string name="relaying">Relaying</string> - <string name="enable_your_device_to_be_a_non_exit_relay">Enable your device to be a non-exit relay</string> - <string name="relay_port">Relay Port</string> + <string name="relaying">درحال بازپخش</string> + <string name="enable_your_device_to_be_a_non_exit_relay">دستگاه خود را برای یک بازپخش کننده غیر-خروجی فعال کنید</string> + <string name="relay_port">پورت بازپخش کننده</string> <string name="listening_port_for_your_tor_relay">Listening port for your Tor relay</string> <string name="enter_or_port">Enter OR port</string> - <string name="relay_nickname">Relay nickname</string> + <string name="relay_nickname">نام مستعار بازپخش کننده</string> <string name="the_nickname_for_your_tor_relay">نام مستعار بازپخش کننده شما</string> <string name="enter_a_custom_relay_nickname">Enter a custom relay nickname</string> <string name="reachable_addresses">آدرس های قابل دسترس</string> @@ -175,9 +175,9 @@ Orbot اگر فقط <string name="hidden_service_ports">پورت‌های سرویس مخفی</string> <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">the addressable name for your hidden service (generated automatically)</string> <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">enable debug log to output (must use adb or aLogCat to view)</string> - <string name="project_home">Project Home(s): </string> + <string name="project_home">صفحه (های) اصلی پروژه:</string> <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/…</string> - <string name="the_tor_license">The Tor License</string> + <string name="the_tor_license">گواهی تور</string> <string name="https_torproject_org">https://torproject.org</string> <string name="third_party_software">3rd-Party-Software: </string> <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string> @@ -196,10 +196,10 @@ Orbot اگر فقط <string name="error_installing_binares">The Tor binaries were not able to be installed or upgraded.</string> <string name="pref_use_persistent_notifications">Always keep the icon in toolbar when Orbot is connected</string> <string name="pref_use_persistent_notifications_title">Always-On Notifications</string> - <string name="notification_using_bridges">Bridges enabled!</string> + <string name="notification_using_bridges">پل ها فعال شدند!</string> <string name="default_bridges"></string> <string name="set_locale_title">Set Locale</string> <string name="set_locale_summary">Choose the locale and language for Orbot</string> - <string name="wizard_locale_title">Choose Language</string> + <string name="wizard_locale_title">انتخاب زبان</string> <string name="wizard_locale_msg">Leave default or switch the current language</string> </resources>

1 0

[torbrowser/maint-2.3] Apply the openssl OSX patch in unpack target
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit 9e786aeed3ae6c3b664bd4fad091b23a118721c3 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Feb 21 10:49:15 2012 +0100 Apply the openssl OSX patch in unpack target This means we now also apply the patch for linux and windows, but that should be fine - it doesn't touch files they need. This means for us that if the build fails and we have to re-run the build-openssl target with a changed configuration or so, we can without re-extracting. --- build-scripts/osx.mk | 3 --- build-scripts/versions.mk | 5 ++++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 160c9dd..34705bc 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -57,9 +57,6 @@ build-zlib: $(ZLIB_DIR) OPENSSL_OPTS=-no-rc5 -no-md2 -no-man shared zlib $(BACKWARDS_COMPAT) --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -L$(BUILT_DIR)/lib -I$(BUILT_DIR)/include build-openssl: build-zlib $(OPENSSL_DIR) - cp ../src/current-patches/openssl/*patch $(OPENSSL_DIR) - cp patch-any-src.sh $(OPENSSL_DIR) - cd $(OPENSSL_DIR) && ./patch-any-src.sh ifeq (x86_64,$(ARCH_TYPE)) cd $(OPENSSL_DIR) && ./Configure darwin64-x86_64-cc $(OPENSSL_OPTS) else diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 0aafa30..a89bf13 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -168,9 +168,12 @@ $(QT_DIR): $(FETCH_DIR)/$(QT_PACKAGE) | $(BUILD_DIR) cd $(FETCH_DIR) && tar -xmf $(QT_PACKAGE) -C $(BUILD_DIR)/ mv $(BUILD_DIR)/qt-everywhere-opensource-src-$(QT_VER) $(QT_DIR) -$(OPENSSL_DIR): $(FETCH_DIR)/$(OPENSSL_PACKAGE) | $(BUILD_DIR) +$(OPENSSL_DIR): $(FETCH_DIR)/$(OPENSSL_PACKAGE) ../src/current-patches/openssl/*patch | $(BUILD_DIR) rm -rf $(OPENSSL_DIR) cd $(FETCH_DIR) && tar -xmf $(OPENSSL_PACKAGE) -C $(BUILD_DIR)/ + cp ../src/current-patches/openssl/*patch $(OPENSSL_DIR) + cp patch-any-src.sh $(OPENSSL_DIR) + cd $(OPENSSL_DIR) && ./patch-any-src.sh $(VIDALIA_DIR): $(FETCH_DIR)/$(VIDALIA_PACKAGE) | $(BUILD_DIR) rm -rf $(VIDALIA_DIR)

1 0

[torbrowser/maint-2.3] Remove the firefox-portable default bookmarks
by erinn＠torproject.org 08 Mar '12

08 Mar '12

commit 65ebcc49b07f4901e708be73385b79028501802e Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Feb 21 11:12:52 2012 +0100 Remove the firefox-portable default bookmarks Fixes bug 5163. We should copy our bookmarks into place during the build, so this duplication is unnecessary. --- .../App/DefaultData/profile/bookmarks.html | 17 -------------- .../firefox-portable/Data/profile/bookmarks.html | 24 -------------------- 2 files changed, 0 insertions(+), 41 deletions(-) diff --git a/build-scripts/config/firefox-portable/App/DefaultData/profile/bookmarks.html b/build-scripts/config/firefox-portable/App/DefaultData/profile/bookmarks.html deleted file mode 100644 index 8207433..0000000 --- a/build-scripts/config/firefox-portable/App/DefaultData/profile/bookmarks.html +++ /dev/null @@ -1,17 +0,0 @@ -<!DOCTYPE NETSCAPE-Bookmark-file-1> - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8"> -<TITLE>Bookmarks</TITLE> -<H1>Bookmarks</H1> - -<DL><p> - <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">Bookmarks Toolbar Folder</H3> -<DD>Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar - <DL><p> - <DT><A HREF="https://www.torproject.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd4v9sP17/xsHN/1A3Tf8lGSD/YxM9/2sVRP80DB7/Ty44bv///wD///8A////AP///wAwAAUwSERJ/+jx8v/Xx9P/YDVS/7y+zP9BKEH/LiUs/2ceRf91JFT/Ngke/yYACVj///8A////AP///wD///8ANwAJHFNNUv/h6+z/9PD0/31Zev+GeJL/Rj5X/zAjK/9zL1f/ezFd/y0NGv8mAA42////AP///wD///8A////AFUAAAMVAAqge4GF//v8/P/x7/L/hHCN/1NVbf87KDP/g0Fq/14pSP9PLz3/AAAABP///wD///8A////AP///wD///8AOQAcCQcACpWcoqX/+/39/7PJ0v9oeYn/Ry89/5BVff8+IC//IAANKP///wD///8A////AP///wD///8A////AP///wBGABcLCgAHmXFucv/G4eb/SUhS/109UP9WOkf/WEJIhf///wD///8A////AP///wD///8A////AP///wD///8A////AFUAKgYZAAiGRkNJ/0IyO/9XQkj/KQAI HzMAAAX///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AMwANFFxMU/9WQEr/PgAMKf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AD4AFyFWUln/OW5Y/wCobmQAqnEJ////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCZAGYFQpF3hQteOv8AiVGpGb2BbP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AAD//wMAjF2oB35N8gClYpcAuHEk////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AANOEHQCvdn8ArGipALJshwC4ezb///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wAA/78IANmXNgDFgyMAv4AM////AP///wD///8A//8AAPAPAADgBwAA4AcAAOAHAADgBwAA8AcAAPgPAAD8HwAA/j8AAP5/AAD+fwAA/38AAP//AAD//wAA//8AAA==" LAST_CHARSET="ISO-8859-1" ID="rdf:#$0gnTO1">Learn more about Tor</A> - <DT><A HREF="https://blog.torproject.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd4v9sP17/xsHN/1A3Tf8lGSD/YxM9/2sVRP80DB7/Ty44bv///wD///8A////AP///wAwAAUwSERJ/+jx8v/Xx9P/YDVS/7y+zP9BKEH/LiUs/2ceRf91JFT/Ngke/yYACVj///8A////AP///wD///8ANwAJHFNNUv/h6+z/9PD0/31Zev+GeJL/Rj5X/zAjK/9zL1f/ezFd/y0NGv8mAA42////AP///wD///8A////AFUAAAMVAAqge4GF//v8/P/x7/L/hHCN/1NVbf87KDP/g0Fq/14pSP9PLz3/AAAABP///wD///8A////AP///wD///8AOQAcCQcACpWcoqX/+/39/7PJ0v9oeYn/Ry89/5BVff8+IC//IAANKP///wD///8A////AP///wD///8A////AP///wBGABcLCgAHmXFucv/G4eb/SUhS/109UP9WOkf/WEJIhf///wD///8A////AP///wD///8A////AP///wD///8A////AFUAKgYZAAiGRkNJ/0IyO/9XQkj/KQA IHzMAAAX///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AMwANFFxMU/9WQEr/PgAMKf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AD4AFyFWUln/OW5Y/wCobmQAqnEJ////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCZAGYFQpF3hQteOv8AiVGpGb2BbP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AAD//wMAjF2oB35N8gClYpcAuHEk////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AANOEHQCvdn8ArGipALJshwC4ezb///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wAA/78IANmXNgDFgyMAv4AM////AP///wD///8A//8AAPAPAADgBwAA4AcAAOAHAADgBwAA8AcAAPgPAAD8HwAA/j8AAP5/AAD+fwAA/38AAP//AAD//wAA//8AAA==" LAST_CHARSET="ISO-8859-1" ID="rdf:#$0gnTO1">The Tor Blog</A> - </DL><p> - <HR> -</DL><p> diff --git a/build-scripts/config/firefox-portable/Data/profile/bookmarks.html b/build-scripts/config/firefox-portable/Data/profile/bookmarks.html deleted file mode 100644 index d85bcf5..0000000 --- a/build-scripts/config/firefox-portable/Data/profile/bookmarks.html +++ /dev/null @@ -1,24 +0,0 @@ -<!DOCTYPE NETSCAPE-Bookmark-file-1> - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8"> -<TITLE>Bookmarks</TITLE> -<H1>Bookmarks</H1> - -<DL><p> - <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">Bookmarks Toolbar Folder</H3> -<DD>Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar - <DL><p> - <DT><A HREF="http://www.mozilla.com/en-US/firefox/central/" ID="rdf:#$GvPhC3">Getting Started</A> - <DT><A HREF="http://fxfeeds.mozilla.com/en-US/firefox/livebookmarks/" FEEDURL="http://fxfeeds.mozilla.com/en-US/firefox/headlines.xml" ID="rdf:#$HvPhC3">Latest Headlines</A> - </DL><p> - <DT><H3 ID="rdf:#$ZvPhC3">Mozilla Firefox</H3> - <DL><p> - <DT><A HREF="http://www.mozilla.com/en-US/firefox/help/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$22iCK1">Help and Tutorials</A> - <DT><A HREF="http://www.mozilla.com/en-US/firefox/customize/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$32iCK1">Customize Firefox</A> - <DT><A HREF="http://www.mozilla.com/en-US/firefox/community/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$42iCK1">Get Involved</A> - <DT><A HREF="http://www.mozilla.com/en-US/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">About Us</A> - </DL><p> - <DT><A HREF="http://portableapps.com/" ADD_DATE="1133305361" LAST_VISIT="1152158207" LAST_MODIFIED="1134124795" ICON="data:image/x-icon;base64,AAABAAIAEBAAAAEACABoBQAAJgAAABAQAAABACAAaAQAAI4FAAAoAAAAEAAAACAAAAABAAgAAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGFcMAB4dVEAm5h/AKajjACloo0AnJiAAHp1UwBgWy0AX18fAHVyTQCzr54A39zXAOTh3QDm5OAA5+ThAOXi3gDh3tkAtbGgAHdyUABMTBkAfHhXAMnGvQDV0cwA1dLMAMrHvgB+elkATEwzAHl2UwDEwbcAxMC4AMG9swC4tKcAuraqAHBsSABfWi8AwsCxAMO/tgC2saYAtbClAKynmAC3s6YAx8S4ANXTygDm5d8A/f38AM/MxQCYk34AYl0xAGxnQgDo5uIAubWpAKijlACnopMAoJuHAN3c0wD///8A1dPMAKeikgBtaEMAeXRVAOrp5QCblYMAjIduAO3t6ADg3tgAenVWAHhzUwDh39oAx8S5AI+IcwCYk3wA/v7+AO7t6gB6dFUAd3JSAMvJvwDu7ekAhX9mAIN9ZAB/eF0A2NfNAMXCtgDz8vAAiIJrAHlzVAB2cVEApaKSAMbEuAB9d10Ae3VaAHdxUwC4taMA09HJAH54YACNiHQAiINvAHl0UwBuaUMAfnlgAOjn4wDk494AwsCzAN3c1ACAemMAeHJZAH54XwBvbEUAYFszAHt2VgCNiXEA+fn4AOzr5wCBfGIAb2pMAH55WQBhXDMAb2pEAHhzUQCMiG0A7u7qAM/NwQB0bk0AZ2E9AHVxSwB6dVEAaGI8AJGOcgCcmX8AfHdWAGNdNQB7d1MAd3NMAFxcLgBwbUcAg39bAHl0TgBiXDMAYVsxA Hl0TwCFgV4Acm5IAFVVKgBdWDEAc29IAIiEYACFgV0AiIRhAHRwSQBcWDMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkJGSjJOUAAAAAAAAAACGh4iJioqJi4yNAAAAAAB8fX5/gIGCgoKCg4QAAAB1dnd4ODhIeXp7e3sHawAAbW5vODg4ODhwcXJycnMAYmNkOGVmZzg4OD1oaWlqa1ZXOFhZWltcODg4XV5fYGFLTE1OT09PUFE4OEhSU1RVQ0RFRkZGRkZHSDg4OElGSjw9ID4+Pj4+P0A4ODhBPkIxMjM0NDQ1Njc4ODg4OTo7ACQlJiYmJygpKissLS4vAAAcHR4eHh4eHh4eHyAhIgAAABUWFxgYGBgYGBcZGgAAAAAACgsMDQ4PEBESEwAAAAAAAAAAAgMEBQYHAAAAAAD4HwAA4AcAAMADAACAAQAAgA EAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIABAACAAQAAwAMAAOAHAAD4HwAAKAAAABAAAAAgAAAAAQAgAAAAAABABAAAIi4AACIuAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABdWDE0c29Im4iEYN2FgV38hYFe/IiEYd90cEmdXFgzNwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAExMMwpwbUeeg39b/nl0Tv9iXDP/YVsx/2FbMf9iXDP/eXRP/4WBXv5ybkiiVVUqDAAAAAAAAAAAAAAAAExMGQp1cUvDenVR/2hiPP+RjnL/nJl//3x3Vv9jXTX/Y101/2NdNf9jXTX/e3dT/3dzTMdcXC4LAAAAAAAAAABvakSceHNR/4yIbf/u7ur////////////+/v7/z83B/3RuTf9nYT3/Z2E9/2dhPf96dVP/b2xFogAAAABgWzMye3ZW/Y2Jcf/5+fj////////////////////////////s6+f/gXxi/29qTP9vakz/b2pM/355Wf5hXDM3bmlDmH55YP/o5+P//////+Tj3v/CwLP/3dzU/////////////////+rp5f+AemP/eHJZ/3hyWf9+eF//b2xFnnZxUdmlopL//////8bEuP99d13/e3Va/3dxU/+4taP/////////////////09HJ/354YP+NiHT/iINv/3l0U993clL5y8m//+7t6f+Ff2b/g31k/4N9ZP+DfWT/f3hd/9jXzf////////////7+/v/Fwrb/8/Lw/4iCa/95c1T9eHNT+eHf2v/HxLn/j4hz/4+Ic/+PiHP/j4hz/4+Ic/+Yk3z//v7+/////////////////+7t6v+PiHP/enRV/Hl0Vdjq6eX/uLSn/5uVg/+blYP/m5WD/5uVg/+blYP/jIdu/+3t6P/////////////////g3tj/m5WD/3p1Vt5sZ0KW6Obi/7m1qf+oo5T /qKOU/6ijlP+nopP/oJuH/93c0///////////////////////1dPM/6eikv9taEOcX1ovMMLAsf3Dv7b/trGm/7axpv+2sab/tbCl/6ynmP+3s6b/x8S4/9XTyv/m5d///f38/8/Mxf+Yk37+Yl0xNAAAAAB5dlOZxMG3/8TAuP/EwLj/xMC4/8TAuP/EwLj/xMC4/8TAuP/EwLj/wb2z/7i0p/+6tqr/cGxIngAAAAAAAAAAX18fCHx4V8DJxr3/1dHM/9XSzP/V0sz/1dLM/9XSzP/V0sz/1dLM/9XRzP/Kx77/fnpZxExMMwoAAAAAAAAAAAAAAABfXx8IdXJNmLOvnv3f3Nf/5OHd/+bk4P/n5OH/5eLe/+He2f+1saD9d3JQnExMGQoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABhXDAveHVRlpuYf9imo4z4paKN+ZyYgNl6dVOYYFstMgAAAAAAAAAAAAAAAAAAAADwDwAAwAMAAIABAACAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAQAAgAH//8AD///wD///" LAST_CHARSET="UTF-8" ID="rdf:#$fzAgJ">PortableApps.com</A> -</DL><p>

1 0