- tor-commits - lists.torproject.org

[tor/maint-0.2.2] Provide correct timeradd/timersup replacements
by nickm＠torproject.org 26 Dec '11

26 Dec '11

commit da876aec63b133b64eb6e71f8b87df5c84e7ec3b Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Dec 25 23:19:08 2011 +0100 Provide correct timeradd/timersup replacements Bug caught and patch provided by Vektor. Fixes bug 4778.t --- changes/timersub_bug | 7 +++++++ src/common/compat.h | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/changes/timersub_bug b/changes/timersub_bug new file mode 100644 index 0000000..9183862 --- /dev/null +++ b/changes/timersub_bug @@ -0,0 +1,7 @@ + o Major bugfixes: + - Provide correct replacements for the timeradd() and timersub() functions + for platforms that lack them (for example, windows). The timersub() + function is used when expiring circuits, timeradd() is currently unused. + Patch written by Vektor, who also reported the bug. Thanks! Bugfix + on 0.2.2.24-alpha/0.2.3.1-alpha, fixes bug 4778. + diff --git a/src/common/compat.h b/src/common/compat.h index 3e1b5b8..e0b074c 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -334,7 +334,7 @@ struct tm *tor_gmtime_r(const time_t *timep, struct tm *result); #define timeradd(tv1,tv2,tvout) \ do { \ (tvout)->tv_sec = (tv1)->tv_sec + (tv2)->tv_sec; \ - (tvout)->tv_usec = (tv2)->tv_usec + (tv2)->tv_usec; \ + (tvout)->tv_usec = (tv1)->tv_usec + (tv2)->tv_usec; \ if ((tvout)->tv_usec >= 1000000) { \ (tvout)->tv_usec -= 1000000; \ (tvout)->tv_sec++; \ @@ -348,7 +348,7 @@ struct tm *tor_gmtime_r(const time_t *timep, struct tm *result); #define timersub(tv1,tv2,tvout) \ do { \ (tvout)->tv_sec = (tv1)->tv_sec - (tv2)->tv_sec; \ - (tvout)->tv_usec = (tv2)->tv_usec - (tv2)->tv_usec; \ + (tvout)->tv_usec = (tv1)->tv_usec - (tv2)->tv_usec; \ if ((tvout)->tv_usec < 0) { \ (tvout)->tv_usec += 1000000; \ (tvout)->tv_sec--; \

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 26 Dec '11

26 Dec '11

