July 2013 - tor-commits - lists.torproject.org

[tor/release-0.2.4] Fix bug 9122: don't allow newdefaultoptions to be NULL
by arma＠torproject.org 01 Jul '13

01 Jul '13

commit ca6aacce16ce057bab71900e078a24fcd63d250f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 24 09:56:25 2013 -0400 Fix bug 9122: don't allow newdefaultoptions to be NULL (This caused a crash that was reported as bug 9122, but the underlying behavior has been wrong for a while.) Fix on 0.2.3.9-alpha. --- changes/bug9122 | 4 ++++ src/or/config.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/changes/bug9122 b/changes/bug9122 new file mode 100644 index 0000000..5009da6 --- /dev/null +++ b/changes/bug9122 @@ -0,0 +1,4 @@ + o Major bugfixes: + - When receiving a new configuration file via the control port's + LOADCONF command, do not treat the defaults file as absent. + Fixes bug 9122; bugfix on 0.2.3.9-alpha. diff --git a/src/or/config.c b/src/or/config.c index 55d19b8..725190a 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3785,6 +3785,10 @@ options_init_from_string(const char *cf_defaults, const char *cf, newdefaultoptions = config_dup(&options_format, newoptions); } + if (newdefaultoptions == NULL) { + newdefaultoptions = config_dup(&options_format, global_default_options); + } + /* Go through command-line variables too */ retval = config_assign(&options_format, newoptions, global_cmdline_options, 0, 0, msg);

1 0

[tor/release-0.2.4] Give a warning when bufferevents are enabled.
by arma＠torproject.org 01 Jul '13

01 Jul '13

commit c9551492715c0b840f65992692581eb555c0930d Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 29 03:45:40 2013 -0400 Give a warning when bufferevents are enabled. Ticket 9147. --- changes/bug9147 | 4 ++++ src/or/main.c | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/changes/bug9147 b/changes/bug9147 new file mode 100644 index 0000000..e6064ea --- /dev/null +++ b/changes/bug9147 @@ -0,0 +1,4 @@ + o Minor features: + - Issue a warning when running with the bufferevents backend enabled. + It's still not stable, and people should know that they're likely + to hit unexpected problems. Closes ticket 9147. diff --git a/src/or/main.c b/src/or/main.c index fd8b6cf..bd23141 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1882,6 +1882,13 @@ do_main_loop(void) } } +#ifdef USE_BUFFEREVENTS + log_warn(LD_GENERAL, "Tor was compiled with the --enable-bufferevents " + "option. This is still experimental, and might cause strange " + "bugs. If you want a more stable Tor, be sure to build without " + "--enable-bufferevents."); +#endif + handle_signals(1); /* load the private keys, if we're supposed to have them, and set up the

1 0

[tor/release-0.2.4] Merge branch 'bug9147' into maint-0.2.4
by arma＠torproject.org 01 Jul '13

01 Jul '13

commit 81a5ee77ec6df66ca9a5044bdf127b11922e0dd9 Merge: ca6aacc c955149 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 29 03:50:37 2013 -0400 Merge branch 'bug9147' into maint-0.2.4 changes/bug9147 | 4 ++++ src/or/main.c | 7 +++++++ 2 files changed, 11 insertions(+)

1 0

[tor/release-0.2.4] Merge branch 'maint-0.2.4' into release-0.2.4
by arma＠torproject.org 01 Jul '13

01 Jul '13

commit e9f0cdf55fe22a83e5bffd51189fc2e5752669e7 Merge: 7b29838 81a5ee7 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Jul 1 15:08:57 2013 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug9122 | 4 ++++ changes/bug9147 | 4 ++++ src/or/config.c | 4 ++++ src/or/main.c | 7 +++++++ 4 files changed, 19 insertions(+)

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 01 Jul '13

01 Jul '13

