February 2015 - tor-commits - lists.torproject.org

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 06 Feb '15

06 Feb '15

commit 6c4f44c7ddab5bc5ee886639d761651a3a642e6e Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 6 21:45:12 2015 +0000 Update translations for torcheck --- ur_PK/torcheck.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ur_PK/torcheck.po b/ur_PK/torcheck.po index 04cba1e..e5458da 100644 --- a/ur_PK/torcheck.po +++ b/ur_PK/torcheck.po @@ -2,12 +2,13 @@ # Copyright (C) 2008-2013 The Tor Project, Inc # # Translators: +# Mukhtar Azad <mukhtarazad(a)yahoo.com>, 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-05-06 08:21+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-02-06 21:41+0000\n" +"Last-Translator: Mukhtar Azad <mukhtarazad(a)yahoo.com>\n" "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/torproject/language/ur_PK/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -78,7 +79,7 @@ msgid "Short User Manual" msgstr "" msgid "Donate to Support Tor" -msgstr "" +msgstr "ٹور کی حمایت میں عطیہ دیجیے" msgid "Tor Q&A Site" msgstr ""

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 06 Feb '15

06 Feb '15

commit 228321489895eec3f5196b7c38532fe024d3f145 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 6 21:45:06 2015 +0000 Update translations for gettor --- ur_PK/gettor.po | 503 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 503 insertions(+) diff --git a/ur_PK/gettor.po b/ur_PK/gettor.po new file mode 100644 index 0000000..1962239 --- /dev/null +++ b/ur_PK/gettor.po @@ -0,0 +1,503 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Mukhtar Azad <mukhtarazad(a)yahoo.com>, 2015 +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: 2015-02-06 21:35+0000\n" +"Last-Translator: Mukhtar Azad <mukhtarazad(a)yahoo.com>\n" +"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/torproject/language/ur_PK/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ur_PK\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\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

[torspec/master] Update control spec with entry-guards down state
by nickm＠torproject.org 06 Feb '15

06 Feb '15

commit a7b9120ac6b80b7f7779c124e816a06451517088 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Fri Feb 6 15:56:20 2015 -0500 Update control spec with entry-guards down state Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- control-spec.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/control-spec.txt b/control-spec.txt index e4c98f5..1fb543f 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -605,7 +605,8 @@ is deprecated and should not be used.] [Older versions of Tor (before 0.1.2.x-final) generated 'down' instead - of unlisted/unusable. Current Tors never generate 'down'.] + of unlisted/unusable. Before 0.2.6.3-alpha, 'down' was never + generated.] [XXXX ServerID2 differs from ServerID in not prefixing fingerprints with a $. This is an implementation error. It would be nice to add

1 0

[tor/master] Control: getinfo entry-guards report down-since
by nickm＠torproject.org 06 Feb '15

06 Feb '15

commit b101f4e98ce811aee729c31f62ec5dd1cfe44e85 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Wed Jan 28 10:52:14 2015 -0500 Control: getinfo entry-guards report down-since If the guard unreachable_since variable was set, the status "up" was reported which is wrong. This adds the "down" status followed by the unreachable_since time value. Fixes #14184 Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- changes/bug14184 | 5 +++++ src/or/entrynodes.c | 3 +++ 2 files changed, 8 insertions(+) diff --git a/changes/bug14184 b/changes/bug14184 new file mode 100644 index 0000000..ed3d760 --- /dev/null +++ b/changes/bug14184 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - On the control port, the "entry-guards" command was reporting an "up" + status for a relay that was actually down. This fix check if + "unreachable_since" is set and if so reports the "down" status. Fixes + bug 14184. diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 17cb825..5a12170 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -1666,6 +1666,9 @@ getinfo_helper_entry_guards(control_connection_t *conn, } else if (e->bad_since) { when = e->bad_since; status = "unusable"; + } else if (e->unreachable_since) { + when = e->unreachable_since; + status = "down"; } else { status = "up"; }

1 0

[tor/master] Avoid logging startup messages twice
by nickm＠torproject.org 06 Feb '15

06 Feb '15

commit 6d8b614729bc8011d68a7234a81190ec11f6cd5f Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Feb 6 21:17:48 2015 +0100 Avoid logging startup messages twice --- changes/bug13993 | 4 ++++ src/common/log.c | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/changes/bug13993 b/changes/bug13993 new file mode 100644 index 0000000..bf99559 --- /dev/null +++ b/changes/bug13993 @@ -0,0 +1,4 @@ + o Minor bugfixes (logging): + - Don't log messages to stdout twice when starting up. Fixes bug + 13993; bugfix on 0.2.6.1-alpha. + diff --git a/src/common/log.c b/src/common/log.c index bbad7f1..e8cc30c 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -1062,6 +1062,12 @@ flush_log_messages_from_startup(void) if (! logfile_wants_message(lf, msg->severity, msg->domain)) continue; + /* We configure a temporary startup log that goes to stdout, so we + * shouldn't replay to stdout/stderr*/ + if (lf->fd == STDOUT_FILENO || lf->fd == STDERR_FILENO) { + continue; + } + logfile_deliver(lf, msg->fullmsg, strlen(msg->fullmsg), msg->msg, msg->domain, msg->severity, &callbacks_deferred); }

