November 2011 - tor-commits - lists.torproject.org

[tor/master] Fix compile warnings on windows
by nickm＠torproject.org 15 Nov '11

15 Nov '11

commit 4b8d2ad6f57e4e1c21b4af7f20bc7da0d3286f3d Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Nov 15 13:29:32 2011 +0100 Fix compile warnings on windows --- changes/bug4469 | 4 ++++ src/common/util.c | 2 ++ src/or/connection.c | 2 ++ 3 files changed, 8 insertions(+), 0 deletions(-) diff --git a/changes/bug4469 b/changes/bug4469 new file mode 100644 index 0000000..e9e390c --- /dev/null +++ b/changes/bug4469 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Fix a couple of compile warnings on Windows. Fixes bug 4469; bugfix + on 0.2.3.4-alpha and 0.2.3.6-alpha. + diff --git a/src/common/util.c b/src/common/util.c index 79e09e4..c44a4aa 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3228,6 +3228,8 @@ tor_spawn_background(const char *const filename, const char **argv, SECURITY_ATTRIBUTES saAttr; char *joined_argv; + (void)envp; // Unused on Windows + /* process_handle must not be NULL */ tor_assert(process_handle != NULL); diff --git a/src/or/connection.c b/src/or/connection.c index bf39a5c..a52bf48 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -996,6 +996,8 @@ connection_create_listener(const struct sockaddr *listensockaddr, tor_close_socket(s); goto err; } +#else + (void)options; #endif /* HAVE_SYS_UN_H */ } else { log_err(LD_BUG,"Got unexpected address family %d.",

1 0

[tor/master] Merge remote-tracking branch 'sebastian/bug4469'
by nickm＠torproject.org 15 Nov '11

15 Nov '11

commit 26fcb4bb8c9d3f994a678b641db7b1c91fad8346 Merge: 3ef40f6 4b8d2ad Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 15 11:59:37 2011 -0500 Merge remote-tracking branch 'sebastian/bug4469' changes/bug4469 | 4 ++++ src/common/util.c | 2 ++ src/or/connection.c | 2 ++ 3 files changed, 8 insertions(+), 0 deletions(-)

1 0

[translation/vidalia_installer] Update translations for vidalia_installer
by translation＠torproject.org 15 Nov '11

15 Nov '11

commit 279fc4e02119b6099678fe94baa49b69bd51b129 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 15 16:45:26 2011 +0000 Update translations for vidalia_installer --- eu/vidalia_eu.po | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/eu/vidalia_eu.po b/eu/vidalia_eu.po index bf3db27..6b0c980 100755 --- a/eu/vidalia_eu.po +++ b/eu/vidalia_eu.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2008-07-12 05:29+0000\n" -"PO-Revision-Date: 2011-11-15 16:14+0000\n" +"PO-Revision-Date: 2011-11-15 16:31+0000\n" "Last-Translator: baldarra <baldarra(a)euskalerria.org>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -33,6 +33,17 @@ msgid "" "\n" "$_CLICK" msgstr "" +"Laguntzaile honek Tor, Vidalia, Polipo eta Torbutton-ren instalazioaren zehar gidatuko zaitu.\n" +"\n" +"Tor Internet anonimoki erabiltzeko sistema bat da, Web nabigazio eta argitaratzea, berehalako mezuak, IRC eta gehio anonimizatzen laguntzeko. Vidalia Tor kontrolatu, jarraitu eta konfiguratzen lagunduko dizun GUI bat da.\n" +"\n" +"Polipo Tor-en bitarteko web nabigazioaren errendimendua indartzen duen web proxy bat da.\n" +"\n" +"Torbutton web nabigazio anonimoa azkar gaitzea eta ezgaitzea ahalbidetzen duen Firefoxentzako hedapena da.\n" +"\n" +"Aurretik Tor, Vidalia, Polipo, edo Firefox instalatuta baduzu, mesedez zihurtatu ez direla exekutatzen ari instalazio honekin jarraitu baino lehenago.\n" +"\n" +"$_CLICK" msgctxt "BundleWelcomeTitle" msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard" @@ -78,6 +89,8 @@ msgid "" "\n" "$_CLICK" msgstr "" +"Laguntzaile honek Vidalia, Tor kontrolatu, jarraitu eta konfiguratzen " +"lagunduko dizun GUIaren instalazioan zehar gidatuko zaitu." msgctxt "VidaliaWelcomeTitle" msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard" @@ -118,6 +131,8 @@ msgid "" "Tor is a system for using the Internet anonymously, helping you anonymize " "Web browsing and publishing, instant messaging, IRC, and more." msgstr "" +"Tor Internet anonimoki erabiltzeko sistema bat da, Web nabigazio eta " +"argitaratzea, berehalako mezuak, IRC eta gehio anonimizatzen laguntzeko." msgctxt "TorUninstDesc" msgid "Remove ${TOR_DESC}." @@ -190,6 +205,8 @@ msgid "" "Torbutton is a Firefox extension that allows you to quickly enable or " "disable anonymous web browsing." msgstr "" +"Torbutton web nabigazio anonimoa azkar gaitzea eta ezgaitzea ahalbidetzen " +"duen Firefoxentzako hedapena da." msgctxt "TorbuttonUninstDesc" msgid "Remove ${TORBUTTON_DESC}." @@ -244,6 +261,9 @@ msgid "" "If you would like to install Firefox, please press Cancel, then go\n" "to the Firefox download page at" msgstr "" +"Mozilla Firefox Web nabigatzailea ez dago zure sisteman instalatuta. Tor-ek badabil beste nabigatzaile batzuekin, Internet Explorer bezala, baina Firefoxekin erabiltzea errazagoa da, eta zure anonimotasuna babesten lan hobea egiten du.\n" +"\n" +"Firefox instalatu nahi baduzu, mesedez sakatu Utzi, eta ondoren joan Firefoxen deskarga orrira hemen" msgctxt "FirefoxWarningPageLowerText" msgid "" @@ -253,5 +273,8 @@ msgid "" "Or, if you would prefer to install Tor without Firefox, simply\n" "press Next to continue." msgstr "" +"Behin Firefox instalatu duzunean, Tor instalaria berriz exekutatu dezakezu.\n" +"\n" +"Edo, nahiago baduzu Tor instalatu Firefoxik gabe, sakatu Aurrera besterik gabe."

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 15 Nov '11

15 Nov '11

commit 1fb1e51802c46be0282fd8f894129af5c2e4be15 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 15 16:45:03 2011 +0000 Update translations for gettor --- eu/gettor.po | 482 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 482 insertions(+), 0 deletions(-) diff --git a/eu/gettor.po b/eu/gettor.po new file mode 100644 index 0000000..0418cb3 --- /dev/null +++ b/eu/gettor.po @@ -0,0 +1,482 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# <baldarra(a)euskalerria.org>, 2011. +# Jacob Appelbaum <jacob(a)appelbaum.net>, 2009. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2011-11-13 22:01+0100\n" +"PO-Revision-Date: 2011-11-15 16:44+0000\n" +"Last-Translator: baldarra <baldarra(a)euskalerria.org>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: eu\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" + +#: lib/gettor/i18n.py:27 +msgid "Hello, This is the \"GetTor\" robot." +msgstr "Kaixo, Heu \"GetTor\" errobota da." + +#: lib/gettor/i18n.py:29 +msgid "Thank you for your request." +msgstr "Eskerrik asko zure eskaeragatik." + +#: 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:130 +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" +" source" +msgstr "" +"Tor pakete bat bidaliko dizut e-mailez, zein nahi duzun esaten badidazu.\n" +"Mesedez hautatu hurrengo pakete izenetatik bat:\n" +"\n" +" windows\n" +" macos-i386\n" +" macos-ppc\n" +" linux-i386\n" +" linux-x86_64\n" +" source" + +#: lib/gettor/i18n.py:56 +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:59 +msgid "" +"OBTAINING LOCALIZED VERSIONS OF TOR\n" +"===================================" +msgstr "" + +#: lib/gettor/i18n.py:62 +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:67 +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:71 +msgid " List of supported locales:" +msgstr "" + +#: lib/gettor/i18n.py:73 +msgid "Here is a list of all available languages:" +msgstr "Hemen duzu hizkuntza erabilgarri guztien zerrenda:" + +#: lib/gettor/i18n.py:75 +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 "" +" 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" + +#: lib/gettor/i18n.py:87 +msgid "If you select no language, you will receive the English version." +msgstr "Hizkuntzarik hautatu ezean, Ingelerazko bertsoa jasoko duzu." + +#: lib/gettor/i18n.py:89 +msgid "" +"SMALLER SIZED PACKAGES\n" +"======================" +msgstr "" + +#: lib/gettor/i18n.py:92 +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:96 +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:102 +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:105 +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:108 +msgid "1.) Save all received attachments into one folder on your disk." +msgstr "1.) Gorde jasotako eranskin guztiak karpeta bakar batean zure diskan." + +#: lib/gettor/i18n.py:110 +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:114 +msgid "" +"3.) Verify all files as described in the mail you received with \n" +"each package. (gpg --verify)" +msgstr "" +"3.) Egiaztatu mailean jasotako fitxategi guztiak pakete bakoitzarekin. (gpg " +"--verify)" + +#: lib/gettor/i18n.py:117 +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:121 +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:125 +msgid "6.) That's it. You're done. Thanks for using Tor and have fun!" +msgstr "" +"6.) Hori da. Bukatu duzu. Eskerrik asko Tor erabiltzeagatik eta ondo pasa!" + +#: lib/gettor/i18n.py:127 +msgid "" +"SUPPORT\n" +"=======" +msgstr "" +"LAGUNTZA\n" +"========" + +#: lib/gettor/i18n.py:133 +msgid "" +"Here's your requested software as a zip file. Please unzip the\n" +"package and verify the signature." +msgstr "" + +#: lib/gettor/i18n.py:136 +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:143 +msgid "" +"The output should look somewhat like this:\n" +"\n" +" gpg: Good signature from 'Erinn Clark <...>'" +msgstr "" + +#: lib/gettor/i18n.py:147 +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:152 +msgid "" +"BLOCKED ACCESS / CENSORSHIP\n" +"===========================" +msgstr "" + +#: lib/gettor/i18n.py:155 +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:162 +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:167 +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:170 +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:176 +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:179 +#, 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:182 +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:185 +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:188 +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:193 +msgid "" +"UNPACKING THE FILES\n" +"===================" +msgstr "" + +#: lib/gettor/i18n.py:196 +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:202 +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:205 +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:210 +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:213 +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:218 +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:222 +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:226 +msgid "" +"linux-i386:\n" +"The Tor Browser Bundle package for Linux, 32bit versions." +msgstr "" + +#: lib/gettor/i18n.py:229 +msgid "" +"Note that this package is rather large and needs your email provider to \n" +"allow for attachments of about 30MB in size." +msgstr "" + +#: lib/gettor/i18n.py:232 +msgid "" +"linux-x86_64:\n" +"The Tor Browser Bundle package for Linux, 64bit versions." +msgstr "" + +#: lib/gettor/i18n.py:235 +msgid "" +"source:\n" +"The Tor source code, for experts. Most users do not want this package." +msgstr "" + +#: lib/gettor/i18n.py:238 +msgid "" +"FREQUENTLY ASKED QUESTIONS\n" +"==========================" +msgstr "" + +#: lib/gettor/i18n.py:241 +msgid "What is Tor?" +msgstr "" + +#: lib/gettor/i18n.py:243 +msgid "The name \"Tor\" can refer to several different components." +msgstr "" + +#: lib/gettor/i18n.py:245 +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:255 +msgid "What is the Tor Browser Bundle?" +msgstr "" + +#: lib/gettor/i18n.py:257 +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:261 +msgid "What package should I request?" +msgstr "" + +#: lib/gettor/i18n.py:263 +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:268 +msgid "How do I extract the file(s) you sent me?" +msgstr "" + +#: lib/gettor/i18n.py:270 +msgid "QUESTION:" +msgstr "" + +#: lib/gettor/i18n.py:272 +msgid "ANSWER:" +msgstr "" + +#: lib/gettor/i18n.py:274 +#, 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

[tor/master] Use real_addr in send_netinfo
by nickm＠torproject.org 15 Nov '11

15 Nov '11

commit 5bea660f8ebf8ec1a78c21ce5e2a6bd5dd681eed Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 14 22:42:10 2011 -0500 Use real_addr in send_netinfo Reported by "troll_un"; bugfix on 0.2.0.10-alpha; fixes bug 4349. --- changes/bug4349 | 4 ++++ src/or/connection_or.c | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/changes/bug4349 b/changes/bug4349 new file mode 100644 index 0000000..633916b --- /dev/null +++ b/changes/bug4349 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - When sending a NETINFO cell, include the original address + received for the other side, not its canonical address. Found + by "troll_un"; fixes bug 4349; bugfix on 0.2.0.10-alpha. diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 27a34d3..1fffba7 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1410,7 +1410,7 @@ connection_or_send_netinfo(or_connection_t *conn) /* Their address. */ out = cell.payload + 4; - len = append_address_to_payload(out, &conn->_base.addr); + len = append_address_to_payload(out, &conn->real_addr); if (len<0) return -1; out += len;

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 15 Nov '11

15 Nov '11

commit 3ef40f69937abc105877189fbecd78df67dd2d8e Merge: 4af82fb 5bea660 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 15 11:42:38 2011 -0500 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug4349 | 4 ++++ src/or/connection_or.c | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.2] Use real_addr in send_netinfo
by nickm＠torproject.org 15 Nov '11