commit b8efae05f63be80b533b0cd17d2f97c6113b50b7 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 1 18:46:26 2013 +0000 Update translations for torbirdy_completed --- zh_CN/torbirdy.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/torbirdy.dtd b/zh_CN/torbirdy.dtd index e786267..b2e0220 100644 --- a/zh_CN/torbirdy.dtd +++ b/zh_CN/torbirdy.dtd @@ -39,7 +39,7 @@ <!ENTITY torbirdy.prefs.timezone.key "z"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "将收件人 key ID 放入加密邮件 [默认：不放入]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> -<!ENTITY torbirdy.prefs.confirmemail.label "在发送电子邮件之前，请确认 Enigmail 是否已启用[默认：不确认]"> +<!ENTITY torbirdy.prefs.confirmemail.label "在发送电子邮件之前，确认 Enigmail 是否已启用 [默认：不确认]"> <!ENTITY torbirdy.prefs.confirmemail.key "m"> <!ENTITY torbirdy.prefs.emailwizard.label "启用 Thunderbird 自动电子邮件配置向导 [默认：禁用]"> <!ENTITY torbirdy.prefs.emailwizard.key "w">

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 01 Jul '13

01 Jul '13

commit 2b333519a684911b1ea63817f65c3b901c4eea70 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 1 18:46:22 2013 +0000 Update translations for torbirdy --- zh_CN/torbirdy.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/torbirdy.dtd b/zh_CN/torbirdy.dtd index e786267..b2e0220 100644 --- a/zh_CN/torbirdy.dtd +++ b/zh_CN/torbirdy.dtd @@ -39,7 +39,7 @@ <!ENTITY torbirdy.prefs.timezone.key "z"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "将收件人 key ID 放入加密邮件 [默认：不放入]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> -<!ENTITY torbirdy.prefs.confirmemail.label "在发送电子邮件之前，请确认 Enigmail 是否已启用[默认：不确认]"> +<!ENTITY torbirdy.prefs.confirmemail.label "在发送电子邮件之前，确认 Enigmail 是否已启用 [默认：不确认]"> <!ENTITY torbirdy.prefs.confirmemail.key "m"> <!ENTITY torbirdy.prefs.emailwizard.label "启用 Thunderbird 自动电子邮件配置向导 [默认：禁用]"> <!ENTITY torbirdy.prefs.emailwizard.key "w">

1 0

[torbrowser/master] Bump recommended 3.0 version number.
by mikeperry＠torproject.org 01 Jul '13

01 Jul '13

commit 7b11ca0854bdd1bbda7e004d17bf6c07bdcfa50f Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Mon Jul 1 11:12:15 2013 -0700 Bump recommended 3.0 version number. --- build-scripts/recommended-versions | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 81696e2..f358365 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -6,7 +6,7 @@ "2.4.14-alpha-1-MacOS", "2.4.14-alpha-1-Windows", "2.4.14-alpha-1-Linux", -"3.0-alpha-1-Linux", -"3.0-alpha-1-MacOS", -"3.0-alpha-1-Windows" +"3.0-alpha-2-Linux", +"3.0-alpha-2-MacOS", +"3.0-alpha-2-Windows" ]

1 0

[torbrowser/master] Merge branch 'maint-2.4'
by mikeperry＠torproject.org 01 Jul '13

01 Jul '13

commit 6acfa0b9b6cb4a4ca678ee7a336d50675eb29085 Merge: 5dd6773 7b11ca0 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Mon Jul 1 11:28:57 2013 -0700 Merge branch 'maint-2.4' build-scripts/recommended-versions | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[torbrowser/maint-2.4] Bump recommended 3.0 version number.
by mikeperry＠torproject.org 01 Jul '13

01 Jul '13

commit 7b11ca0854bdd1bbda7e004d17bf6c07bdcfa50f Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Mon Jul 1 11:12:15 2013 -0700 Bump recommended 3.0 version number. --- build-scripts/recommended-versions | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 81696e2..f358365 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -6,7 +6,7 @@ "2.4.14-alpha-1-MacOS", "2.4.14-alpha-1-Windows", "2.4.14-alpha-1-Linux", -"3.0-alpha-1-Linux", -"3.0-alpha-1-MacOS", -"3.0-alpha-1-Windows" +"3.0-alpha-2-Linux", +"3.0-alpha-2-MacOS", +"3.0-alpha-2-Windows" ]

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 01 Jul '13

