April 2016 - tor-commits - lists.torproject.org

[tor/release-0.2.8] Don't call the system toupper or tolower.
by nickm＠torproject.org 06 Apr '16

06 Apr '16

commit d7a0382ba337bd1cbd7568a607d85e303012b22c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 5 23:22:28 2016 -0400 Don't call the system toupper or tolower. Yes, we could cast to unsigned char first, but it's probably safest to just use our own (in test_util), or remove bad-idea features that we don't use (in readpassphrase.c). Fixes 18728. --- changes/bug18728 | 4 ++++ src/ext/readpassphrase.c | 2 ++ src/ext/tor_readpassphrase.h | 2 ++ src/test/test_util.c | 3 ++- 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/changes/bug18728 b/changes/bug18728 new file mode 100644 index 0000000..e181c17 --- /dev/null +++ b/changes/bug18728 @@ -0,0 +1,4 @@ + o Minor bugfixes (build): + - Resolve warnings when building on systems that are concerned with + signed char. Fixes bug 18728; bugfix on 0.2.7.2-alpha and + 0.2.6.1-alpha. diff --git a/src/ext/readpassphrase.c b/src/ext/readpassphrase.c index ab71935..e0df05d 100644 --- a/src/ext/readpassphrase.c +++ b/src/ext/readpassphrase.c @@ -142,6 +142,7 @@ restart: p = buf; while ((nr = read(input, &ch, 1)) == 1 && ch != '\n' && ch != '\r') { if (p < end) { +#if 0 if ((flags & RPP_SEVENBIT)) ch &= 0x7f; if (isalpha(ch)) { @@ -150,6 +151,7 @@ restart: if ((flags & RPP_FORCEUPPER)) ch = (char)toupper(ch); } +#endif *p++ = ch; } } diff --git a/src/ext/tor_readpassphrase.h b/src/ext/tor_readpassphrase.h index 83ae1f2..64f5668 100644 --- a/src/ext/tor_readpassphrase.h +++ b/src/ext/tor_readpassphrase.h @@ -32,9 +32,11 @@ #define RPP_ECHO_OFF 0x00 /* Turn off echo (default). */ #define RPP_ECHO_ON 0x01 /* Leave echo on. */ #define RPP_REQUIRE_TTY 0x02 /* Fail if there is no tty. */ +#if 0 #define RPP_FORCELOWER 0x04 /* Force input to lower case. */ #define RPP_FORCEUPPER 0x08 /* Force input to upper case. */ #define RPP_SEVENBIT 0x10 /* Strip the high bit from input. */ +#endif #define RPP_STDIN 0x20 /* Read from stdin, not /dev/tty */ char * readpassphrase(const char *, char *, size_t, int); diff --git a/src/test/test_util.c b/src/test/test_util.c index 7d43b81..21ff757 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -2297,7 +2297,8 @@ test_util_sscanf(void *arg) } #define tt_char_op(a,op,b) tt_assert_op_type(a,op,b,char,"%c") -#define tt_ci_char_op(a,op,b) tt_char_op(tolower(a),op,tolower(b)) +#define tt_ci_char_op(a,op,b) \ + tt_char_op(TOR_TOLOWER((int)a),op,TOR_TOLOWER((int)b)) #ifndef HAVE_STRNLEN static size_t

1 0

[tor/release-0.2.8] Merge branch 'bug18728_028' into maint-0.2.8
by nickm＠torproject.org 06 Apr '16

06 Apr '16

commit f6ffe532ab6fb72f120258d27069e8e68959f9b3 Merge: d037369 d7a0382 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 5 23:56:05 2016 -0400 Merge branch 'bug18728_028' into maint-0.2.8 changes/bug18728 | 4 ++++ src/ext/readpassphrase.c | 2 ++ src/ext/tor_readpassphrase.h | 2 ++ src/test/test_util.c | 3 ++- 4 files changed, 10 insertions(+), 1 deletion(-)

1 0

[tor/master] quiet debug logs from periodic_event_dispatch()
by nickm＠torproject.org 06 Apr '16

06 Apr '16