15 Nov '11

commit 5bea660f8ebf8ec1a78c21ce5e2a6bd5dd681eed Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 14 22:42:10 2011 -0500 Use real_addr in send_netinfo Reported by "troll_un"; bugfix on 0.2.0.10-alpha; fixes bug 4349. --- changes/bug4349 | 4 ++++ src/or/connection_or.c | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/changes/bug4349 b/changes/bug4349 new file mode 100644 index 0000000..633916b --- /dev/null +++ b/changes/bug4349 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - When sending a NETINFO cell, include the original address + received for the other side, not its canonical address. Found + by "troll_un"; fixes bug 4349; bugfix on 0.2.0.10-alpha. diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 27a34d3..1fffba7 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1410,7 +1410,7 @@ connection_or_send_netinfo(or_connection_t *conn) /* Their address. */ out = cell.payload + 4; - len = append_address_to_payload(out, &conn->_base.addr); + len = append_address_to_payload(out, &conn->real_addr); if (len<0) return -1; out += len;

1 0

[translation/vidalia_installer] Update translations for vidalia_installer
by translation＠torproject.org 15 Nov '11

15 Nov '11

commit 3bca55b376a8544ba92c7231fdf957b71f8ac5ec Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 15 16:15:28 2011 +0000 Update translations for vidalia_installer --- eu/vidalia_eu.po | 88 ++++++++++++++++++++++++++++++++---------------------- 1 files changed, 52 insertions(+), 36 deletions(-) diff --git a/eu/vidalia_eu.po b/eu/vidalia_eu.po index 4e55cc7..bf3db27 100755 --- a/eu/vidalia_eu.po +++ b/eu/vidalia_eu.po @@ -1,12 +1,13 @@ # # Translators: +# <baldarra(a)euskalerria.org>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2008-07-12 05:29+0000\n" -"PO-Revision-Date: 2010-12-05 20:21+0000\n" -"Last-Translator: \n" +"PO-Revision-Date: 2011-11-15 16:14+0000\n" +"Last-Translator: baldarra <baldarra(a)euskalerria.org>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -16,7 +17,7 @@ msgstr "" msgctxt "BundleSetupCaption" msgid "${BUNDLE_NAME} setup" -msgstr "" +msgstr "${BUNDLE_NAME} konfiguratu" msgctxt "BundleWelcomeText" msgid "" @@ -35,11 +36,11 @@ msgstr "" msgctxt "BundleWelcomeTitle" msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard" -msgstr "" +msgstr "Ongi etorri ${BUNDLE_NAME} konfigurazio laguntzailera" msgctxt "BundleLinkText" msgid "${TOR_NAME} installation documentation" -msgstr "" +msgstr "${TOR_NAME} instalazio dokumentazioa" msgctxt "BundleFinishText" msgid "" @@ -48,22 +49,28 @@ msgid "" "\n" "If you installed Torbutton, you will need to restart Firefox." msgstr "" +"Instalazioa burutu da.\n" +"Mesedez begiratu https://www.torproject.org/docs/tor-doc-windows zure aplikazioak Tor erabil dezaten nola konfiguratu behar diren ikasteko.\n" +"\n" +"Torbutton instalatu baduzu, Firefox berrabiarazi beharko duzu." msgctxt "BundleRunNow" msgid "Run installed components now" -msgstr "" +msgstr "Exekutatu instalatutako osagaiak orain" msgctxt "VidaliaGroupDesc" msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor." msgstr "" +"Vidalia Tor kontrolatu, jarraitu eta konfiguratzen lagunduko dizun GUI bat " +"da." msgctxt "VidaliaUninstDesc" msgid "Remove ${VIDALIA_DESC}." -msgstr "" +msgstr "Kendu ${VIDALIA_DESC}." msgctxt "VidaliaSetupCaption" msgid "${VIDALIA_NAME} setup" -msgstr "" +msgstr "${VIDALIA_NAME} konfiguratu" msgctxt "VidaliaWelcomeText" msgid "" @@ -74,35 +81,37 @@ msgstr "" msgctxt "VidaliaWelcomeTitle" msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard" -msgstr "" +msgstr "Ongi etorri ${VIDALIA_NAME} konfigurazio laguntzailera" msgctxt "VidaliaLinkText" msgid "${VIDALIA_NAME} homepage" -msgstr "" +msgstr "${VIDALIA_NAME} webgunea" msgctxt "VidaliaAppDesc" msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor." msgstr "" +"Vidalia Tor kontrolatu, jarraitu eta konfiguratzen lagunduko dizun GUI bat " +"da." msgctxt "VidaliaStartup" msgid "Run At Startup" -msgstr "" +msgstr "Exekutatu hasieran" msgctxt "VidaliaStartupDesc" msgid "Automatically run ${VIDALIA_NAME} at startup." -msgstr "" +msgstr "Automatikoki exekutatu ${VIDALIA_NAME} hasieran" msgctxt "VidaliaShortcuts" msgid "Add to Start Menu" -msgstr "" +msgstr "Gehitu Hasiera Menura" msgctxt "VidaliaShortcutsDesc" msgid "Add ${VIDALIA_NAME} to your Start menu." -msgstr "" +msgstr "${VIDALIA_NAME} zure Hasiera menura gehitzen du." msgctxt "VidaliaRunNow" msgid "Run ${VIDALIA_NAME}" -msgstr "" +msgstr "${VIDALIA_NAME} exekutatu" msgctxt "TorGroupDesc" msgid "" @@ -112,11 +121,11 @@ msgstr "" msgctxt "TorUninstDesc" msgid "Remove ${TOR_DESC}." -msgstr "" +msgstr "Kendu ${TOR_DESC}." msgctxt "TorAppDesc" msgid "Install ${TOR_DESC}." -msgstr "" +msgstr "Instalatu ${TOR_DESC}." msgctxt "TorAskOverwriteTorrc" msgid "" @@ -124,52 +133,57 @@ msgid "" "$\n" "Do you want to overwrite it with the default sample configuration file?" msgstr "" +"Tor ezarpen fitxategi bat duzu jada.\n" +"$\n" +"Lehenetsitako fitxategiarekin ordeztu nahi al duzu?" msgctxt "TorDocumentation" msgid "Documentation" -msgstr "" +msgstr "Dokumentazioa" msgctxt "TorDocumentationDesc" msgid "Install ${TOR_NAME} documentation." -msgstr "" +msgstr "Instalatu ${TOR_NAME} dokumentazioa." msgctxt "TorShortcuts" msgid "Add to Start Menu" -msgstr "" +msgstr "Gehitu Hasiera Menura" msgctxt "TorShortcutsDesc" msgid "Add ${TOR_NAME} to your Start menu." -msgstr "" +msgstr "${TOR_NAME} zure Hasiera menura gehitzen du." msgctxt "PolipoGroupDesc" msgid "" "Polipo is a caching web proxy that increases performance of web browsing " "through Tor." msgstr "" +"Polipo Tor-en bitarteko web nabigazioaren errendimendua indartzen duen web " +"proxy bat da." msgctxt "PolipoUninstDesc" msgid "Remove ${POLIPO_DESC}." -msgstr "" +msgstr "Kendu ${POLIPO_DESC}." msgctxt "PolipoAppDesc" msgid "Install ${POLIPO_DESC}." -msgstr "" +msgstr "Instalatu ${POLIPO_DESC}." msgctxt "PolipoShortcuts" msgid "Add to Start Menu" -msgstr "" +msgstr "Gehitu Hasiera Menura" msgctxt "PolipoShortcutsDesc" msgid "Add ${POLIPO_NAME} to your Start menu." -msgstr "" +msgstr "${POLIPO_NAME} zure Hasiera menura gehitzen du." msgctxt "PolipoStartup" msgid "Run At Startup" -msgstr "" +msgstr "Exekutatu hasieran" msgctxt "PolipoStartupDesc" msgid "Automatically run ${POLIPO_NAME} at startup." -msgstr "" +msgstr "Automatikoki exekutatu ${POLIPO_NAME} hasieran" msgctxt "TorbuttonGroupDesc" msgid "" @@ -179,44 +193,46 @@ msgstr "" msgctxt "TorbuttonUninstDesc" msgid "Remove ${TORBUTTON_DESC}." -msgstr "" +msgstr "Kendu ${TORBUTTON_DESC}." msgctxt "TorbuttonAppDesc" msgid "Install ${TORBUTTON_DESC}." -msgstr "" +msgstr "Instalatu ${TORBUTTON_DESC}." msgctxt "TorbuttonAddToFirefox" msgid "Add to Firefox" -msgstr "" +msgstr "Firefoxera gehitu" msgctxt "TorbuttonAddToFirefoxDesc" msgid "Add the ${TORBUTTON_DESC} extension to Firefox." -msgstr "" +msgstr "Firefoxera ${TORBUTTON_DESC} hedapena gehitu" msgctxt "TorbuttonFirefoxNotFound" msgid "Firefox was not found on your system. Not installing Torbutton." -msgstr "" +msgstr "Firefox ez da zure sisteman aurkitu. Torbutton ez da instalatuko." msgctxt "AppData" msgid "Application Data" -msgstr "" +msgstr "Aplikazio Datuak" msgctxt "AppDataUninstDesc" msgid "Remove saved application data and configuration files." -msgstr "" +msgstr "Kendu gordetako aplikazio datuak eta ezarpen fitxategiak." msgctxt "LanguageCode" msgid "en" -msgstr "" +msgstr "en" msgctxt "FirefoxWarningPageTitle" msgid "Firefox is not installed" -msgstr "" +msgstr "Firefox ez dago instalatuta" msgctxt "FirefoxWarningPageSubtitle" msgid "" "We recommend that you install Firefox before continuing, for best safety." msgstr "" +"Jarraitu baino lehen Firefox instala dezazun gomendatzen dizugu, segurtasun " +"hoberako." msgctxt "FirefoxWarningPageUpperText" msgid ""

