March 2012 - tor-commits - lists.torproject.org

[tor/master] Fix cut'n'paste bug (#5151).
by nickm＠torproject.org 28 Mar '12

28 Mar '12

commit ce5489eec0a032aa98622c3dc0af1af7220a3ad4 Author: Linus Nordberg <linus(a)nordberg.se> Date: Mon Mar 19 04:55:17 2012 +0100 Fix cut'n'paste bug (#5151). --- src/or/config.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 0c699b0..f9a3350 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -5774,7 +5774,7 @@ parse_port_config(smartlist_t *out, cfg->session_group = sessiongroup; cfg->isolation_flags = isolation; cfg->no_listen = no_listen; - cfg->no_listen = no_advertise; + cfg->no_advertise = no_advertise; cfg->all_addrs = all_addrs; cfg->ipv4_only = ipv4_only; cfg->ipv6_only = ipv6_only;

1 0

[tor/master] note that bug 5151 is on 0.2.3.9-alpha
by nickm＠torproject.org 28 Mar '12

28 Mar '12

commit 4703bf8792b69745bc87d4b2838c3b69b98e81b8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 28 17:19:24 2012 -0400 note that bug 5151 is on 0.2.3.9-alpha --- changes/bug5151 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/changes/bug5151 b/changes/bug5151 index f872aa4..4ea1219 100644 --- a/changes/bug5151 +++ b/changes/bug5151 @@ -1,4 +1,4 @@ o Minor bugfixes: - Fix bug stomping on ORPort option NoListen and ignoring option - NoAdvertise. Fixes bug 5151. + NoAdvertise. Fixes bug 5151; bugfix on 0.2.3.9-alpha. - Move a debug printout from notice to debug level.

1 0

[tor/master] Merge remote-tracking branch 'linus/bug5151'
by nickm＠torproject.org 28 Mar '12

28 Mar '12

commit 04a1696095f936e68b524ac3c4881bf404e450a5 Merge: 77bc1b8 bd4d8fc Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 28 17:18:30 2012 -0400 Merge remote-tracking branch 'linus/bug5151' changes/bug5151 | 4 ++++ src/or/config.c | 8 ++++---- src/or/router.c | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-)

1 0

[tor/master] Reorder initialisation of port_cfg to match order of members in struct.
by nickm＠torproject.org 28 Mar '12

28 Mar '12

commit bb2135fea68b53b4e75795c7b1bd632ce4f0d459 Author: Linus Nordberg <linus(a)nordberg.se> Date: Mon Mar 19 04:57:19 2012 +0100 Reorder initialisation of port_cfg to match order of members in struct. --- src/or/config.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index f9a3350..55fe615 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -5768,13 +5768,13 @@ parse_port_config(smartlist_t *out, if (out && port) { port_cfg_t *cfg = tor_malloc_zero(sizeof(port_cfg_t)); - cfg->type = listener_type; - cfg->port = port; tor_addr_copy(&cfg->addr, &addr); - cfg->session_group = sessiongroup; + cfg->port = port; + cfg->type = listener_type; cfg->isolation_flags = isolation; - cfg->no_listen = no_listen; + cfg->session_group = sessiongroup; cfg->no_advertise = no_advertise; + cfg->no_listen = no_listen; cfg->all_addrs = all_addrs; cfg->ipv4_only = ipv4_only; cfg->ipv6_only = ipv6_only;

1 0

[translation/vidalia_completed] Update translations for vidalia_completed
by translation＠torproject.org 28 Mar '12

28 Mar '12

commit 31a9e8831d1b62d2b62fb809f9759dfde372e62f Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 28 17:45:11 2012 +0000 Update translations for vidalia_completed --- ru/vidalia_ru.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ru/vidalia_ru.po b/ru/vidalia_ru.po index ee7f021..8d267df 100644 --- a/ru/vidalia_ru.po +++ b/ru/vidalia_ru.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-03-24 23:37+0000\n" +"PO-Revision-Date: 2012-03-28 17:35+0000\n" "Last-Translator: liquixis <liquixis(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.net/projects/p/torproject/language/ru/)\n" "MIME-Version: 1.0\n" @@ -404,7 +404,7 @@ msgstr "Закрыть Поток (Del)" msgctxt "ConfigDialog" msgid "General" -msgstr "General" +msgstr "Общие" msgctxt "ConfigDialog" msgid "Network" @@ -1962,11 +1962,11 @@ msgstr "Ярлыки Vidalia" msgctxt "MainWindow" msgid "Setup Relaying" -msgstr "Настройка ретрансляции" +msgstr "Ретранслятор" msgctxt "MainWindow" msgid "Set up a relay and help the network grow" -msgstr "Установите ретранслятор и помогите росту сети" +msgstr "Настройте ретранслятор и помогите росту сети" msgctxt "MainWindow" msgid "View the Network" @@ -1978,7 +1978,7 @@ msgstr "Обзор карты сети Tor" msgctxt "MainWindow" msgid "Use a New Identity" -msgstr "Использовать Новую Личность" +msgstr "Сменить личность" msgctxt "MainWindow" msgid "Make subsequent connections appear new"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 28 Mar '12

28 Mar '12

commit 09821bf4fa30dbf87691d95de947cfe8b02d7d1b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 28 17:45:08 2012 +0000 Update translations for vidalia --- ru/vidalia_ru.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ru/vidalia_ru.po b/ru/vidalia_ru.po index ee7f021..8d267df 100644 --- a/ru/vidalia_ru.po +++ b/ru/vidalia_ru.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-03-24 23:37+0000\n" +"PO-Revision-Date: 2012-03-28 17:35+0000\n" "Last-Translator: liquixis <liquixis(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.net/projects/p/torproject/language/ru/)\n" "MIME-Version: 1.0\n" @@ -404,7 +404,7 @@ msgstr "Закрыть Поток (Del)" msgctxt "ConfigDialog" msgid "General" -msgstr "General" +msgstr "Общие" msgctxt "ConfigDialog" msgid "Network" @@ -1962,11 +1962,11 @@ msgstr "Ярлыки Vidalia" msgctxt "MainWindow" msgid "Setup Relaying" -msgstr "Настройка ретрансляции" +msgstr "Ретранслятор" msgctxt "MainWindow" msgid "Set up a relay and help the network grow" -msgstr "Установите ретранслятор и помогите росту сети" +msgstr "Настройте ретранслятор и помогите росту сети" msgctxt "MainWindow" msgid "View the Network" @@ -1978,7 +1978,7 @@ msgstr "Обзор карты сети Tor" msgctxt "MainWindow" msgid "Use a New Identity" -msgstr "Использовать Новую Личность" +msgstr "Сменить личность" msgctxt "MainWindow" msgid "Make subsequent connections appear new"

1 0

[tor/master] Fix a bunch of check-spaces complaints
by nickm＠torproject.org 28 Mar '12

28 Mar '12

commit 77bc1b803e0d58b23ff48c2359300ef812f10ee1 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Mar 28 15:02:15 2012 +0200 Fix a bunch of check-spaces complaints --- src/or/connection.c | 3 ++- src/or/networkstatus.c | 4 ++-- src/test/test_util.c | 11 ++++------- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index afdda92..c9093fe 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -913,7 +913,8 @@ connection_listener_new(const struct sockaddr *listensockaddr, #endif /* We need to set IPV6_V6ONLY so that this socket can't get used for * IPv4 connections. */ - if (setsockopt(s,IPPROTO_IPV6, IPV6_V6ONLY, (void*)&one, sizeof(one))<0) { + if (setsockopt(s,IPPROTO_IPV6, IPV6_V6ONLY, + (void*)&one, sizeof(one))<0) { int e = tor_socket_errno(s); log_warn(LD_NET, "Error setting IPV6_V6ONLY flag: %s", tor_socket_strerror(e)); diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index afd531a..910b99c 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1357,8 +1357,8 @@ update_consensus_networkstatus_fetch_time_impl(time_t now, int flav) format_local_iso_time(tbuf1, c->fresh_until); format_local_iso_time(tbuf2, c->valid_until); format_local_iso_time(tbuf3, time_to_download_next_consensus[flav]); - log_info(LD_DIR, "Live %s consensus %s the most recent until %s and will " - "expire at %s; fetching the next one at %s.", + log_info(LD_DIR, "Live %s consensus %s the most recent until %s and " + "will expire at %s; fetching the next one at %s.", flavor, (c->fresh_until > now) ? "will be" : "was", tbuf1, tbuf2, tbuf3); } diff --git a/src/test/test_util.c b/src/test/test_util.c index 9da4cb7..0f9d1a7 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -50,7 +50,6 @@ test_util_time(void) test_eq(-1005000L, tv_udiff(&start, &end)); - /* Test tor_timegm */ /* The test values here are confirmed to be correct on a platform @@ -77,7 +76,6 @@ test_util_time(void) a_time.tm_mday = 10; test_eq((time_t) -1, tor_timegm(&a_time)); - /* Test {format,parse}_rfc1123_time */ format_rfc1123_time(timestr, 0); @@ -110,7 +108,6 @@ test_util_time(void) test_eq(-1, parse_rfc1123_time("Wed, 30 Mar 2011 23:59:61 GMT", &t_res)); #endif - /* Test parse_iso_time */ t_res = 0; @@ -140,7 +137,6 @@ test_util_time(void) test_eq(-1, parse_iso_time("2011-00-30 23:59:59 GMT", &t_res)); test_eq(-1, parse_iso_time("2011-03-30 23:59", &t_res)); - /* Test tor_gettimeofday */ end.tv_sec = 4; @@ -154,7 +150,6 @@ test_util_time(void) /* We might've timewarped a little. */ tt_int_op(tv_udiff(&start, &end), >=, -5000); - /* Test format_iso_time */ tv.tv_sec = (time_t)1326296338; @@ -910,7 +905,8 @@ test_util_strmisc(void) wrap_string(sl, "A test of string wrapping...", 6, "### ", "# "); cp = smartlist_join_strings(sl, "", 0, NULL); - test_streq(cp, "### A\n# test\n# of\n# stri\n# ng\n# wrap\n# ping\n# ...\n"); + test_streq(cp, + "### A\n# test\n# of\n# stri\n# ng\n# wrap\n# ping\n# ...\n"); tor_free(cp); SMARTLIST_FOREACH(sl, char *, cp, tor_free(cp)); smartlist_clear(sl); @@ -924,7 +920,8 @@ test_util_strmisc(void) wrap_string(sl, "Small test", 6, "### ", "#### "); cp = smartlist_join_strings(sl, "", 0, NULL); - test_streq(cp, "### Sm\n#### a\n#### l\n#### l\n#### t\n#### e\n#### s\n#### t\n"); + test_streq(cp, "### Sm\n#### a\n#### l\n#### l\n#### t\n#### e" + "\n#### s\n#### t\n"); tor_free(cp); SMARTLIST_FOREACH(sl, char *, cp, tor_free(cp)); smartlist_clear(sl);

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 28 Mar '12

28 Mar '12

commit d5626414cd4ca2932db08f363a229de054d9bea9 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 28 09:45:04 2012 +0000 Update translations for orbot --- values-fa/strings.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/values-fa/strings.xml b/values-fa/strings.xml index 23c9c25..9316757 100644 --- a/values-fa/strings.xml +++ b/values-fa/strings.xml @@ -97,7 +97,7 @@ <string name="wizard_permissions_no_root_msg">Your device does not appear to be rooted or provide \'Superuser\' access.\n\nIn order to you to benefit from Tor, you will need to use apps built to work with Orbot, or that support HTTP or SOCKS proxy settings.\n\n</string>  <string name="wizard_tips_title"> روی آنها فعال استOrbot لیکیشنهایی که </string> - <string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string> + <string name="wizard_tips_gibberbot">برنامهٔ چت را با پنهان کنندهٔ بی‌ انتشار ایمنی‌ کنید:Gibberbot</string> <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> <string name="wizard_tips_orweb">ORWEB (فقط آندروید 1.x) - مرورگر طراحی شده برای حفظ حریم خصوصی و افزونساز اوربات</string> <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> @@ -166,7 +166,7 @@ <string name="relaying">درحال بازپخش</string> <string name="enable_your_device_to_be_a_non_exit_relay">دستگاه خود را برای یک بازپخش کننده غیر-خروجی فعال کنید</string> <string name="relay_port">پورت بازپخش کننده</string> - <string name="listening_port_for_your_tor_relay">Listening port for your Tor relay</string> + <string name="listening_port_for_your_tor_relay"> شما Tor پورت شنونده برای باز پخش</string> <string name="enter_or_port">پورت OR را وارد کنید</string> <string name="relay_nickname">نام مستعار بازپخش کننده</string> <string name="the_nickname_for_your_tor_relay">نام مستعار بازپخش کننده شما</string>

1 0

[tor/master] tab-man strikes back (fixup on a9c0e9fec2)
by arma＠torproject.org 28 Mar '12

28 Mar '12

commit c3a7bcf4e6652fe34714caaf94cb39e555df87b1 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Mar 28 04:06:56 2012 -0400 tab-man strikes back (fixup on a9c0e9fec2) --- doc/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index d26f830..6cdd66d 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -38,7 +38,7 @@ EXTRA_DIST = HACKING asciidoc-helper.sh \ $(html_in) $(man_in) $(txt_in) \ tor-rpm-creation.txt \ tor-win32-mingw-creation.txt spec/README \ - state-contents.txt + state-contents.txt docdir = @docdir@

1 0

[tor/master] Write initial documentation for the contents of the state file
by nickm＠torproject.org 28 Mar '12

28 Mar '12

commit a9c0e9fec2ced629aefdc1436ec41467353cc9a0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 28 04:08:07 2012 -0400 Write initial documentation for the contents of the state file Fixes bug 2987. There is still some information to go, but now we have a place to put it. --- changes/bug2987 | 3 + doc/Makefile.am | 3 +- doc/state-contents.txt | 105 ++++++++++++++++++++++++++++++++++++++++++++++++ src/or/config.c | 2 + 4 files changed, 112 insertions(+), 1 deletions(-) diff --git a/changes/bug2987 b/changes/bug2987 new file mode 100644 index 0000000..727f376 --- /dev/null +++ b/changes/bug2987 @@ -0,0 +1,3 @@ + o Documentation + - Begin a state-contents.txt file in doc to explain the contents of the + Tor state file. Fixes bug 2987. diff --git a/doc/Makefile.am b/doc/Makefile.am index d8d9fbe..d26f830 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -37,7 +37,8 @@ endif EXTRA_DIST = HACKING asciidoc-helper.sh \ $(html_in) $(man_in) $(txt_in) \ tor-rpm-creation.txt \ - tor-win32-mingw-creation.txt spec/README + tor-win32-mingw-creation.txt spec/README \ + state-contents.txt docdir = @docdir@ diff --git a/doc/state-contents.txt b/doc/state-contents.txt new file mode 100644 index 0000000..730e2fb --- /dev/null +++ b/doc/state-contents.txt @@ -0,0 +1,105 @@ + +Contents of the Tor state file +============================== + +The state file is structured with more or less the same rules as torrc. +Recognized fields are: + + TorVersion + + The version of Tor that wrote this file + + LastWritten + + Time when this state file was written. + Given in ISO format (YYYY-MM-DD HH:MM:SS) + + AccountingBytesReadInInterval (memory unit) + AccountingBytesWrittenInInterval (memory unit) + AccountingExpectedUsage (memory unit) + AccountingIntervalStart (ISO time) + AccountingSecondsActive (time interval) + AccountingSecondsToReachSoftLimit (time interval) + AccountingSoftLimitHitAt (ISO time) + AccountingBytesAtSoftLimit (memory unit) + + These fields describe the state of the accounting subsystem. + + The IntervalStart is the time at which the current accounting + interval began. We were expecting to use ExpectedUsage over the + course of the interval. BytesRead/BytesWritten are the total + number of bytes transferred over the whole interval. If Tor has + been active during the interval, then AccountingSecondsActive is + the amount of time for which it has been active. We were expecting + to hit the bandwidth soft limit in SecondsToReachSoftLimit after we + became active. When we hit the soft limit, we record + BytesAtSoftLimit. If we hit the soft limit already, we did so at + SoftLimitHitAt. + + EntryGuard + EntryGuardDownSince + EntryGuardUnlistedSince + EntryGuardAddedBy + + These lines form sections related to entry guards. Each section + starts with a single EntryGuard line, and is then followed by + information on the state of the Entry guard. + + The EntryGuard line contains a nickname, then an identity digest, of + the guard. + + The EntryGuardDownSince and EntryGuardUnlistedSince lines are present + if the entry guard is believed to be non-running or non-listed. If + present, they contain a line in ISO format (YYYY-MM-DD HH:MM:SS). + + The EntryGuardAddedBy line is optional. It contains three + space-separated fields: the identity of the entry guard, the version of + Tor that added it, and the ISO time at which it was added. + + TransportProxy + + One or more of these may be present. + + The format is "transportname addr:port", to remember the address at + which a pluggable transport was listening. + + [XXXX why?] + + BWHistoryReadEnds (ISO time) + BWHistoryReadInterval (integer, number of seconds) + BWHistoryReadValues (comma-separated list of integer) + BWHistoryReadMaxima (comma-separated list of integer) + BWHistoryWriteEnds + BWHistoryWriteInterval + BWHistoryWriteValues + BWHistoryWriteMaxima + BWHistoryDirReadEnds + BWHistoryDirReadInterval + BWHistoryDirReadValues + BWHistoryDirReadMaxima + BWHistoryDirWriteEnds + BWHistoryDirWriteInterval + BWHistoryDirWriteValues + BWHistoryDirWriteMaxima + + These values record bandwidth history. The "Values" fields are a list, for + some number of "Intervals", of the total amount read/written during that + integer. The "Maxima" are the highest burst for each interval. + + Interval duration is set by the "Interval" field, in seconds. The + "Ends" field is the ending time of the last interval in each list. + + The *Read* and *Write* fields are the total amount read and + written; the *DirRead* and *DirWrite* variants are for directory + traffic only. + + LastRotatedOnionKey + + The last time that we changed our onion key for a new one. + Given in ISO format (YYYY-MM-DD HH:MM:SS) + + TotalBuildTimes + CircuitBuildAbandonedCount + CircuitBuildTimeBin + + XXXX writeme. diff --git a/src/or/config.c b/src/or/config.c index 3de8426..05f53bd 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -484,6 +484,8 @@ static const config_var_t testing_tor_network_defaults[] = { /** Array of "state" variables saved to the ~/.tor/state file. */ static config_var_t _state_vars[] = { + /* Remember to document these in state-contents.txt ! */ + V(AccountingBytesReadInInterval, MEMUNIT, NULL), V(AccountingBytesWrittenInInterval, MEMUNIT, NULL), V(AccountingExpectedUsage, MEMUNIT, NULL),

1 0