commit d037369e562ec40e602a86919c3e8341c867b48b Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Apr 5 19:38:28 2016 -0400 quiet debug logs from periodic_event_dispatch() Stop blasting twelve lines per second from periodic_event_dispatch() at loglevel debug. Resolves ticket 18729; fix on 0.2.8.1-alpha. --- changes/bug18729 | 3 +++ src/or/periodic.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/changes/bug18729 b/changes/bug18729 new file mode 100644 index 0000000..d4312c0 --- /dev/null +++ b/changes/bug18729 @@ -0,0 +1,3 @@ + o Minor logging changes: + - Stop blasting twelve lines per second from periodic_event_dispatch() + at loglevel debug. Resolves ticket 18729; fix on 0.2.8.1-alpha. diff --git a/src/or/periodic.c b/src/or/periodic.c index 3fe500c..057fcf6 100644 --- a/src/or/periodic.c +++ b/src/or/periodic.c @@ -48,7 +48,7 @@ periodic_event_dispatch(evutil_socket_t fd, short what, void *data) time_t now = time(NULL); const or_options_t *options = get_options(); - log_debug(LD_GENERAL, "Dispatching %s", event->name); +// log_debug(LD_GENERAL, "Dispatching %s", event->name); int r = event->fn(now, options); int next_interval = 0; @@ -71,8 +71,8 @@ periodic_event_dispatch(evutil_socket_t fd, short what, void *data) next_interval = 1; } - log_debug(LD_GENERAL, "Scheduling %s for %d seconds", event->name, - next_interval); +// log_debug(LD_GENERAL, "Scheduling %s for %d seconds", event->name, +// next_interval); struct timeval tv = { next_interval , 0 }; event_add(event->ev, &tv); }

1 0

[tor/master] Merge branch 'maint-0.2.8'
by nickm＠torproject.org 06 Apr '16

06 Apr '16

commit 20d39e86afa37c2a7008c48f97c3ffd298441808 Merge: b46d126 d037369 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 5 23:18:48 2016 -0400 Merge branch 'maint-0.2.8' changes/bug18729 | 3 +++ src/or/periodic.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-)

1 0

[tor/release-0.2.8] quiet debug logs from periodic_event_dispatch()
by nickm＠torproject.org 06 Apr '16

06 Apr '16

commit d037369e562ec40e602a86919c3e8341c867b48b Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Apr 5 19:38:28 2016 -0400 quiet debug logs from periodic_event_dispatch() Stop blasting twelve lines per second from periodic_event_dispatch() at loglevel debug. Resolves ticket 18729; fix on 0.2.8.1-alpha. --- changes/bug18729 | 3 +++ src/or/periodic.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/changes/bug18729 b/changes/bug18729 new file mode 100644 index 0000000..d4312c0 --- /dev/null +++ b/changes/bug18729 @@ -0,0 +1,3 @@ + o Minor logging changes: + - Stop blasting twelve lines per second from periodic_event_dispatch() + at loglevel debug. Resolves ticket 18729; fix on 0.2.8.1-alpha. diff --git a/src/or/periodic.c b/src/or/periodic.c index 3fe500c..057fcf6 100644 --- a/src/or/periodic.c +++ b/src/or/periodic.c @@ -48,7 +48,7 @@ periodic_event_dispatch(evutil_socket_t fd, short what, void *data) time_t now = time(NULL); const or_options_t *options = get_options(); - log_debug(LD_GENERAL, "Dispatching %s", event->name); +// log_debug(LD_GENERAL, "Dispatching %s", event->name); int r = event->fn(now, options); int next_interval = 0; @@ -71,8 +71,8 @@ periodic_event_dispatch(evutil_socket_t fd, short what, void *data) next_interval = 1; } - log_debug(LD_GENERAL, "Scheduling %s for %d seconds", event->name, - next_interval); +// log_debug(LD_GENERAL, "Scheduling %s for %d seconds", event->name, +// next_interval); struct timeval tv = { next_interval , 0 }; event_add(event->ev, &tv); }

1 0

[tor/maint-0.2.8] quiet debug logs from periodic_event_dispatch()
by nickm＠torproject.org 06 Apr '16

06 Apr '16

