tor-commits February 2014

tor-commits@lists.torproject.org

23 participants
1529 discussions

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 07 Feb '14

07 Feb '14

commit 86c353180305d060e6b0bed4b810b5f1a2f94bd3 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 7 11:15:20 2014 +0000 Update translations for https_everywhere --- en_GB/https-everywhere.properties | 4 ++-- en_GB/ssl-observatory.dtd | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/en_GB/https-everywhere.properties b/en_GB/https-everywhere.properties index 21feda9..43706aa 100644 --- a/en_GB/https-everywhere.properties +++ b/en_GB/https-everywhere.properties @@ -1,5 +1,5 @@ -# https-everywhere.menu.globalEnable = Enable HTTPS Everywhere -# https-everywhere.menu.globalDisable = Disable HTTPS Everywhere +https-everywhere.menu.globalEnable = Enable HTTPS Everywhere +https-everywhere.menu.globalDisable = Disable HTTPS Everywhere # https-everywhere.menu.enableDisable = Enable / Disable Rules # https-everywhere.menu.noRules = (No Rules for This Page) # https-everywhere.menu.unknownRules = (Rules for This Page Unknown) diff --git a/en_GB/ssl-observatory.dtd b/en_GB/ssl-observatory.dtd index 9457a96..df8f34d 100644 --- a/en_GB/ssl-observatory.dtd +++ b/en_GB/ssl-observatory.dtd @@ -86,7 +86,7 @@ looked at. Mouseover the options for further details:"> <!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory"> <!ENTITY ssl-observatory.warning.showcert "Show the certificate chain"> <!ENTITY ssl-observatory.warning.okay "I understand"> -<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:"> +<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificate(s) for this site:"> <!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection."> <!ENTITY ssl-observatory.prefs.self_signed

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 07 Feb '14

07 Feb '14

commit 0b6edc07af68f77bd3066ad1664732d7c1c7fc34 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 7 11:15:12 2014 +0000 Update translations for torcheck --- en_GB/torcheck.po | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/en_GB/torcheck.po b/en_GB/torcheck.po index c0a1ab5..0324fdc 100644 --- a/en_GB/torcheck.po +++ b/en_GB/torcheck.po @@ -2,12 +2,13 @@ # Copyright (C) 2008-2013 The Tor Project, Inc # # Translators: +# richardshaylor <rshaylor(a)me.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-01-02 08:22+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-02-07 11:11+0000\n" +"Last-Translator: richardshaylor <rshaylor(a)me.com>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,36 +24,36 @@ msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " "for further information about using Tor safely. You are now free to browse " "the Internet anonymously." -msgstr "" +msgstr "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> for further information about using Tor safely. You are now free to browse the Internet anonymously." msgid "There is a security update available for the Tor Browser Bundle." -msgstr "" +msgstr "There is a security update available for the Tor Browser Bundle." msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click " "here to go to the download page</a>" -msgstr "" +msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Click here to go to the download page</a>" msgid "Sorry. You are not using Tor." -msgstr "" +msgstr "Sorry. You are not using Tor." msgid "" "If you are attempting to use a Tor client, please refer to the <a " "href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" " href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for " "configuring your Tor client</a>." -msgstr "" +msgstr "If you are attempting to use a Tor client, please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for configuring your Tor client</a>." msgid "Sorry, your query failed or an unexpected response was received." -msgstr "" +msgstr "Sorry, your query failed or an unexpected response was received." msgid "" "A temporary service outage prevents us from determining if your source IP " "address is a <a href=\"https://www.torproject.org/\">Tor</a> node." -msgstr "" +msgstr "A temporary service outage prevents us from determining if your source IP address is a <a href=\"https://www.torproject.org/\">Tor</a> node." msgid "Your IP address appears to be: " -msgstr "" +msgstr "Your IP address appears to be: " msgid "Are you using Tor?" msgstr ""

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 07 Feb '14

07 Feb '14