commit ba27bedc3d3582910c916459b90a4593880508b8 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 26 15:45:03 2011 +0000 Update translations for gettor --- fa/gettor.po | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/fa/gettor.po b/fa/gettor.po index a7c4a49..10a50db 100644 --- a/fa/gettor.po +++ b/fa/gettor.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-13 22:01+0100\n" -"PO-Revision-Date: 2011-12-26 15:12+0000\n" +"PO-Revision-Date: 2011-12-26 15:25+0000\n" "Last-Translator: martin luther king <sabztunnel(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -291,6 +291,9 @@ msgid "" "BLOCKED ACCESS / CENSORSHIP\n" "===========================" msgstr "" +"دسترسی مسدود / سانسور \n" +"\n" +"==================" #: lib/gettor/i18n.py:155 msgid "" @@ -314,6 +317,10 @@ msgid "" "\n" " bridges(a)torproject.org" msgstr "" +"شما میتوانید با فرستادن تنها یک ایمیل، پلهای ارتباطی‌ دریافت کنید که به وسیله آنها بتوانید دسترسی‌ آزاد پیدا کنید.\n" +" کافی است در بدنه ایمیل واژه \"get bridges\" را تایپ کنید\n" +"\n" +"bridges(a)torproject.org" #: lib/gettor/i18n.py:167 msgid "" @@ -349,12 +356,16 @@ msgid "" "It was successfully understood. Your request is currently being processed.\n" "Your package (%s) should arrive within the next ten minutes." msgstr "" +"کاملاً متوجه شدیم. درخواست شما دریافت شد و تحت بررسی است. تا ده دقیقهء آینده باید بسته نرم افزاری درخواستیتان را دریافت کنید\n" +"(%s)" #: 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 ""

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 26 Dec '11

26 Dec '11

commit a5afb3df060c80921526deef312a0333f8d6d4b7 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 26 15:15:03 2011 +0000 Update translations for gettor --- fa/gettor.po | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/fa/gettor.po b/fa/gettor.po index 4418935..a7c4a49 100644 --- a/fa/gettor.po +++ b/fa/gettor.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-13 22:01+0100\n" -"PO-Revision-Date: 2011-12-26 13:28+0000\n" +"PO-Revision-Date: 2011-12-26 15:12+0000\n" "Last-Translator: martin luther king <sabztunnel(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -228,6 +228,8 @@ msgid "" "clicking the file ending in \"..split.part01.exe\". This should start the \n" "process automatically." msgstr "" +"مجموعه فایل‌های ایجاد شده را با اجرای فایل اجرایی \"...split.part۰۱.exe\" به" +" یکریگر متصل کنید." #: lib/gettor/i18n.py:121 msgid "" @@ -246,13 +248,15 @@ msgstr "6- همن. تمام شد. سپاسگذاریم که از تُر استف msgid "" "SUPPORT\n" "=======" -msgstr "" +msgstr "پشتیبانی" #: 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 "" @@ -278,6 +282,9 @@ msgid "" "\n" " http://www.gnupg.org/related_software/frontends.html" msgstr "" +"در صورتی که با command line آشنا نیستید، در وب سایت زیر نرم افزار GNUPG را با interface گرافیکی پیدا کنید.\n" +"\n" +"http://www.gnupg.org/related_software/frontends.html" #: lib/gettor/i18n.py:152 msgid ""

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 26 Dec '11

26 Dec '11

commit b3989ef36161c774935ce924a157605d24f04d1a Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 26 13:45:03 2011 +0000 Update translations for gettor --- fa/gettor.po | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/fa/gettor.po b/fa/gettor.po index 377351b..4418935 100644 --- a/fa/gettor.po +++ b/fa/gettor.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-13 22:01+0100\n" -"PO-Revision-Date: 2011-12-26 13:05+0000\n" +"PO-Revision-Date: 2011-12-26 13:28+0000\n" "Last-Translator: martin luther king <sabztunnel(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -210,6 +210,10 @@ msgid "" "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 "" +"۲) تمامی‌ فایل‌هایی‌ که به پسوند .z ختم میشوند را unzip کنید. اگر تمامی‌ " +"اتچمنت‌ها را درون یک folder ذخیره کرده اید، همهٔ آنها را در همان جا unzip " +"کنید. در صورتی‌ که نمی‌دانید چگونه فایل‌های خود را unzip کنید، به بخش " +"\"unpack کردنِ فایل ها\" مراجعه کنید." #: lib/gettor/i18n.py:114 msgid ""

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 26 Dec '11

26 Dec '11

commit f0e03c646eda7a079c4679b365e18fadd5e8fbff Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 26 13:15:03 2011 +0000 Update translations for gettor --- fa/gettor.po | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/fa/gettor.po b/fa/gettor.po index 764e555..377351b 100644 --- a/fa/gettor.po +++ b/fa/gettor.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-13 22:01+0100\n" -"PO-Revision-Date: 2011-12-26 12:41+0000\n" +"PO-Revision-Date: 2011-12-26 13:05+0000\n" "Last-Translator: martin luther king <sabztunnel(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -179,6 +179,10 @@ msgid "" " windows\n" " split" msgstr "" +"برای این منظور, واژهی سپلیت را در یک خط به صورت مجزا قرار دهید (دقت کنید که این کلمه به تنهایی و به صورت مجزا در یک خط قرار گیرد ). به عنوان مثال:\n" +"\n" +"windows\n" +"split" #: lib/gettor/i18n.py:102 msgid ""

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 26 Dec '11

26 Dec '11

commit e9c6dc4c6c6ec0ba5fdeb30266ae718840793d07 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 26 12:45:03 2011 +0000 Update translations for gettor --- fa/gettor.po | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/fa/gettor.po b/fa/gettor.po index 027d036..764e555 100644 --- a/fa/gettor.po +++ b/fa/gettor.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-13 22:01+0100\n" -"PO-Revision-Date: 2011-12-26 12:06+0000\n" +"PO-Revision-Date: 2011-12-26 12:41+0000\n" "Last-Translator: martin luther king <sabztunnel(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -94,7 +94,7 @@ msgstr "" msgid "" "OBTAINING LOCALIZED VERSIONS OF TOR\n" "===================================" -msgstr "" +msgstr "تهیه نسخهٔ tor به زبان خود" #: lib/gettor/i18n.py:62 msgid "" @@ -103,6 +103,9 @@ msgid "" "\n" " gettor+fa(a)torproject.org" msgstr "" +"برای دریافت نسخه ترجمه شده تُر به زبان دلخواهتان، آن زبان را در آدرسِ ایمیلی که به تُر میفرستید، تعین کنید:\n" +"\n" +"gettor+fa(a)torproject.org" #: lib/gettor/i18n.py:67 msgid "" @@ -110,6 +113,9 @@ msgid "" "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:" @@ -154,7 +160,7 @@ msgstr "" msgid "" "SMALLER SIZED PACKAGES\n" "======================" -msgstr "" +msgstr "بسته‌های نرم افزاری با اندازه کوچک تر" #: lib/gettor/i18n.py:92 msgid "" @@ -162,6 +168,8 @@ msgid "" "receive large attachments in your email, GetTor can send you several\n" "small packages instead of one big one." msgstr "" +"اگر سرعت اینترنت شما پائین است و قادر به دریافت اتچمنت‌های بزرگ در ایمیل خود" +" نیستید، gettor میتواند چند بسته کوچت به جای یک بسته بزرگ به شما ایمیل کند. " #: lib/gettor/i18n.py:96 msgid ""

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 26 Dec '11

26 Dec '11

commit c4ec4d073689d2fb9a0765bc55f5d7cddb081380 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 26 12:15:03 2011 +0000 Update translations for gettor --- fa/gettor.po | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/fa/gettor.po b/fa/gettor.po index 035e4de..027d036 100644 --- a/fa/gettor.po +++ b/fa/gettor.po @@ -5,13 +5,14 @@ # Translators: # <behravanhamed(a)gmail.com>, 2011. # Jacob Appelbaum <jacob(a)appelbaum.net>, 2009. +# martin luther king <sabztunnel(a)gmail.com>, 2011. 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-14 04:06+0000\n" -"Last-Translator: behravan <behravanhamed(a)gmail.com>\n" +"PO-Revision-Date: 2011-12-26 12:06+0000\n" +"Last-Translator: martin luther king <sabztunnel(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -72,12 +73,22 @@ msgid "" " linux-x86_64\n" " source" msgstr "" +"به محض اینکه شما من را از بسته نرم افزاری مورد نظر مطلع کنید، من آن را برای شما خواهم فرستاد. لطفا از بسته‌های نرم افزاری زیر یکی‌ را انتخاب کنید، \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 ""

1 0

[tor/master] Log what fraction of EXTEND cells have died for being non-early
by arma＠torproject.org 25 Dec '11

25 Dec '11

commit 847541ce5db48152576639d7adc0a6209b661be9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 21 17:51:46 2011 -0500 Log what fraction of EXTEND cells have died for being non-early --- src/or/relay.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/src/or/relay.c b/src/or/relay.c index 60d439a..fdc2600 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1188,7 +1188,9 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, connection_mark_and_flush(TO_CONN(conn)); } return 0; - case RELAY_COMMAND_EXTEND: + case RELAY_COMMAND_EXTEND: { + static uint64_t total_n_extend=0, total_nonearly=0; + total_n_extend++; if (conn) { log_fn(LOG_PROTOCOL_WARN, domain, "'extend' cell received for non-zero stream. Dropping."); @@ -1200,10 +1202,15 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, RATELIM_INIT(EARLY_WARNING_INTERVAL); char *m; if (cell->command == CELL_RELAY) { + ++total_nonearly; if ((m = rate_limit_log(&early_warning_limit, approx_time()))) { /* XXXX make this a protocol_warn once we're happier with it*/ + double percentage = ((double)total_nonearly)/total_n_extend; + percentage *= 100; log_fn(LOG_WARN, domain, "EXTEND cell received, " "but not via RELAY_EARLY. Dropping.%s", m); + log_fn(LOG_WARN, domain, " (We have dropped %.02f%% of all " + "EXTEND cells for this reason)", percentage); tor_free(m); } } else { @@ -1214,6 +1221,7 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, return 0; } return circuit_extend(cell, circ); + } case RELAY_COMMAND_EXTENDED: if (!layer_hint) { log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,

1 0

[tor/master] Merge remote-tracking branch 'nickm/prop110_v2'
by arma＠torproject.org 25 Dec '11

25 Dec '11

commit 3aade2fab7030211b7a8ae6ab1bd310c378be462 Merge: 86079a8 2710a96 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Dec 25 17:43:09 2011 -0500 Merge remote-tracking branch 'nickm/prop110_v2' changes/prop110 | 7 +++++++ src/or/relay.c | 30 +++++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 1 deletions(-)

1 0

[tor/master] Implement the last of proposal 110
by arma＠torproject.org 25 Dec '11

25 Dec '11

commit 0187bd872885343761174218529aed7058f8d636 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 28 10:51:21 2011 -0400 Implement the last of proposal 110 Reject all EXTEND requests not received in a relay_early cell --- changes/prop110 | 7 +++++++ src/or/relay.c | 19 +++++++++++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/changes/prop110 b/changes/prop110 new file mode 100644 index 0000000..843595e --- /dev/null +++ b/changes/prop110 @@ -0,0 +1,7 @@ + o Major features: + - Now that Tor 0.2.0.x is completely deprecated, we can enable the + final part of "Proposal 110: Avoiding infinite length circuits" + by refusing all circuit-extend requests that do not appear in a + "relay_early" cell. This change helps Tor to resist a class of + denial-of-service attacks by limiting the maximum circuit length. + diff --git a/src/or/relay.c b/src/or/relay.c index 6cf4b73..60d439a 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1194,6 +1194,25 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, "'extend' cell received for non-zero stream. Dropping."); return 0; } + if (cell->command != CELL_RELAY_EARLY) { +#define EARLY_WARNING_INTERVAL 900 + static ratelim_t early_warning_limit = + RATELIM_INIT(EARLY_WARNING_INTERVAL); + char *m; + if (cell->command == CELL_RELAY) { + if ((m = rate_limit_log(&early_warning_limit, approx_time()))) { + /* XXXX make this a protocol_warn once we're happier with it*/ + log_fn(LOG_WARN, domain, "EXTEND cell received, " + "but not via RELAY_EARLY. Dropping.%s", m); + tor_free(m); + } + } else { + log_fn(LOG_WARN, domain, + "EXTEND cell received, in a cell with type %d! Dropping.", + cell->command); + } + return 0; + } return circuit_extend(cell, circ); case RELAY_COMMAND_EXTENDED: if (!layer_hint) {

1 0