commit d037369e562ec40e602a86919c3e8341c867b48b Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Apr 5 19:38:28 2016 -0400 quiet debug logs from periodic_event_dispatch() Stop blasting twelve lines per second from periodic_event_dispatch() at loglevel debug. Resolves ticket 18729; fix on 0.2.8.1-alpha. --- changes/bug18729 | 3 +++ src/or/periodic.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/changes/bug18729 b/changes/bug18729 new file mode 100644 index 0000000..d4312c0 --- /dev/null +++ b/changes/bug18729 @@ -0,0 +1,3 @@ + o Minor logging changes: + - Stop blasting twelve lines per second from periodic_event_dispatch() + at loglevel debug. Resolves ticket 18729; fix on 0.2.8.1-alpha. diff --git a/src/or/periodic.c b/src/or/periodic.c index 3fe500c..057fcf6 100644 --- a/src/or/periodic.c +++ b/src/or/periodic.c @@ -48,7 +48,7 @@ periodic_event_dispatch(evutil_socket_t fd, short what, void *data) time_t now = time(NULL); const or_options_t *options = get_options(); - log_debug(LD_GENERAL, "Dispatching %s", event->name); +// log_debug(LD_GENERAL, "Dispatching %s", event->name); int r = event->fn(now, options); int next_interval = 0; @@ -71,8 +71,8 @@ periodic_event_dispatch(evutil_socket_t fd, short what, void *data) next_interval = 1; } - log_debug(LD_GENERAL, "Scheduling %s for %d seconds", event->name, - next_interval); +// log_debug(LD_GENERAL, "Scheduling %s for %d seconds", event->name, +// next_interval); struct timeval tv = { next_interval , 0 }; event_add(event->ev, &tv); }

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 06 Apr '16

06 Apr '16

commit 0fd57373ba0406f65f87809f24a4fe93fe8b7a88 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 6 02:15:09 2016 +0000 Update translations for bridgedb_completed --- zh_HK/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_HK/LC_MESSAGES/bridgedb.po b/zh_HK/LC_MESSAGES/bridgedb.po index e2fed47..d86253f 100644 --- a/zh_HK/LC_MESSAGES/bridgedb.po +++ b/zh_HK/LC_MESSAGES/bridgedb.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-04-06 00:20+0000\n" +"PO-Revision-Date: 2016-04-06 02:04+0000\n" "Last-Translator: Kin Kwok\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/otf/torproject/language/zh_HK/)\n" "MIME-Version: 1.0\n" @@ -346,7 +346,7 @@ msgstr "當「Tor洋蔥路由網絡設定」話匣彈出時，按下〔設定〕 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" -msgstr "你的網絡服務供應商(ISP)會否阻擋或過濾Tor洋蔥路由網絡的連線？" +msgstr "你的網絡服務提供者(ISP)會否阻擋或過濾Tor洋蔥路由網絡的連線？" #. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:159

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 06 Apr '16

06 Apr '16

commit 32c32ef66d2e16ded2f868ee29b89c2964e94571 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 6 02:15:04 2016 +0000 Update translations for bridgedb --- zh_HK/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_HK/LC_MESSAGES/bridgedb.po b/zh_HK/LC_MESSAGES/bridgedb.po index e2fed47..d86253f 100644 --- a/zh_HK/LC_MESSAGES/bridgedb.po +++ b/zh_HK/LC_MESSAGES/bridgedb.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-04-06 00:20+0000\n" +"PO-Revision-Date: 2016-04-06 02:04+0000\n" "Last-Translator: Kin Kwok\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/otf/torproject/language/zh_HK/)\n" "MIME-Version: 1.0\n" @@ -346,7 +346,7 @@ msgstr "當「Tor洋蔥路由網絡設定」話匣彈出時，按下〔設定〕 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" -msgstr "你的網絡服務供應商(ISP)會否阻擋或過濾Tor洋蔥路由網絡的連線？" +msgstr "你的網絡服務提供者(ISP)會否阻擋或過濾Tor洋蔥路由網絡的連線？" #. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:159

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 06 Apr '16

06 Apr '16