01 Jul '13

commit 7676e29c732d3a5138d6414aad64e23f362b4dea Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 1 18:16:23 2013 +0000 Update translations for torbirdy_completed --- zh_CN/torbirdy.dtd | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/zh_CN/torbirdy.dtd b/zh_CN/torbirdy.dtd index 50d9e3e..e786267 100644 --- a/zh_CN/torbirdy.dtd +++ b/zh_CN/torbirdy.dtd @@ -1,9 +1,9 @@ <!ENTITY torbirdy.accountprefs.title "帐户设置"> <!ENTITY torbirdy.accountprefs.startup.label "在启动时检查新邮件"> <!ENTITY torbirdy.accountprefs.startup.key "C"> -<!ENTITY torbirdy.accountprefs.minutes.label "检查所有的新邮件"> +<!ENTITY torbirdy.accountprefs.minutes.label "新邮件检查周期，每隔"> <!ENTITY torbirdy.accountprefs.minutes.key "y"> -<!ENTITY torbirdy.accountprefs.minutes.trail.label "分"> +<!ENTITY torbirdy.accountprefs.minutes.trail.label "分钟"> <!ENTITY torbirdy.accountprefs.cancel.button "取消"> <!ENTITY torbirdy.accountprefs.save.button "保存"> <!ENTITY torbirdy.accountprefs.save.key "S"> @@ -18,26 +18,26 @@ <!ENTITY torbirdy.prefs.privacy.label "隐私设置"> <!ENTITY torbirdy.prefs.enigmail.label "Enigmail 设置"> <!ENTITY torbirdy.prefs.security.label "安全设置"> -<!ENTITY torbirdy.prefs.recommended.text "使用 TorBirdy（Tor）推荐的代理设置"> +<!ENTITY torbirdy.prefs.recommended.text "使用推荐的 TorBirdy (Tor) 代理设置"> <!ENTITY torbirdy.prefs.recommended.key "r"> -<!ENTITY torbirdy.prefs.anonservice.text "选择一个匿名服务"> +<!ENTITY torbirdy.prefs.anonservice.text "选择匿名服务"> <!ENTITY torbirdy.prefs.anonservice.key "a"> <!ENTITY torbirdy.prefs.customsettings.text "使用自定义代理设置"> <!ENTITY torbirdy.prefs.customsettings.key "c"> <!ENTITY torbirdy.prefs.socks_host.label "SOCKS 主机："> <!ENTITY torbirdy.prefs.socks_host.key "h"> -<!ENTITY torbirdy.prefs.socks_port.label "端口"> +<!ENTITY torbirdy.prefs.socks_port.label "端口："> <!ENTITY torbirdy.prefs.socks_port.key "p"> <!ENTITY torbirdy.prefs.torification.label "透明 Torification"> <!ENTITY torbirdy.prefs.torification.key "t"> <!ENTITY torbirdy.prefs.global "全球"> -<!ENTITY torbirdy.prefs.imap.label "启用 IMAP 帐户邮件推送支持[默认：禁用]"> +<!ENTITY torbirdy.prefs.imap.label "启用 IMAP 帐户邮件推送支持 [默认：禁用]"> <!ENTITY torbirdy.prefs.imap.key "i"> <!ENTITY torbirdy.prefs.startup_folder.label "启动时选择最后访问的邮件文件夹[默认：禁用，选择本地文件夹]"> <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.timezone.label "请勿将 Thunderbird 的时区设置为 UTC [默认：设置为 UTC]"> <!ENTITY torbirdy.prefs.timezone.key "z"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "将收件人 key ID 放入加密邮件（默认：不放入）"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "将收件人 key ID 放入加密邮件 [默认：不放入]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.confirmemail.label "在发送电子邮件之前，请确认 Enigmail 是否已启用[默认：不确认]"> <!ENTITY torbirdy.prefs.confirmemail.key "m">

1 0