commit ef36fc3921bb1c7f7860c63e5f0a746fd849b85e Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 7 11:15:07 2014 +0000 Update translations for tsum --- en_GB/short-user-manual_en_GB_noimg.xhtml | 132 +++++++++++++++++++++++++++++ 1 file changed, 132 insertions(+) diff --git a/en_GB/short-user-manual_en_GB_noimg.xhtml b/en_GB/short-user-manual_en_GB_noimg.xhtml new file mode 100644 index 0000000..681e5b7 --- /dev/null +++ b/en_GB/short-user-manual_en_GB_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

[tor-browser-bundle/master] Bug 10323: Omit libgcc and libstdc++ in TorBrowser
by gk＠torproject.org 07 Feb '14

07 Feb '14

commit f96736101ef8e3caf54723150cdb357dece75727 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Feb 7 09:31:12 2014 +0100 Bug 10323: Omit libgcc and libstdc++ in TorBrowser Since https://bugzilla.mozilla.org/show_bug.cgi?id=831707 and https://bugzilla.mozilla.org/show_bug.cgi?id=876416 landed Firefox code is linked statically against libgcc and libstdc++ when building with mingw-w64. We can therefore stop shipping both in Tor Browser Bundles based on Firefox 24 ESR. --- gitian/descriptors/windows/gitian-firefox.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index f985b56..1c151ea 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -164,8 +164,6 @@ script: | # make -C obj-* package INNER_MAKE_PACKAGE=true cp -a obj-*/dist/firefox/* $INSTDIR/Browser/ - cp -a /usr/i686-w64-mingw32/lib/libgcc_s_sjlj-1.dll $INSTDIR/Browser/ - cp -a /usr/i686-w64-mingw32/lib/libstdc*dll $INSTDIR/Browser/ cp -a ~/build/msvcr100.dll $INSTDIR/Browser/ # # What the hell are these three bytes anyways?

1 0

[translation/tails-iuk] Update translations for tails-iuk
by translation＠torproject.org 07 Feb '14

07 Feb '14

commit 93c4fee536ad08008a612731c65250f9a53a0e4a Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 7 06:45:46 2014 +0000 Update translations for tails-iuk --- fa.po | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/fa.po b/fa.po index ee3b51d..b7ca164 100644 --- a/fa.po +++ b/fa.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# terra.geogra <e.jahan(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2014-01-07 20:17+0100\n" -"PO-Revision-Date: 2014-01-08 08:17+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-01-29 14:37+0100\n" +"PO-Revision-Date: 2014-02-07 06:40+0000\n" +"Last-Translator: terra.geogra <e.jahan(a)gmail.com>\n" "Language-Team: Persian (http://www.transifex.com/projects/p/torproject/language/fa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -45,11 +46,11 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:224 msgid "The system is up-to-date" -msgstr "" +msgstr "سیستم به روز است" #: ../lib/Tails/IUK/Frontend.pm:229 msgid "This version of Tails is outdated, and may have security issues." -msgstr "" +msgstr "این نسخه تِیلز کهنه است و ممکن است کاستی های امنینی داشته باشد" #: ../lib/Tails/IUK/Frontend.pm:262 #, perl-brace-format @@ -73,7 +74,7 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:305 msgid "Error while detecting available upgrades" -msgstr "" +msgstr "ایرادی در هنگام پیدا کردن بروز رسانی های موجود پیدا شد" #: ../lib/Tails/IUK/Frontend.pm:315 #, perl-brace-format @@ -93,7 +94,7 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:330 msgid "Upgrade available" -msgstr "" +msgstr "بروز رسانی موجود است" #: ../lib/Tails/IUK/Frontend.pm:331 msgid "Upgrade now" @@ -121,7 +122,7 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:412 msgid "Downloading upgrade" -msgstr "" +msgstr "بارگذاری بروزرسانیها" #: ../lib/Tails/IUK/Frontend.pm:415 #, perl-brace-format

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 07 Feb '14

07 Feb '14

commit 5ed0aaf3df8835470af4610a98b2701faa9e6574 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 7 02:45:08 2014 +0000 Update translations for bridgedb_completed --- km/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/km/LC_MESSAGES/bridgedb.po b/km/LC_MESSAGES/bridgedb.po index b002532..8ae3ca8 100644 --- a/km/LC_MESSAGES/bridgedb.po +++ b/km/LC_MESSAGES/bridgedb.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-03-27 21:41+0000\n" -"PO-Revision-Date: 2014-01-31 03:40+0000\n" -"Last-Translator: soksophea <sksophea(a)gmail.com>\n" +"PO-Revision-Date: 2014-02-07 02:29+0000\n" +"Last-Translator: Sutha <sutha(a)open.org.kh>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 07 Feb '14