1 0

[tor-cloud/master] Re-created the AMI for Tokyo, solves #4464
by runa＠torproject.org 15 Nov '11

15 Nov '11

commit f62424f38706879af00191986db4fd60bfd89fa7 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Tue Nov 15 15:27:10 2011 +0000 Re-created the AMI for Tokyo, solves #4464 --- html/index.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/html/index.html b/html/index.html index 6d5d25d..4d87cc5 100644 --- a/html/index.html +++ b/html/index.html @@ -122,7 +122,7 @@ <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-1#launchAmi=ami-94f1…" target="_blank">us-west-2 Oregon</a></li> <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-65b3…" target="_blank">eu-west-1 Ireland</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchAmi=ami…" target="_blank">ap-northeast-1 Tokyo</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchAmi=ami…" target="_blank">ap-northeast-1 Tokyo</a></li> <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchAmi=ami…" target="_blank">ap-southeast-1 Singapore</a></li> </ul>

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 15 Nov '11

15 Nov '11

commit 167a540d02e212145acc939cb03c9328bb59b2d1 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 15 15:15:04 2011 +0000 Update translations for tsum --- it/tsum.po | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/it/tsum.po b/it/tsum.po index 268432b..a0862b0 100644 --- a/it/tsum.po +++ b/it/tsum.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-05 17:16+0000\n" -"PO-Revision-Date: 2011-11-15 14:44+0000\n" +"PO-Revision-Date: 2011-11-15 14:59+0000\n" "Last-Translator: n0on3 <a.n0on3(a)gmail.com>\n" "Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n" "MIME-Version: 1.0\n" @@ -157,7 +157,7 @@ msgid "" "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." msgstr "" "### Come ottenere Tor via email \n" -"Per ricevere il pacchetto browser Tor in lingua inglese per Windows, è sufficiente inviare una email a gettor(a)torproject.org con **windows** nel corpo del messaggio. Il titolo può essere lasciato in bianco." +"Per ricevere il Tor Browser Bundle in lingua inglese per Windows, è sufficiente inviare una email a gettor(a)torproject.org con **windows** nel corpo del messaggio. Il titolo può essere lasciato in bianco." #. type: Plain text #: en/tsum.text:57 @@ -167,7 +167,7 @@ msgid "" "**linux-x86_64** for 64-bit systems)." msgstr "" "E' inoltre possibile richiedere il Tor Browser Bundle per Mac OS X (scrivere" -" **macos-i386**), e Linux (write **linux-i386** per sistemi a 32-bit o " +" **macos-i386**), e Linux (scrivere **linux-i386** per sistemi a 32-bit o " "**linux-x86_64** per sistemi a 64-bit)." #. type: Plain text @@ -190,7 +190,7 @@ msgid "" "want, send an email to help(a)rt.torproject.org and we\n" "will give you a list of website mirrors to use.\n" msgstr "" -"**Nota**: Nota: I pacchetti Browser Tor per Linux e Mac OS X sono piuttosto " +"**Nota**: I pacchetti Browser Tor per Linux e Mac OS X sono piuttosto " "grandi, e non sarà possibile ricevere nessuno di questi pacchetti con Gmail," " Hotmail o Yahoo. Se non è possibile ricevere i pacchetto desiderato, si " "invii una email a help(a)rt.torproject.org per ricevere una lista di siti web " @@ -203,7 +203,7 @@ msgid "" "It is possible to request the Tor Browser Bundle for Windows as several small sized packages, instead of one big package. This can be useful if you don't have a lot of bandwidth available, or if your email provider does not allow you to receive large attachments." msgstr "" "#### Come ottenere Tor sotto forma di diversi pacchetti di piccole dimensioni.\n" -"E' possibile richiedere il Pacchetto Browser Tor per Windows sotto forma di diversi pacchetti di piccole dimensioni, invece che di un unico grande pacchetto. Questo può essere utile se non si ha a disposizione molta banda, o se il fornitore di servizi email non ammette la ricezione di allegati sopra una certa dimensione." +"E' possibile richiedere il Tor Browser Bundle per Windows sotto forma di diversi pacchetti di piccole dimensioni, invece che di un unico grande pacchetto. Questo può essere utile se non si ha a disposizione molta banda, o se il fornitore di servizi email non ammette la ricezione di allegati sopra una certa dimensione." #. type: Plain text #: en/tsum.text:76 @@ -262,7 +262,7 @@ msgid "" "Before running the Tor Browser Bundle, you should make sure that you have the right version." msgstr "" "### Come controllare di avere la versione giusta\n" -"Prima di eseguire il Pacchetto Browser Tor, si dovrebbe controllare di avere la versione giusta." +"Prima di eseguire il Tor Browser Bundle, si dovrebbe controllare di avere la versione giusta." #. type: Plain text #: en/tsum.text:102 @@ -273,7 +273,7 @@ msgid "" "we intended you to get." msgstr "" "Il software che si riceve è accompagnato da un file con lo stesso nome del " -"pacchetto e con l'estensione **.asc.**. Tale .asc file è una firma GPG, e " +"pacchetto e con l'estensione **.asc**. Tale file .asc è una firma GPG, e " "permette di verificare se il file che si è scaricato è esattamente quello " "che si desiderava." @@ -467,8 +467,9 @@ msgid "" msgstr "" "Se la normale connessione ad internet funziona, ma Tor non riesce a " "connettersi alla rete, si provi quanto segue: si apra il pannello di " -"controllo di Visalia, si faccia click su *Message Log* and select the " -"*Advanced* tab. It may be that Tor won't connect because:" +"controllo di Vidalia, si faccia click su *Message Log* e si selezioni il tab" +" *Advanced*. Tor potrebbe non riuscire a connettersi per una delle seguenti " +"cause:" #. type: Plain text #: en/tsum.text:178 @@ -492,7 +493,7 @@ msgid "" "*Network*, and tick the box that says *My firewall only lets me connect\n" "to certain ports*. \n" msgstr "" -"**Ci si trova dietro un firewall con restrizioni**: PEr dire a Tor di " +"**Ci si trova dietro un firewall con restrizioni**: Per dire a Tor di " "provare solo con le porte 80 e 443, si aprea il pannello di controllo di " "Vidalia, si faccia click su *Settings* e *Network*, e si spunti la casella " "che dice *Il mio firewall mi permette di connettermi solo a determinate " @@ -685,7 +686,7 @@ msgid "" msgstr "" "#### Windows 7\n" "1. Aprire *Computer*\n" -"2. Fare click su *Organize* e scegliere *Folder and search options\" dal menu\n" +"2. Fare click su *Organize* e scegliere *Folder and search options* dal menu\n" "3. Fare click sulla tab *View*\n" "4. Togliere la spunta alla casella *Hide extensions for known file types* e fare click su *OK*"

1 0