1 0

[tor/master] Fix check-spaces complaints
by nickm＠torproject.org 06 Feb '15

06 Feb '15

commit e0c3de40ad557be4ed059e93695391e44aa7a16c Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Feb 6 21:36:40 2015 +0100 Fix check-spaces complaints --- src/or/connection.c | 4 +--- src/or/control.c | 6 ++++-- src/test/test.c | 3 ++- src/test/test_dir.c | 1 - 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index 0ce4f72..79ae178 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1601,7 +1601,6 @@ connection_init_accepted_conn(connection_t *conn, return 0; } - static int connection_connect_sockaddr(connection_t *conn, const struct sockaddr *sa, @@ -1688,11 +1687,10 @@ connection_connect_sockaddr(connection_t *conn, *socket_error = SOCK_ERRNO(ENOBUFS); return -1; } - return inprogress ? 0 : 1; + return inprogress ? 0 : 1; } - /** Take conn, make a nonblocking socket; try to connect to * addr:port (they arrive in *host order*). If fail, return -1 and if * applicable put your best guess about errno into *<b>socket_error</b>. diff --git a/src/or/control.c b/src/or/control.c index 24e1479..064b745 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1886,13 +1886,15 @@ circuit_describe_status_for_controller(origin_circuit_t *circ) if (circ->socks_username_len > 0) { char* socks_username_escaped = esc_for_log_len(circ->socks_username, (size_t) circ->socks_username_len); - smartlist_add_asprintf(descparts, "SOCKS_USERNAME=%s", socks_username_escaped); + smartlist_add_asprintf(descparts, "SOCKS_USERNAME=%s", + socks_username_escaped); tor_free(socks_username_escaped); } if (circ->socks_password_len > 0) { char* socks_password_escaped = esc_for_log_len(circ->socks_password, (size_t) circ->socks_password_len); - smartlist_add_asprintf(descparts, "SOCKS_PASSWORD=%s", socks_password_escaped); + smartlist_add_asprintf(descparts, "SOCKS_PASSWORD=%s", + socks_password_escaped); tor_free(socks_password_escaped); } diff --git a/src/test/test.c b/src/test/test.c index 85a7ad6..d57a018 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -106,7 +106,8 @@ test_onion_handshake(void *arg) /* client handshake 2 */ memset(c_keys, 0, 40); - tt_assert(! onion_skin_TAP_client_handshake(c_dh, s_buf, c_keys, 40, NULL)); + tt_assert(! onion_skin_TAP_client_handshake(c_dh, s_buf, c_keys, + 40, NULL)); tt_mem_op(c_keys,OP_EQ, s_keys, 40); memset(s_buf, 0, 40); diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 849bbdb..a949f5d 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -3079,7 +3079,6 @@ test_dir_packages(void *arg) ADD(2, "cbc 99.1.11.1.2 http://example.com/ cubehash=ahooy"); ADD(2, "cbc 99.1.11.1.2 http://example.com/ cubehash=ahooy"); - res = compute_consensus_package_lines(votes); tt_assert(res); tt_str_op(res, ==,

1 0

[tor/master] Merge remote-tracking branch 'sebastian/bug13993'
by nickm＠torproject.org 06 Feb '15

06 Feb '15

commit e36faeec1d40e1f4f7ae54c798ad4492f86f594c Merge: b3bc871 e0c3de4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 6 15:42:53 2015 -0500 Merge remote-tracking branch 'sebastian/bug13993' changes/bug13993 | 4 ++++ src/common/log.c | 6 ++++++ src/or/connection.c | 4 +--- src/or/control.c | 6 ++++-- src/test/test.c | 3 ++- src/test/test_dir.c | 1 - 6 files changed, 17 insertions(+), 7 deletions(-)

1 0

[tor/master] Add unit test for #13290
by nickm＠torproject.org 06 Feb '15

06 Feb '15

commit b3bc8712140b8268cb3714b17b9678eefe66e90e Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Feb 6 20:39:10 2015 +0100 Add unit test for #13290 --- src/or/circuitstats.c | 2 +- src/test/test.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/or/circuitstats.c b/src/or/circuitstats.c index 18cb1c8..7b3ad56 100644 --- a/src/or/circuitstats.c +++ b/src/or/circuitstats.c @@ -1074,7 +1074,7 @@ circuit_build_times_update_alpha(circuit_build_times_t *cbt) * random_sample_from_Pareto_distribution * That's right. I'll cite wikipedia all day long. * - * Return value is in milliseconds. + * Return value is in milliseconds, clamped to INT32_MAX. */ STATIC double circuit_build_times_calculate_timeout(circuit_build_times_t *cbt, diff --git a/src/test/test.c b/src/test/test.c index 85a7ad6..7995af3 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -442,6 +442,14 @@ test_circuit_timeout(void *arg) tt_assert(circuit_build_times_network_check_live(&final)); circuit_build_times_count_timeout(&final, 1); + + /* Ensure return value for degenerate cases are clamped correctly */ + initial.alpha = INT32_MAX; + tt_assert(circuit_build_times_calculate_timeout(&initial, .99999999) <= + INT32_MAX); + initial.alpha = 0; + tt_assert(circuit_build_times_calculate_timeout(&initial, .5) <= + INT32_MAX); } done:

1 0

[torspec/master] Detail what various hidden service close reasons mean
by nickm＠torproject.org 06 Feb '15

06 Feb '15

commit c5e76555a6b74f76b83964ec41532a53d1dd7448 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Thu Feb 5 15:57:01 2015 -0500 Detail what various hidden service close reasons mean Some stream reasons taken from tor-spec but detailed specifically for hidden service. Fixes #13506 Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- rend-spec.txt | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/rend-spec.txt b/rend-spec.txt index 540fca0..99a13d1 100644 --- a/rend-spec.txt +++ b/rend-spec.txt @@ -767,6 +767,76 @@ for any other address along her circuit to Bob; if she does, Bob MUST reject them. +1.12. Closing streams + + The payload of a RELAY_END cell begins with a single 'reason' byte to + describe why the stream is closing, plus optional data (depending on the + reason.) These can be found in section 6.3 of tor-spec. The following + describes some of the hidden service related reasons. + + 1 -- REASON_MISC + + Catch-all for unlisted reasons. Shouldn't happen much in practice. + + 2 -- REASON_RESOLVEFAILED + + Tor tried to fetch the hidden service descriptor from the hsdirs but + none of them had it. This implies that the hidden service has not + been running in the past 24 hours. + + 3 -- REASON_CONNECTREFUSED + + Every step of the rendezvous worked great, and that the hidden + service is indeed up and running and configured to use the virtual + port you asked for, but there was nothing listening on the other end + of that virtual port. For example, the HS's Tor client is running + fine but its apache service is down. + + 4 -- REASON_EXITPOLICY + + The destination port that you tried is not configured on the hidden + service side. That is, the hidden service was up and reachable, but + it isn't listening on this port. Since Tor 0.2.6.2-alpha and later + hidden service don't send this error code; instead they send back an + END cell with reason DONE reason then close the circuit on you. This + behavior can be controlled by a config option. + + 5 -- REASON_DESTROY + + The circuit closed before you could get a response back -- transient + failure, e.g. a relay went down unexpectedly. Trying again might + work. + + 6 -- REASON_DONE + + Anonymized TCP connection was closed. If you get an END cell with + reason DONE, *before* you've gotten your CONNECTED cell, that + indicates a similar situation to EXITPOLICY, but the hidden service + is running 0.2.6.2-alpha or later, and it has now closed the circuit + on you. + + 7 -- REASON_TIMEOUT + + Either like CONNECTREFUSED above but connect() got the ETIMEDOUT + errno, or the client-side timeout of 120 seconds kicked in and we + gave up. + + 8 -- REASON_NOROUTE + + Like CONNECTREFUSED except the errno at the hidden service when + trying to connect() to the service was ENETUNREACH, EHOSTUNREACH, + EACCES, or EPERM. + + 10 -- REASON_INTERNAL + + Internal error inside the Tor client -- hopefully you will not see + this much. Please report if you do! + + 12 -- REASON_CONNRESET + + Like CONNECTREFUSED except the errno at the hidden service when + trying to connect() to the service was ECONNRESET. + 2. Authentication and authorization. The rendezvous protocol as described in Section 1 provides a few options

1 0

[tor/master] Fix scheduler compilation on targets where char is unsigned.
by nickm＠torproject.org 06 Feb '15

06 Feb '15

commit 16cf1679e78c690869be3d26448a965e8d1330b0 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Fri Feb 6 16:26:28 2015 +0000 Fix scheduler compilation on targets where char is unsigned. Per discussion with nickm, the `dir` argument should be a int rather than a signed char. Fixes bug #14764. --- changes/bug14764 | 4 ++++ src/or/scheduler.c | 2 +- src/or/scheduler.h | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/bug14764 b/changes/bug14764 new file mode 100644 index 0000000..b05ff69 --- /dev/null +++ b/changes/bug14764 @@ -0,0 +1,4 @@ + o Minor bugfixes (portability): + - Fix scheduler compilation on targets where char is unsigned. + Fixes bug 14764; bugfix on 0.2.6.2-alpha. Reported by Christian + Kujau. diff --git a/src/or/scheduler.c b/src/or/scheduler.c index f3fbc4a..931bb6b 100644 --- a/src/or/scheduler.c +++ b/src/or/scheduler.c @@ -613,7 +613,7 @@ scheduler_touch_channel(channel_t *chan) */ void -scheduler_adjust_queue_size(channel_t *chan, char dir, uint64_t adj) +scheduler_adjust_queue_size(channel_t *chan, int dir, uint64_t adj) { time_t now = approx_time(); diff --git a/src/or/scheduler.h b/src/or/scheduler.h index 70f6a39..27dd2d8 100644 --- a/src/or/scheduler.h +++ b/src/or/scheduler.h @@ -29,7 +29,7 @@ void scheduler_channel_wants_writes(channel_t *chan); MOCK_DECL(void,scheduler_release_channel,(channel_t *chan)); /* Notify scheduler of queue size adjustments */ -void scheduler_adjust_queue_size(channel_t *chan, char dir, uint64_t adj); +void scheduler_adjust_queue_size(channel_t *chan, int dir, uint64_t adj); /* Notify scheduler that a channel's queue position may have changed */ void scheduler_touch_channel(channel_t *chan);

1 0