October 2014 - tor-commits - lists.torproject.org

[translation/tsum] Update translations for tsum
by translation＠torproject.org 08 Oct '14

08 Oct '14

commit aee8d3a36a05e3bd8971f6e4cdc01f4ff32dd8dd Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 8 20:45:15 2014 +0000 Update translations for tsum --- ug@Arab/short-user-manual_ug@Arab_noimg.xhtml | 132 +++++++++++++++++++++++++ 1 file changed, 132 insertions(+) diff --git a/ug@Arab/short-user-manual_ug@Arab_noimg.xhtml b/ug@Arab/short-user-manual_ug@Arab_noimg.xhtml new file mode 100644 index 0000000..681e5b7 --- /dev/null +++ b/ug@Arab/short-user-manual_ug@Arab_noimg.xhtml @@ -0,0 +1,132 @@ +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> + <title/> + </head> + <body> + <h1 id="the-short-user-manual">The Short User Manual</h1> + This user manual contains information about how to download Tor, how to use it, and what to do if Tor is unable to connect to the network. If you can't find the answer to your question in this document, email help(a)rt.torproject.org. + Please note that we are providing support on a voluntary basis, and we get a lot of emails every single day. There is no need to worry if we don't get back to you straight away. + <h2 id="how-tor-works">How Tor works</h2> + Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as relays) in the Tor network, before the traffic is sent out onto the public Internet. + The image above illustrates a user browsing to different websites over Tor. The green monitors represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each relay. + Tor will anonymize the origin of your traffic, and it will encrypt everything between you and the Tor network. Tor will also encrypt your traffic inside the Tor network, but it cannot encrypt your traffic between the Tor network and its final destination. + If you are communicating sensitive information, for example when logging on to a website with a username and password, make sure that you are using HTTPS (e.g. https://torproject.org/, not http://torproject.org/). + <h2 id="how-to-download-tor">How to download Tor</h2> + The bundle we recommend to most users is the <a href="https://www.torproject.org/projects/torbrowser.html">Tor Browser Bundle</a>. This bundle contains a browser preconfigured to safely browse the Internet through Tor, and requires no installation. You download the bundle, extract the archive, and start Tor. + There are two different ways to get hold of the Tor software. You can either browse to the <a href="https://www.torproject.org/">Tor Project website</a> and download it there, or you can use GetTor, the email autoresponder. + <h3 id="how-to-get-tor-via-email">How to get Tor via email</h3> + To receive the English Tor Browser Bundle for Windows, send an email to gettor(a)torproject.org with windows in the body of the message. You can leave the subject blank. + You can also request the Tor Browser Bundle for Mac OS X (write macos-i386), and Linux (write linux-i386 for 32-bit systems or linux-x86_64 for 64-bit systems). + If you want a translated version of Tor, write help instead. You will then receive an email with instructions and a list of available languages. + Note: The Tor Browser Bundles for Linux and Mac OS X are rather large, and you will not be able to receive any of these bundles with a Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you want, send an email to help(a)rt.torproject.org and we will give you a list of website mirrors to use. + <h3 id="tor-for-smartphones">Tor for smartphones</h3> + You can get Tor on your Android device by installing the package named Orbot. For information about how to download and install Orbot, please see the <a href="https://www.torproject.org/docs/android.html.en">Tor Project website</a>. + We also have experimental packages for <a href="https://www.torproject.org/docs/N900.html.en">Nokia Maemo/N900</a> and <a href="http://sid77.slackware.it/iphone/">Apple iOS</a>. + <h3 id="how-to-verify-that-you-have-the-right-version">How to verify that you have the right version</h3> + Before running the Tor Browser Bundle, you should make sure that you have the right version. + The software you receive is accompanied by a file with the same name as the bundle and the extension .asc. This .asc file is a GPG signature, and will allow you to verify the file you've downloaded is exactly the one that we intended you to get. + Before you can verify the signature, you will have to download and install GnuPG: + Windows: <a href="http://gpg4win.org/download.html">http://gpg4win.org/download.html</a> Mac OS X: <a href="http://macgpg.sourceforge.net/">http://macgpg.sourceforge.net/</a> Linux: Most Linux distributions come with GnuPG preinstalled. + Please note that you may need to edit the paths and the commands used below to get it to work on your system. + Erinn Clark signs the Tor Browser Bundles with key 0x63FEE659. To import Erinn's key, run: + <pre> + <code>gpg --keyserver hkp://keys.gnupg.net --recv-keys 0x63FEE659 +</code> + </pre> + After importing the key, verify that the fingerprint is correct: + <pre> + <code>gpg --fingerprint 0x63FEE659 +</code> + </pre> + You should see: + <pre> + <code>pub 2048R/63FEE659 2003-10-16 + Key fingerprint = 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659 +uid Erinn Clark <erinn(a)torproject.org> +uid Erinn Clark <erinn(a)debian.org> + +uid Erinn Clark <erinn(a)double-helix.org> +sub 2048R/EB399FD7 2003-10-16 +</code> + </pre> + To verify the signature of the package you downloaded, run the following command: + <pre> + <code>gpg --verify tor-browser-2.2.33-2_en-US.exe.asc tor-browser-2.2.33-2_en-US.exe +</code> + </pre> + The output should say "Good signature". A bad signature means that the file may have been tampered with. If you see a bad signature, send details 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. + Once you have verified the signature and seen the "Good signature" output, go ahead and extract the package archive. You should then see a directory similar to tor-browser_en-US. Inside that directory is another directory called Docs, which contains a file called changelog. You want to make sure that the version number on the top line of the changelog file matches the version number in the filename. + <h3 id="how-to-use-the-tor-browser-bundle">How to use the Tor Browser Bundle</h3> + After downloading the Tor Browser Bundle and extracting the package, you should have a directory with a few files in it. One of the files is an executable called "Start Tor Browser" (or "start-tor-browser", depending on your operating system). + When you start the Tor Browser Bundle, you will first see Vidalia start up and connect you to the Tor network. After that, you will see a browser confirming that you are now using Tor. This is done by displaying <a href="https://check.torproject.org/">https://check.torproject.org/</a>. You can now browse the Internet through Tor. + + Please note that it is important that you use the browser that comes with the bundle, and not your own browser. + + <h3 id="what-to-do-when-tor-does-not-connect">What to do when Tor does not connect</h3> + Some users will notice that Vidalia gets stuck when trying to connect to the Tor network. If this happens, make sure that you are connected to the Internet. If you need to connect to a proxy server, see How to use an open proxy below. + If your normal Internet connection is working, but Tor still can't connect to the network, try the following; open the Vidalia control panel, click on Message Log and select the Advanced tab. It may be that Tor won't connect because: + Your system clock is off: Make sure that the date and time on your system is correct, and restart Tor. You may need to synchronize your system clock with an Internet time server. + You are behind a restrictive firewall: To tell Tor to only try port 80 and port 443, open the Vidalia control panel, click on Settings and Network, and tick the box that says My firewall only lets me connect to certain ports. + Your anti-virus program is blocking Tor: Make sure that your anti-virus program is not preventing Tor from making network connections. + If Tor still doesn't work, it's likely that your Internet Service Provider (ISP) is blocking Tor. Very often this can be worked around with Tor bridges, hidden relays that aren't as easy to block. + If you need help with figuring out why Tor can't connect, send an email to help(a)rt.torproject.org and include the relevant parts from the log file. + <h3 id="how-to-find-a-bridge">How to find a bridge</h3> + To use a bridge, you will first have to locate one; you can either browse to <a href="https://bridges.torproject.org/">bridges.torproject.org</a>, or you can send an email to bridges(a)torproject.org. If you do send an email, please make sure that you write get bridges in the body of the email. Without this, you will not get a reply. Note that you need to send this email from either a gmail.com or a yahoo.com address. + Configuring more than one bridge address will make your Tor connection more stable, in case some of the bridges become unreachable. There is no guarantee that the bridge you are using now will work tomorrow, so you should make a habit of updating your list of bridges every so often. + <h3 id="how-to-use-a-bridge">How to use a bridge</h3> + Once you have a set of bridges to use, open the Vidalia control panel, click on Settings, Network and tick the box that says My ISP blocks connections to the Tor network. Enter the bridges in the box below, hit OK and start Tor again. + <h3 id="how-to-use-an-open-proxy">How to use an open proxy</h3> + If using a bridge does not work, try configuring Tor to use any HTTPS or SOCKS proxy to get access to the Tor network. This means even if Tor is blocked by your local network, open proxies can be safely used to connect to the Tor Network and on to the uncensored Internet. + The steps below assume you have a functional Tor/Vidalia configuration, and you have found a list of HTTPS, SOCKS4, or SOCKS5 proxies. + <ol style="list-style-type: decimal"> + <li>Open the Vidalia control panel, click on Settings.</li> + <li>Click Network. Select I use a proxy to access the Internet.</li> + <li>On the Address line, enter the open proxy address. This can be a hostname or an IP Address.</li> + <li>Enter the port for the proxy.</li> + <li>Generally, you do not need a username and password. If you do, enter the information in the proper fields.</li> + <li>Choose the Type of proxy you are using, whether HTTP/HTTPS, SOCKS4, or SOCKS5.</li> + <li>Push the OK button. Vidalia and Tor are now configured to use a proxy to access the rest of the Tor network.</li> + </ol> + <h2 id="frequently-asked-questions">Frequently Asked Questions</h2> + This section will answer some of the most common questions. If your question is not mentioned here, please send an email to help(a)rt.torproject.org. + <h3 id="unable-to-extract-the-archive">Unable to extract the archive</h3> + If you are using Windows and find that you cannot extract the archive, download and install <a href="http://www.7-zip.org/">7-Zip</a>. + If you are unable to download 7-Zip, try to rename the file from .z to .zip and use winzip to extract the archive. Before renaming the file, tell Windows to show file extensions: + <h4 id="windows-xp">Windows XP</h4> + <ol style="list-style-type: decimal"> + <li>Open My Computer</li> + <li>Click on Tools and choose Folder Options... in the menu</li> + <li>Click on the View tab</li> + <li>Uncheck Hide extensions for known file types and click OK</li> + </ol> + <h4 id="windows-vista">Windows Vista</h4> + <ol style="list-style-type: decimal"> + <li>Open Computer</li> + <li>Click on Organize and choose Folder and search options in the menu</li> + <li>Click on the View tab</li> + <li>Uncheck Hide extensions for known file types and click OK</li> + </ol> + <h4 id="windows-7">Windows 7</h4> + <ol style="list-style-type: decimal"> + <li>Open Computer</li> + <li>Click on Organize and choose Folder and search options in the menu</li> + <li>Click on the View tab</li> + <li>Uncheck Hide extensions for known file types and click OK</li> + </ol> + <h3 id="vidalia-asks-for-a-password">Vidalia asks for a password</h3> + You should not have to enter a password when starting Vidalia. If you are prompted for one, you are likely affected by one of these problems: + You are already running Vidalia and Tor: For example, this situation can happen if you installed the Vidalia bundle and now you're trying to run the Tor Browser Bundle. In that case, you will need to close the old Vidalia and Tor before you can run this one. + Vidalia crashed, but left Tor running: If the dialog that prompts you for a control password has a Reset button, you can click the button and Vidalia will restart Tor with a new random control password. If you do not see a Reset button, or if Vidalia is unable to restart Tor for you; go into your process or task manager, and terminate the Tor process. Then use Vidalia to restart Tor. + For more information, see the <a href="https://torproject.org/docs/faq.html#VidaliaPassword">FAQ</a> on the Tor Project website. + <h3 id="flash-does-not-work">Flash does not work</h3> + For security reasons, Flash, Java, and other plugins are currently disabled for Tor. Plugins operate independently from Firefox and can perform activity on your computer that ruins your anonymity. + Most YouTube videos work with HTML5, and it is possible to view these videos over Tor. You need to join the <a href="https://www.youtube.com/html5">HTML5 trial</a> on the YouTube website before you can use the HTML5 player. + Note that the browser will not remember that you joined the trial once you close it, so you will need to re-join the trial the next time you run the Tor Browser Bundle. + Please see the <a href="https://www.torproject.org/torbutton/torbutton-faq.html#noflash">Torbutton FAQ</a> for more information. + <h3 id="i-want-to-use-another-browser">I want to use another browser</h3> + For security reasons, we recommend that you only browse the web through Tor using the Tor Browser Bundle. It is technically possible to use Tor with other browsers, but by doing so you open yourself up to potential attacks. + <h3 id="why-tor-is-slow">Why Tor is slow</h3> + Tor can sometimes be a bit slower than your normal Internet connection. After all, your traffic is sent through many different countries, sometimes across oceans around the world! + </body> +</html>

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 08 Oct '14

08 Oct '14

commit 054e352902dad41e74c60e9649226bf94c7123dc Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 8 20:45:10 2014 +0000 Update translations for gettor --- ug(a)Arab/gettor.po | 502 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 502 insertions(+) diff --git a/ug(a)Arab/gettor.po b/ug(a)Arab/gettor.po new file mode 100644 index 0000000..4c1e1a4 --- /dev/null +++ b/ug(a)Arab/gettor.po @@ -0,0 +1,502 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-01-19 13:40+0100\n" +"PO-Revision-Date: 2010-11-30 05:01+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Uighur (Arabic) (http://www.transifex.com/projects/p/torproject/language/ug@Arab/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ug@Arab\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: lib/gettor/i18n.py:27 +msgid "Hello, This is the \"GetTor\" robot." +msgstr "" + +#: lib/gettor/i18n.py:29 +msgid "Thank you for your request." +msgstr "" + +#: lib/gettor/i18n.py:31 +msgid "" +"Unfortunately, we won't answer you at this address. You should make\n" +"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n" +"one of those." +msgstr "" + +#: lib/gettor/i18n.py:35 +msgid "" +"We only process requests from email services that support \"DKIM\",\n" +"which is an email feature that lets us verify that the address in the\n" +"\"From\" line is actually the one who sent the mail." +msgstr "" + +#: lib/gettor/i18n.py:39 +msgid "" +"(We apologize if you didn't ask for this mail. Since your email is from\n" +"a service that doesn't use DKIM, we're sending a short explanation,\n" +"and then we'll ignore this email address for the next day or so.)" +msgstr "" + +#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:135 +msgid "" +"If you have any questions or it doesn't work, you can contact a\n" +"human at this support email address: help(a)rt.torproject.org" +msgstr "" + +#: lib/gettor/i18n.py:46 +msgid "" +"I will mail you a Tor package, if you tell me which one you want.\n" +"Please select one of the following package names:\n" +"\n" +" windows\n" +" macos-i386\n" +" macos-ppc\n" +" linux-i386\n" +" linux-x86_64\n" +" obfs-windows\n" +" obfs-macos-i386\n" +" obfs-macos-x86_64\n" +" obfs-linux-i386\n" +" obfs-linux-x86_64\n" +" source" +msgstr "" + +#: lib/gettor/i18n.py:61 +msgid "" +"Please reply to this mail, and tell me a single package name anywhere \n" +"in the body of your email." +msgstr "" + +#: lib/gettor/i18n.py:64 +msgid "" +"OBTAINING LOCALIZED VERSIONS OF TOR\n" +"===================================" +msgstr "" + +#: lib/gettor/i18n.py:67 +msgid "" +"To get a version of Tor translated into your language, specify the\n" +"language you want in the address you send the mail to:\n" +"\n" +" gettor+fa(a)torproject.org" +msgstr "" + +#: lib/gettor/i18n.py:72 +msgid "" +"This example will give you the requested package in a localized\n" +"version for Farsi (Persian). Check below for a list of supported language\n" +"codes. " +msgstr "" + +#: lib/gettor/i18n.py:76 +msgid " List of supported locales:" +msgstr "" + +#: lib/gettor/i18n.py:78 +msgid "Here is a list of all available languages:" +msgstr "" + +#: lib/gettor/i18n.py:80 +msgid "" +" gettor+ar(a)torproject.org: Arabic\n" +" gettor+de(a)torproject.org: German\n" +" gettor+en(a)torproject.org: English\n" +" gettor+es(a)torproject.org: Spanish\n" +" gettor+fa(a)torproject.org: Farsi (Iran)\n" +" gettor+fr(a)torproject.org: French\n" +" gettor+it(a)torproject.org: Italian\n" +" gettor+nl(a)torproject.org: Dutch\n" +" gettor+pl(a)torproject.org: Polish\n" +" gettor+ru(a)torproject.org: Russian\n" +" gettor+zh(a)torproject.org: Chinese" +msgstr "" + +#: lib/gettor/i18n.py:92 +msgid "If you select no language, you will receive the English version." +msgstr "" + +#: lib/gettor/i18n.py:94 +msgid "" +"SMALLER SIZED PACKAGES\n" +"======================" +msgstr "" + +#: lib/gettor/i18n.py:97 +msgid "" +"If your bandwith is low or your provider doesn't allow you to\n" +"receive large attachments in your email, GetTor can send you several\n" +"small packages instead of one big one." +msgstr "" + +#: lib/gettor/i18n.py:101 +msgid "" +"Simply include the keyword 'split' in a new line on its own (this part\n" +"is important!) like so: \n" +" \n" +" windows\n" +" split" +msgstr "" + +#: lib/gettor/i18n.py:107 +msgid "" +"Sending this text in an email to GetTor will cause it to send you \n" +"the Tor Browser Bundle in a number of 1,4MB attachments." +msgstr "" + +#: lib/gettor/i18n.py:110 +msgid "" +"After having received all parts, you need to re-assemble them to \n" +"one package again. This is done as follows:" +msgstr "" + +#: lib/gettor/i18n.py:113 +msgid "1.) Save all received attachments into one folder on your disk." +msgstr "" + +#: lib/gettor/i18n.py:115 +msgid "" +"2.) Unzip all files ending in \".z\". If you saved all attachments to\n" +"a fresh folder before, simply unzip all files in that folder. If you don't\n" +"know how to unzip the .z files, please see the UNPACKING THE FILES section." +msgstr "" + +#: lib/gettor/i18n.py:119 +msgid "" +"3.) Verify all files as described in the mail you received with \n" +"each package. (gpg --verify)" +msgstr "" + +#: lib/gettor/i18n.py:122 +msgid "" +"4.) Now unpack the multi-volume archive into one file by double-\n" +"clicking the file ending in \"..split.part01.exe\". This should start the \n" +"process automatically." +msgstr "" + +#: lib/gettor/i18n.py:126 +msgid "" +"5.) After unpacking is finished, you should find a newly created \n" +"\".exe\" file in your destination folder. Simply doubleclick\n" +"that and Tor Browser Bundle should start within a few seconds." +msgstr "" + +#: lib/gettor/i18n.py:130 +msgid "6.) That's it. You're done. Thanks for using Tor and have fun!" +msgstr "" + +#: lib/gettor/i18n.py:132 +msgid "" +"SUPPORT\n" +"=======" +msgstr "" + +#: lib/gettor/i18n.py:138 +msgid "" +"Here's your requested software as a zip file. Please unzip the\n" +"package and verify the signature." +msgstr "" + +#: lib/gettor/i18n.py:141 +msgid "" +"VERIFY SIGNATURE\n" +"================\n" +"If your computer has GnuPG installed, use the gpg commandline \n" +"tool as follows after unpacking the zip file:\n" +"\n" +" gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US.exe" +msgstr "" + +#: lib/gettor/i18n.py:148 +msgid "" +"The output should look somewhat like this:\n" +"\n" +" gpg: Good signature from 'Erinn Clark <...>'" +msgstr "" + +#: lib/gettor/i18n.py:152 +msgid "" +"If you're not familiar with commandline tools, try looking for\n" +"a graphical user interface for GnuPG on this website:\n" +"\n" +" http://www.gnupg.org/related_software/frontends.html" +msgstr "" + +#: lib/gettor/i18n.py:157 +msgid "" +"BLOCKED ACCESS / CENSORSHIP\n" +"===========================" +msgstr "" + +#: lib/gettor/i18n.py:160 +msgid "" +"If your Internet connection blocks access to the Tor network, you\n" +"may need a bridge relay. Bridge relays (or \"bridges\" for short)\n" +"are Tor relays that aren't listed in the main directory. Since there\n" +"is no complete public list of them, even if your ISP is filtering\n" +"connections to all the known Tor relays, they probably won't be able\n" +"to block all the bridges." +msgstr "" + +#: lib/gettor/i18n.py:167 +msgid "" +"You can acquire a bridge by sending an email that contains \"get bridges\"\n" +"in the body of the email to the following email address:\n" +"\n" +" bridges(a)torproject.org" +msgstr "" + +#: lib/gettor/i18n.py:172 +msgid "" +"It is also possible to fetch bridges with a web browser at the following\n" +"url: https://bridges.torproject.org/" +msgstr "" + +#: lib/gettor/i18n.py:175 +msgid "" +"Another censorship circumvention tool you can request from GetTor is\n" +"the Tor Obfsproxy Browser Bundle. Please read the package descriptions for\n" +"which package you should request to receive this." +msgstr "" + +#: lib/gettor/i18n.py:179 +msgid "" +"IMPORTANT NOTE:\n" +"Since this is part of a split-file request, you need to wait for\n" +"all split files to be received by you before you can save them all\n" +"into the same directory and unpack them by double-clicking the\n" +"first file." +msgstr "" + +#: lib/gettor/i18n.py:185 +msgid "" +"Packages might arrive out of order! Please make sure you received\n" +"all packages before you attempt to unpack them!" +msgstr "" + +#: lib/gettor/i18n.py:188 +#, python-format +msgid "" +"It was successfully understood. Your request is currently being processed.\n" +"Your package (%s) should arrive within the next ten minutes." +msgstr "" + +#: lib/gettor/i18n.py:191 +msgid "" +"If it doesn't arrive, the package might be too big for your mail provider.\n" +"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account." +msgstr "" + +#: lib/gettor/i18n.py:194 +msgid "" +"Unfortunately we are currently experiencing problems and we can't fulfill\n" +"your request right now. Please be patient as we try to resolve this issue." +msgstr "" + +#: lib/gettor/i18n.py:197 +msgid "" +"Unfortunately there is no split package available for the package you\n" +"requested. Please send us another package name or request the same package \n" +"again, but remove the 'split' keyword. In that case we'll send you the whole \n" +"package. Make sure this is what you want." +msgstr "" + +#: lib/gettor/i18n.py:202 +msgid "" +"UNPACKING THE FILES\n" +"===================" +msgstr "" + +#: lib/gettor/i18n.py:205 +msgid "" +"The easiest way to unpack the files you received is to install 7-Zip,\n" +"a free file compression/uncompression tool. If it isn't installed on\n" +"your computer yet, you can download it here:\n" +"\n" +" http://www.7-zip.org/" +msgstr "" + +#: lib/gettor/i18n.py:211 +msgid "" +"When 7-Zip is installed, you can open the .z archive you received from\n" +"us by double-clicking on it." +msgstr "" + +#: lib/gettor/i18n.py:214 +msgid "" +"An alternative way to get the .z files extraced is to rename them to\n" +".zip. For example, if you recevied a file called \"windows.z\", rename it to \n" +"\"windows.zip\". You should then be able to extract the archive with common \n" +"file archiver programs that probably are already installed on your computer." +msgstr "" + +#: lib/gettor/i18n.py:219 +msgid "" +"Please reply to this mail, and tell me a single package name anywhere\n" +"in your reply. Here's a short explanation of what these packages are:" +msgstr "" + +#: lib/gettor/i18n.py:222 +msgid "" +"windows:\n" +"The Tor Browser Bundle package for Windows operating systems. If you're \n" +"running some version of Windows, like Windows XP, Windows Vista or \n" +"Windows 7, this is the package you should get." +msgstr "" + +#: lib/gettor/i18n.py:227 +msgid "" +"macos-i386:\n" +"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 "" + +#: lib/gettor/i18n.py:231 +msgid "" +"macos-ppc:\n" +"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 "" + +#: lib/gettor/i18n.py:235 +msgid "" +"linux-i386:\n" +"The Tor Browser Bundle package for Linux, 32bit versions." +msgstr "" + +#: lib/gettor/i18n.py:238 +msgid "" +"Note that this package is rather large and needs your email provider to \n" +"allow for attachments of about 30MB in size." +msgstr "" + +#: lib/gettor/i18n.py:241 +msgid "" +"linux-x86_64:\n" +"The Tor Browser Bundle package for Linux, 64bit versions." +msgstr "" + +#: lib/gettor/i18n.py:244 +msgid "" +"obfs-windows:\n" +"The Tor Obfsproxy Browser Bundle for Windows operating systems. If you need\n" +"strong censorship circumvention and you are running some version of the \n" +"Windows, like Windows XP, Windows Vista or Windows 7, this is the package\n" +"you should get." +msgstr "" + +#: lib/gettor/i18n.py:250 +msgid "" +"obfs-macos-i386:\n" +"The Tor Obfsproxy Browser Bundle package for OS X, 32bit Intel CPU \n" +"architecture." +msgstr "" + +#: lib/gettor/i18n.py:254 +msgid "" +"obfs-macos-x86_64:\n" +"The Tor Obfsproxy Browser Bundle package for OS X, 64bit Intel CPU \n" +"architecture." +msgstr "" + +#: lib/gettor/i18n.py:258 +msgid "" +"obfs-linux-i386:\n" +"The Tor Obfsproxy Browser Bundle package for Linux, 32bit Intel CPU \n" +"architecture." +msgstr "" + +#: lib/gettor/i18n.py:262 +msgid "" +"obfs-linux-x86_64:\n" +"The Tor Obfsproxy Browser Bundle package for Linux, 64bit Intel CPU \n" +"architecture." +msgstr "" + +#: lib/gettor/i18n.py:266 +msgid "" +"source:\n" +"The Tor source code, for experts. Most users do not want this package." +msgstr "" + +#: lib/gettor/i18n.py:269 +msgid "" +"FREQUENTLY ASKED QUESTIONS\n" +"==========================" +msgstr "" + +#: lib/gettor/i18n.py:272 +msgid "What is Tor?" +msgstr "" + +#: lib/gettor/i18n.py:274 +msgid "The name \"Tor\" can refer to several different components." +msgstr "" + +#: lib/gettor/i18n.py:276 +msgid "" +"The Tor software is a program you can run on your computer that helps \n" +"keep you safe on the Internet. Tor protects you by bouncing your \n" +"communications around a distributed network of relays run by volunteers \n" +"all around the world: it prevents somebody watching your Internet connection \n" +"from learning what sites you visit, and it prevents the sites you visit from \n" +"learning your physical location. This set of volunteer relays is called the \n" +"Tor network. You can read more about how Tor works here:\n" +"\n" +" https://www.torproject.org/about/overview.html.en" +msgstr "" + +#: lib/gettor/i18n.py:286 +msgid "What is the Tor Browser Bundle?" +msgstr "" + +#: lib/gettor/i18n.py:288 +msgid "" +"The Browser Bundle (TBB) is the package we recommend to most users. \n" +"The bundle comes with everything you need to safely browse the Internet.\n" +"Just extract it and run." +msgstr "" + +#: lib/gettor/i18n.py:292 +msgid "What package should I request?" +msgstr "" + +#: lib/gettor/i18n.py:294 +msgid "" +"This depends on the operating system you use. For instance, if your\n" +"operating system is Microsoft Windows, you should request \"windows\". Here\n" +"is a short explanation of all packages to request and what operating \n" +"systems there are suitable for:" +msgstr "" + +#: lib/gettor/i18n.py:299 +msgid "How do I extract the file(s) you sent me?" +msgstr "" + +#: lib/gettor/i18n.py:301 +msgid "QUESTION:" +msgstr "" + +#: lib/gettor/i18n.py:303 +msgid "ANSWER:" +msgstr "" + +#: lib/gettor/i18n.py:305 +#, python-format +msgid "" +"Sorry, but the package you requested (%s) is too large for your \n" +"provider to accept as an attachment. Try using another provider that allows \n" +"for larger email attachments. Or try one of the following mirrors:\n" +"\n" +" https://www.oignon.net/dist/torbrowser/\n" +" https://tor.beme-it.de/dist/torbrowser/\n" +" https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/" +msgstr ""

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 08 Oct '14

08 Oct '14

commit 36010562f7f27fb81ba02c27e6b5141bfae52695 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 8 20:45:03 2014 +0000 Update translations for bridgedb --- ug(a)Arab/LC_MESSAGES/bridgedb.po | 356 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 356 insertions(+) diff --git a/ug(a)Arab/LC_MESSAGES/bridgedb.po b/ug(a)Arab/LC_MESSAGES/bridgedb.po new file mode 100644 index 0000000..1385e10 --- /dev/null +++ b/ug(a)Arab/LC_MESSAGES/bridgedb.po @@ -0,0 +1,356 @@ +# Translations template for BridgeDB. +# Copyright (C) 2014 'The Tor Project, Inc.' +# This file is distributed under the same license as the BridgeDB project. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" +"POT-Creation-Date: 2014-07-26 02:11+0000\n" +"PO-Revision-Date: 2011-02-19 16:53+0000\n" +"Last-Translator: Isis Lovecruft <isis(a)torproject.org>\n" +"Language-Team: Uighur (Arabic) (http://www.transifex.com/projects/p/torproject/language/ug@Arab/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.6\n" +"Language: ug@Arab\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in +#. any string (regardless of capitalization and/or punctuation): +#. "BridgeDB" +#. "pluggable transport" +#. "pluggable transports" +#. "obfs2" +#. "obfs3" +#. "scramblesuit" +#. "fteproxy" +#. "Tor" +#. "Tor Browser" +#: lib/bridgedb/HTTPServer.py:121 +msgid "Sorry! Something went wrong with your request." +msgstr "" + +#: lib/bridgedb/strings.py:18 +msgid "[This is an automated message; please do not reply.]" +msgstr "" + +#: lib/bridgedb/strings.py:20 +msgid "Here are your bridges:" +msgstr "" + +#: lib/bridgedb/strings.py:22 +#, python-format +msgid "" +"You have exceeded the rate limit. Please slow down! The minimum time between\n" +"emails is %s hours. All further emails during this time period will be ignored." +msgstr "" + +#: lib/bridgedb/strings.py:25 +msgid "" +"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" +msgstr "" + +#. TRANSLATORS: Please DO NOT translate the word "BridgeDB". +#: lib/bridgedb/strings.py:28 +msgid "Welcome to BridgeDB!" +msgstr "" + +#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". +#: lib/bridgedb/strings.py:30 +msgid "Currently supported transport TYPEs:" +msgstr "" + +#: lib/bridgedb/strings.py:31 +#, python-format +msgid "Hey, %s!" +msgstr "" + +#: lib/bridgedb/strings.py:32 +msgid "Hello, friend!" +msgstr "" + +#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101 +msgid "Public Keys" +msgstr "" + +#. TRANSLATORS: This string will end up saying something like: +#. "This email was generated with rainbows, unicorns, and sparkles +#. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." +#: lib/bridgedb/strings.py:37 +#, python-format +msgid "" +"This email was generated with rainbows, unicorns, and sparkles\n" +"for %s on %s at %s." +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor". +#. TRANSLATORS: Please DO NOT translate "Tor Network". +#: lib/bridgedb/strings.py:47 +#, python-format +msgid "" +"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" +"which can help obfuscate your connections to the Tor Network, making it more\n" +"difficult for anyone watching your internet traffic to determine that you are\n" +"using Tor.\n" +"\n" +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#: lib/bridgedb/strings.py:54 +msgid "" +"Some bridges with IPv6 addresses are also available, though some Pluggable\n" +"Transports aren't IPv6 compatible.\n" +"\n" +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, +#. regular, or unexciting". Like vanilla ice cream. It refers to bridges +#. which do not have Pluggable Transports, and only speak the regular, +#. boring Tor protocol. Translate it as you see fit. Have fun with it. +#: lib/bridgedb/strings.py:63 +#, python-format +msgid "" +"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" +"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" +"help to circumvent internet censorship in many cases.\n" +"\n" +msgstr "" + +#: lib/bridgedb/strings.py:76 +msgid "What are bridges?" +msgstr "" + +#: lib/bridgedb/strings.py:77 +#, python-format +msgid "%s Bridges %s are Tor relays that help you circumvent censorship." +msgstr "" + +#: lib/bridgedb/strings.py:82 +msgid "I need an alternative way of getting bridges!" +msgstr "" + +#: lib/bridgedb/strings.py:83 +#, python-format +msgid "" +"Another way to get bridges is to send an email to %s. Please note that you must\n" +"send the email using an address from one of the following email providers:\n" +"%s, %s or %s." +msgstr "" + +#: lib/bridgedb/strings.py:90 +msgid "My bridges don't work! I need help!" +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:92 +#, python-format +msgid "If your Tor doesn't work, you should email %s." +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:96 +msgid "" +"Try including as much info about your case as you can, including the list of\n" +"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" +"and any messages which Tor gave out, etc." +msgstr "" + +#: lib/bridgedb/strings.py:103 +msgid "Here are your bridge lines:" +msgstr "" + +#: lib/bridgedb/strings.py:104 +msgid "Get Bridges!" +msgstr "" + +#: lib/bridgedb/strings.py:108 +msgid "Please select options for bridge type:" +msgstr "" + +#: lib/bridgedb/strings.py:109 +msgid "Do you need IPv6 addresses?" +msgstr "" + +#: lib/bridgedb/strings.py:110 +#, python-format +msgid "Do you need a %s?" +msgstr "" + +#: lib/bridgedb/strings.py:114 +msgid "Your browser is not displaying images properly." +msgstr "" + +#: lib/bridgedb/strings.py:115 +msgid "Enter the characters from the image above..." +msgstr "" + +#: lib/bridgedb/strings.py:119 +msgid "How to start using your bridges" +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#: lib/bridgedb/strings.py:121 +#, python-format +msgid "" +"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" +"Browser download page %s to start Tor Browser." +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:125 +msgid "" +"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" +"the wizard until it asks:" +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:129 +msgid "" +"Does your Internet Service Provider (ISP) block or otherwise censor connections\n" +"to the Tor network?" +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:133 +msgid "" +"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" +"paste the bridge lines into the text input box. Finally, click 'Connect', and\n" +"you should be good to go! If you experience trouble, try clicking the 'Help'\n" +"button in the 'Tor Network Settings' wizard for further assistance." +msgstr "" + +#: lib/bridgedb/strings.py:141 +msgid "Displays this message." +msgstr "" + +#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the +#. same non-Pluggable Transport bridges described above as being +#. "plain-ol'-vanilla" bridges. +#: lib/bridgedb/strings.py:145 +msgid "Request vanilla bridges." +msgstr "" + +#: lib/bridgedb/strings.py:146 +msgid "Request IPv6 bridges." +msgstr "" + +#. TRANSLATORS: Please DO NOT translate the word the word "TYPE". +#: lib/bridgedb/strings.py:148 +msgid "Request a Pluggable Transport by TYPE." +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "GnuPG". +#: lib/bridgedb/strings.py:151 +msgid "Get a copy of BridgeDB's public GnuPG key." +msgstr "" + +#: lib/bridgedb/templates/base.html:92 +msgid "Report a Bug" +msgstr "" + +#: lib/bridgedb/templates/base.html:94 +msgid "Source Code" +msgstr "" + +#: lib/bridgedb/templates/base.html:97 +msgid "Changelog" +msgstr "" + +#: lib/bridgedb/templates/base.html:99 +msgid "Contact" +msgstr "" + +#. TRANSLATORS: Please translate this into some silly way to say +#. "There was a problem!" in your language. For example, +#. for Italian, you might translate this into "Mama mia!", +#. or for French: "Sacrebleu!". :) +#: lib/bridgedb/templates/bridges.html:66 +msgid "Uh oh, spaghettios!" +msgstr "" + +#: lib/bridgedb/templates/bridges.html:72 +msgid "There currently aren't any bridges available..." +msgstr "" + +#: lib/bridgedb/templates/bridges.html:73 +#, python-format +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "" + +#: lib/bridgedb/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "" + +#: lib/bridgedb/templates/index.html:13 +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "" + +#: lib/bridgedb/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "" + +#: lib/bridgedb/templates/index.html:27 +#, python-format +msgid "Get %s bridges %s" +msgstr "" + +#: lib/bridgedb/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "" + +#: lib/bridgedb/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. (These are used to insert HTML5 underlining tags, to mark accesskeys +#. for disabled users.) +#: lib/bridgedb/templates/options.html:38 +#, python-format +msgid "%sJ%sust give me bridges!" +msgstr "" + +#: lib/bridgedb/templates/options.html:52 +msgid "Advanced Options" +msgstr "" + +#: lib/bridgedb/templates/options.html:88 +msgid "No" +msgstr "" + +#: lib/bridgedb/templates/options.html:89 +msgid "none" +msgstr "" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." +#: lib/bridgedb/templates/options.html:130 +#, python-format +msgid "%sY%ses!" +msgstr "" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Please do NOT translate the word "bridge"! +#: lib/bridgedb/templates/options.html:154 +#, python-format +msgid "%sG%set Bridges" +msgstr ""

1 0

[torbutton/master] Bug 13366: Fix cert exemption dialog when disk storage is enabled.
by mikeperry＠torproject.org 08 Oct '14

08 Oct '14

commit 32cb8c1dc8684b179f954c1299f2fadf564175d7 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Oct 8 13:23:39 2014 -0700 Bug 13366: Fix cert exemption dialog when disk storage is enabled. --- src/CHANGELOG | 1 + src/chrome/content/torbutton.js | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/CHANGELOG b/src/CHANGELOG index 0d68ab6..44b8999 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -4,6 +4,7 @@ * Bug 13138: ESR31-about:tor shows "Tor is not working" * Bug 12947: Adapt session storage blocker to ESR 31. * Bug 10716: Take care of drag/drop events in ESR 31. + * Bug 13366: Fix cert exemption dialog when disk storage is enabled. 1.6.12.3 23 Sep 2014 diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index ca52fa9..ffea83b 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1984,6 +1984,8 @@ function torbutton_update_disk_prefs() { m_tb_prefs.setBoolPref("browser.privatebrowsing.autostart", mode); m_tb_prefs.setBoolPref("browser.cache.disk.enable", !mode); + m_tb_prefs.setBoolPref("security.nocertdb", mode); + // No way to clear this beast during New Identity. Leave it off. //m_tb_prefs.setBoolPref("dom.indexedDB.enabled", !mode);

1 0

[chutney/master] Create a middle flavour, and size variants for basic and middle
by nickm＠torproject.org 08 Oct '14

08 Oct '14

commit c16848c3e4dc325db1ad6f795a4e4ecbf0956191 Author: teor <teor2345(a)gmail.com> Date: Thu Oct 2 02:22:02 2014 +1000 Create a middle flavour, and size variants for basic and middle Create a middle flavour, which includes non-exit routers. Create size variants for basic and middle, with 25 and 100 tor nodes. As these variants get larger, approximate the proportions of the global tor network. --- networks/basic-025 | 7 +++++++ networks/basic-100 | 7 +++++++ networks/middle | 8 ++++++++ networks/middle-025 | 8 ++++++++ networks/middle-100 | 8 ++++++++ 5 files changed, 38 insertions(+) diff --git a/networks/basic-025 b/networks/basic-025 new file mode 100644 index 0000000..103224b --- /dev/null +++ b/networks/basic-025 @@ -0,0 +1,7 @@ +Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") +Relay = Node(tag="r", relay=1, torrc="relay.tmpl") +Client = Node(tag="c", torrc="client.tmpl") + +NODES = Authority.getN(4) + Relay.getN(16) + Client.getN(5) + +ConfigureNodes(NODES) diff --git a/networks/basic-100 b/networks/basic-100 new file mode 100644 index 0000000..561c4c4 --- /dev/null +++ b/networks/basic-100 @@ -0,0 +1,7 @@ +Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") +Relay = Node(tag="r", relay=1, torrc="relay.tmpl") +Client = Node(tag="c", torrc="client.tmpl") + +NODES = Authority.getN(5) + Relay.getN(35) + Client.getN(60) + +ConfigureNodes(NODES) diff --git a/networks/middle b/networks/middle new file mode 100644 index 0000000..168f837 --- /dev/null +++ b/networks/middle @@ -0,0 +1,8 @@ +Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") +Middle = Node(tag="m", relay=1, torrc="relay-non-exit.tmpl") +Relay = Node(tag="r", relay=1, torrc="relay.tmpl") +Client = Node(tag="c", torrc="client.tmpl") + +NODES = Authority.getN(3) + Middle.getN(4) + Relay.getN(4) + Client.getN(2) + +ConfigureNodes(NODES) diff --git a/networks/middle-025 b/networks/middle-025 new file mode 100644 index 0000000..7687b8c --- /dev/null +++ b/networks/middle-025 @@ -0,0 +1,8 @@ +Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") +Middle = Node(tag="m", relay=1, torrc="relay-non-exit.tmpl") +Relay = Node(tag="r", relay=1, torrc="relay.tmpl") +Client = Node(tag="c", torrc="client.tmpl") + +NODES = Authority.getN(4) + Middle.getN(10) + Relay.getN(6) + Client.getN(5) + +ConfigureNodes(NODES) diff --git a/networks/middle-100 b/networks/middle-100 new file mode 100644 index 0000000..d67702c --- /dev/null +++ b/networks/middle-100 @@ -0,0 +1,8 @@ +Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") +Middle = Node(tag="m", relay=1, torrc="relay-non-exit.tmpl") +Relay = Node(tag="r", relay=1, torrc="relay.tmpl") +Client = Node(tag="c", torrc="client.tmpl") + +NODES = Authority.getN(5) + Middle.getN(25) + Relay.getN(10) + Client.getN(60) + +ConfigureNodes(NODES)

1 0

[chutney/master] Merge remote-tracking branches 'teor/issue-13161-template-tweaks' and 'teor/issue-13161-check-torrc-options'
by nickm＠torproject.org 08 Oct '14

08 Oct '14

commit f5f677362d48f0d83ee349f642bda4e5dfd1c7dc Merge: c16848c df1d0a1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 8 15:54:44 2014 -0400 Merge remote-tracking branches 'teor/issue-13161-template-tweaks' and 'teor/issue-13161-check-torrc-options' lib/chutney/TorNet.py | 157 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 145 insertions(+), 12 deletions(-)

1 0

[chutney/master] Fix typos in TorNet.py
by nickm＠torproject.org 08 Oct '14

08 Oct '14

commit 6d5cb08836b235ccbdf184c9a241be3f281c13f0 Author: teor <teor2345(a)gmail.com> Date: Wed Oct 1 19:35:45 2014 +1000 Fix typos in TorNet.py --- lib/chutney/TorNet.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 6a1fc8b..32dc173 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -220,7 +220,7 @@ class LocalNodeBuilder(NodeBuilder): torrc_template = self._getTorrcTemplate() output = torrc_template.format(self._env) if checkOnly: - # XXXX Is it time-cosuming to format? If so, cache here. + # XXXX Is it time-consuming to format? If so, cache here. return with open(fn_out, 'w') as f: f.write(output)

1 0

[chutney/master] Stop using unsupported torrc options
by nickm＠torproject.org 08 Oct '14

08 Oct '14

commit b4027b16fc102165f6a29e58bc09d1d7631f21cc Author: teor <teor2345(a)gmail.com> Date: Wed Oct 1 22:24:04 2014 +1000 Stop using unsupported torrc options When writing a torrc file, check if the selected tor binary supports the option in each line we're writing out, using tor --list-torrc-options. If it doesn't, disable the option line by commenting it out. (And add a note "unsupported" to avoid confusion.) --- lib/chutney/TorNet.py | 72 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 69 insertions(+), 3 deletions(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 6a1fc8b..e4ddc7a 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -25,6 +25,7 @@ import chutney.Templating import chutney.Traffic _BASE_ENVIRON = None +_TORRC_OPTIONS = None _THE_NETWORK = None @@ -213,8 +214,10 @@ class LocalNodeBuilder(NodeBuilder): self._env = env def _createTorrcFile(self, checkOnly=False): - """Write the torrc file for this node. If checkOnly, just make sure - that the formatting is indeed possible. + """Write the torrc file for this node, disabling any options + that are not supported by env's tor binary using comments. + If checkOnly, just make sure that the formatting is indeed + possible. """ fn_out = self._getTorrcFname() torrc_template = self._getTorrcTemplate() @@ -222,8 +225,66 @@ class LocalNodeBuilder(NodeBuilder): if checkOnly: # XXXX Is it time-cosuming to format? If so, cache here. return + # now filter the options we're about to write, commenting out + # the options that the current tor binary doesn't support + tor = self._env['tor'] + # find the options the current tor binary supports, and cache them + if tor not in _TORRC_OPTIONS: + # Note: some versions of tor (e.g. 0.2.4.23) require + # --list-torrc-options to be the first argument + cmdline = [ + tor, + "--list-torrc-options", + "--hush"] + try: + opts = subprocess.check_output(cmdline, + bufsize=-1, + universal_newlines=True) + except OSError as e: + # only catch file not found error + if e.errno == errno.ENOENT: + print ("Cannot find tor binary %r. Use " + "CHUTNEY_TOR environment variable to set the " + "path, or put the binary into $PATH.") % tor + sys.exit(0) + else: + raise + # check we received a list of options, and nothing else + assert re.match(r'(^\w+$)+', opts, flags=re.MULTILINE) + torrc_opts = opts.split() + # cache the options for this tor binary's path + _TORRC_OPTIONS[tor] = torrc_opts + else: + torrc_opts = _TORRC_OPTIONS[tor] + # check if each option is supported before writing it + # TODO: what about unsupported values? + # e.g. tor 0.2.4.23 doesn't support TestingV3AuthInitialVoteDelay 2 + # but later version do. I say throw this one to the user. with open(fn_out, 'w') as f: - f.write(output) + # we need to do case-insensitive option comparison + # even if this is a static whitelist, + # so we convert to lowercase as close to the loop as possible + lower_opts = [opt.lower() for opt in torrc_opts] + # keep ends when splitting lines, so we can write them out + # using writelines() without messing around with "\n"s + for line in output.splitlines(True): + # check if the first word on the line is a supported option, + # preserving empty lines and comment lines + sline = line.strip() + if (len(sline) == 0 + or sline[0] == '#' + or sline.split()[0].lower() in lower_opts): + f.writelines([line]) + else: + # well, this could get spammy + # TODO: warn once per option per tor binary + # TODO: print tor version? + print ("The tor binary at %r does not support the " + "option in the torrc line:\n" + "%r") % (tor, line.strip()) + # we could decide to skip these lines entirely + # TODO: write tor version? + f.writelines(["# " + tor + " unsupported: " + line]) def _getTorrcTemplate(self): """Return the template used to write the torrc for this node.""" @@ -757,8 +818,13 @@ def runConfigFile(verb, f): def main(): global _BASE_ENVIRON + global _TORRC_OPTIONS global _THE_NETWORK _BASE_ENVIRON = TorEnviron(chutney.Templating.Environ(**DEFAULTS)) + # _TORRC_OPTIONS gets initialised on demand as a map of + # "/path/to/tor" => ["SupportedOption1", "SupportedOption2", ...] + # Or it can be pre-populated as a static whitelist of options + _TORRC_OPTIONS = dict() _THE_NETWORK = Network(_BASE_ENVIRON) if len(sys.argv) < 3:

1 0

[chutney/master] Ensure chutney relays can exit to localhost IPv4 and IPv6
by nickm＠torproject.org 08 Oct '14

08 Oct '14

commit 5e3b8ce8c3b42ff9e0ae1b6ba99e46e769cf3366 Author: teor <teor2345(a)gmail.com> Date: Thu Oct 2 00:21:03 2014 +1000 Ensure chutney relays can exit to localhost IPv4 and IPv6 Keep up to date with changes in the latest tor versions, where localhost exits are blocked by default, even in TestingTorNetworks. relay.tmpl: permit exits to IPv4 and IPv6 (tor versions without the torrc IPv6 options will benefit from the changes in issue-13161-check-torrc-options). relay-exit-v4-only.tmpl, relay-exit-v6-only.tmpl, relay-non-exit.tmpl: self-explanatory variants. exit-v4.i, exit-v6.i: include files containing the exit lines for IPv4 and IPv6. --- torrc_templates/exit-v4.i | 3 +++ torrc_templates/exit-v6.i | 4 ++++ torrc_templates/relay-exit-v4-only.tmpl | 6 ++++++ torrc_templates/relay-exit-v6-only.tmpl | 6 ++++++ torrc_templates/relay-non-exit.tmpl | 9 +++++++++ torrc_templates/relay.tmpl | 19 ++++++++++--------- 6 files changed, 38 insertions(+), 9 deletions(-) diff --git a/torrc_templates/exit-v4.i b/torrc_templates/exit-v4.i new file mode 100644 index 0000000..eca35e0 --- /dev/null +++ b/torrc_templates/exit-v4.i @@ -0,0 +1,3 @@ + +# An exit policy that allows exiting to IPv4 localhost +ExitPolicy accept 127.0.0.0/8:* diff --git a/torrc_templates/exit-v6.i b/torrc_templates/exit-v6.i new file mode 100644 index 0000000..74232a5 --- /dev/null +++ b/torrc_templates/exit-v6.i @@ -0,0 +1,4 @@ + +# An exit policy that allows exiting to IPv6 localhost +ExitPolicy accept [::1]:* +IPv6Exit 1 diff --git a/torrc_templates/relay-exit-v4-only.tmpl b/torrc_templates/relay-exit-v4-only.tmpl new file mode 100644 index 0000000..ada1ca5 --- /dev/null +++ b/torrc_templates/relay-exit-v4-only.tmpl @@ -0,0 +1,6 @@ +${include:relay-non-exit.tmpl} + +# An exit relay that can exit to IPv4 localhost only +# (newer versions of tor need this to be explicitly configured) + +${include:exit-v4.i} diff --git a/torrc_templates/relay-exit-v6-only.tmpl b/torrc_templates/relay-exit-v6-only.tmpl new file mode 100644 index 0000000..77a6c04 --- /dev/null +++ b/torrc_templates/relay-exit-v6-only.tmpl @@ -0,0 +1,6 @@ +${include:relay-non-exit.tmpl} + +# An exit relay that can exit to IPv6 localhost only +# (newer versions of tor need this to be explicitly configured) + +${include:exit-v4.i} diff --git a/torrc_templates/relay-non-exit.tmpl b/torrc_templates/relay-non-exit.tmpl new file mode 100644 index 0000000..2f4b7f1 --- /dev/null +++ b/torrc_templates/relay-non-exit.tmpl @@ -0,0 +1,9 @@ +${include:common.i} +SocksPort 0 +OrPort $orport +Address $ip +DirPort $dirport +#NOTE: Setting TestingServerConsensusDownloadSchedule doesn't +# help -- dl_stats.schedule is not DL_SCHED_CONSENSUS +# at boostrap time. +TestingServerDownloadSchedule 10, 2, 2, 4, 4, 8, 13, 18, 25, 40, 60 diff --git a/torrc_templates/relay.tmpl b/torrc_templates/relay.tmpl index 2f4b7f1..42ac329 100644 --- a/torrc_templates/relay.tmpl +++ b/torrc_templates/relay.tmpl @@ -1,9 +1,10 @@ -${include:common.i} -SocksPort 0 -OrPort $orport -Address $ip -DirPort $dirport -#NOTE: Setting TestingServerConsensusDownloadSchedule doesn't -# help -- dl_stats.schedule is not DL_SCHED_CONSENSUS -# at boostrap time. -TestingServerDownloadSchedule 10, 2, 2, 4, 4, 8, 13, 18, 25, 40, 60 +${include:relay-non-exit.tmpl} + +# This file is named "relay.tmpl" for compatibility with previous +# chutney versions + +# An exit relay that can exit to IPv4 & IPv6 localhost +# (newer versions of tor need this to be explicitly configured) + +${include:exit-v4.i} +${include:exit-v6.i}

1 0

[chutney/master] Increase relays to compensate for smaller guard fraction
by nickm＠torproject.org 08 Oct '14

08 Oct '14

commit 3b99c04489dba478c22e23d56015815d12609ea9 Author: teor <teor2345(a)gmail.com> Date: Thu Oct 2 00:33:21 2014 +1000 Increase relays to compensate for smaller guard fraction Since the guard percentage has been reduced from 50% to 25% of relays, we need more relays to compensate. This patch uses 8 relays, ensuring at least 2 guards on all known tor versions. --- networks/basic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/networks/basic b/networks/basic index b15a0b7..882ad79 100644 --- a/networks/basic +++ b/networks/basic @@ -2,6 +2,6 @@ Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") Relay = Node(tag="r", relay=1, torrc="relay.tmpl") Client = Node(tag="c", torrc="client.tmpl") -NODES = Authority.getN(3) + Relay.getN(5) + Client.getN(2) +NODES = Authority.getN(3) + Relay.getN(8) + Client.getN(2) ConfigureNodes(NODES)

1 0