07 Feb '14

commit 26fef6ee47607dac2dc7f7c1dc7b120409fdb9ac Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 7 02:45:02 2014 +0000 Update translations for bridgedb --- km/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/km/LC_MESSAGES/bridgedb.po b/km/LC_MESSAGES/bridgedb.po index b002532..8ae3ca8 100644 --- a/km/LC_MESSAGES/bridgedb.po +++ b/km/LC_MESSAGES/bridgedb.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-03-27 21:41+0000\n" -"PO-Revision-Date: 2014-01-31 03:40+0000\n" -"Last-Translator: soksophea <sksophea(a)gmail.com>\n" +"PO-Revision-Date: 2014-02-07 02:29+0000\n" +"Last-Translator: Sutha <sutha(a)open.org.kh>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[tor/master] Merge remote-tracking branch 'public/bug9716_024' into maint-0.2.4
by nickm＠torproject.org 06 Feb '14

06 Feb '14

commit b4e8d8dc0e6f942346895a5cff123db3aa1f94d5 Merge: 9e2de8c a2754d4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 6 16:29:08 2014 -0500 Merge remote-tracking branch 'public/bug9716_024' into maint-0.2.4 changes/bug9716 | 4 ++++ src/or/connection.c | 23 ++++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 06 Feb '14

06 Feb '14

commit 5990edd1952361faca4619728b50587061d81be7 Merge: 075482f b4e8d8d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 6 16:29:33 2014 -0500 Merge remote-tracking branch 'origin/maint-0.2.4'

1 0

[tor/maint-0.2.4] Try using INT_MAX, not SOMAXCONN, to set listen() backlog.
by nickm＠torproject.org 06 Feb '14

06 Feb '14

commit a2754d418dffb6188717d5e84d9bea59a2c9853b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 11 13:30:45 2013 -0400 Try using INT_MAX, not SOMAXCONN, to set listen() backlog. Fall back to SOMAXCONN if INT_MAX doesn't work. We'd like to do this because the actual maximum is overrideable by the kernel, and the value in the header file might not be right at all. All implementations I can find out about claim that this is supported. Fix for 9716; bugfix on every Tor. --- changes/bug9716 | 4 ++++ src/or/connection.c | 23 ++++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/changes/bug9716 b/changes/bug9716 new file mode 100644 index 0000000..5e39077 --- /dev/null +++ b/changes/bug9716 @@ -0,0 +1,4 @@ + o Bugfixes (performance): + - Set the listen() backlog limit to the largest actually supported + on the system, not to the value in a header file. Fixes bug 9716; + bugfix on every released Tor. diff --git a/src/or/connection.c b/src/or/connection.c index 6e754a0..41946e4 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -926,6 +926,27 @@ make_socket_reuseable(tor_socket_t sock) #endif } +/** Max backlog to pass to listen. We start at */ +static int listen_limit = INT_MAX; + +/* Listen on fd with appropriate backlog. Return as for listen. */ +static int +tor_listen(tor_socket_t fd) +{ + int r; + + if ((r = listen(fd, listen_limit)) < 0) { + if (listen_limit == SOMAXCONN) + return r; + if ((r = listen(fd, SOMAXCONN)) == 0) { + listen_limit = SOMAXCONN; + log_warn(LD_NET, "Setting listen backlog to INT_MAX connections " + "didn't work, but SOMAXCONN did. Lowering backlog limit."); + } + } + return r; +} + /** Bind a new non-blocking socket listening to the socket described * by listensockaddr. * @@ -1009,7 +1030,7 @@ connection_listener_new(const struct sockaddr *listensockaddr, } if (is_tcp) { - if (listen(s,SOMAXCONN) < 0) { + if (tor_listen(s) < 0) { log_warn(LD_NET, "Could not listen on %s:%u: %s", address, usePort, tor_socket_strerror(tor_socket_errno(s))); tor_close_socket(s);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits February 2014