commit 53048ca861e519b9ac90931a6292d7eaf49eecca Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 6 00:45:08 2016 +0000 Update translations for bridgedb_completed --- zh_HK/LC_MESSAGES/bridgedb.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/zh_HK/LC_MESSAGES/bridgedb.po b/zh_HK/LC_MESSAGES/bridgedb.po index 7b4139b..e2fed47 100644 --- a/zh_HK/LC_MESSAGES/bridgedb.po +++ b/zh_HK/LC_MESSAGES/bridgedb.po @@ -4,6 +4,7 @@ # # Translators: # CasperLi_HK <casper.hk(a)hotmail.com>, 2013 +# Kin Kwok, 2016 # CasperLi_HK <casper.hk(a)hotmail.com>, 2013 # Wen-Gan Li <wgli(a)wgli.net>, 2015 msgid "" @@ -11,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-04-05 06:41+0000\n" +"PO-Revision-Date: 2016-04-06 00:20+0000\n" "Last-Translator: Kin Kwok\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/otf/torproject/language/zh_HK/)\n" "MIME-Version: 1.0\n" @@ -174,7 +175,7 @@ msgstr "這是你的橋接器：" msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." -msgstr "你已超過速度限制。請減慢速度！電郵之間的最短時間為%s個小時。這段時間內所有其他郵件將被忽略。" +msgstr "你已超過速度限制。請減慢速度！電郵之間的最短時間為%s個小時。這段時間內全部其他郵件將被忽略。" #: bridgedb/strings.py:50 msgid "" @@ -202,7 +203,7 @@ msgstr "朋友，你好！" #: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90 msgid "Public Keys" -msgstr "公開鎖匙" +msgstr "公匙" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles @@ -269,7 +270,7 @@ msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" "%s, %s or %s." -msgstr "另一取得橋接的方式是發送電郵到%s。請注意，你須\n使用下列電郵供應商的位址來發送電郵：\n%s、%s或%s。" +msgstr "另一取得橋接的方式是發送電郵到%s。請注意，你須\n使用下列電郵提供者的位址來發送電郵：\n%s、%s或%s。" #: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 06 Apr '16

06 Apr '16

commit 84a3d3e10b84d07e11e28c4468cd9a2fe41c7b33 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 6 00:45:03 2016 +0000 Update translations for bridgedb --- zh_HK/LC_MESSAGES/bridgedb.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/zh_HK/LC_MESSAGES/bridgedb.po b/zh_HK/LC_MESSAGES/bridgedb.po index 7b4139b..e2fed47 100644 --- a/zh_HK/LC_MESSAGES/bridgedb.po +++ b/zh_HK/LC_MESSAGES/bridgedb.po @@ -4,6 +4,7 @@ # # Translators: # CasperLi_HK <casper.hk(a)hotmail.com>, 2013 +# Kin Kwok, 2016 # CasperLi_HK <casper.hk(a)hotmail.com>, 2013 # Wen-Gan Li <wgli(a)wgli.net>, 2015 msgid "" @@ -11,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-04-05 06:41+0000\n" +"PO-Revision-Date: 2016-04-06 00:20+0000\n" "Last-Translator: Kin Kwok\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/otf/torproject/language/zh_HK/)\n" "MIME-Version: 1.0\n" @@ -174,7 +175,7 @@ msgstr "這是你的橋接器：" msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." -msgstr "你已超過速度限制。請減慢速度！電郵之間的最短時間為%s個小時。這段時間內所有其他郵件將被忽略。" +msgstr "你已超過速度限制。請減慢速度！電郵之間的最短時間為%s個小時。這段時間內全部其他郵件將被忽略。" #: bridgedb/strings.py:50 msgid "" @@ -202,7 +203,7 @@ msgstr "朋友，你好！" #: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90 msgid "Public Keys" -msgstr "公開鎖匙" +msgstr "公匙" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles @@ -269,7 +270,7 @@ msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" "%s, %s or %s." -msgstr "另一取得橋接的方式是發送電郵到%s。請注意，你須\n使用下列電郵供應商的位址來發送電郵：\n%s、%s或%s。" +msgstr "另一取得橋接的方式是發送電郵到%s。請注意，你須\n使用下列電郵提供者的位址來發送電郵：\n%s、%s或%s。" #: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!"

1 0