September 2014 - tor-commits - lists.torproject.org

r26954: {website} Add 3.6.6 to recommended versions. (website/trunk/projects/torbrowser)
by Mike Perry 26 Sep '14

26 Sep '14

Author: mikeperry Date: 2014-09-26 01:22:34 +0000 (Fri, 26 Sep 2014) New Revision: 26954 Modified: website/trunk/projects/torbrowser/RecommendedTBBVersions Log: Add 3.6.6 to recommended versions. Modified: website/trunk/projects/torbrowser/RecommendedTBBVersions =================================================================== --- website/trunk/projects/torbrowser/RecommendedTBBVersions 2014-09-23 01:42:47 UTC (rev 26953) +++ website/trunk/projects/torbrowser/RecommendedTBBVersions 2014-09-26 01:22:34 UTC (rev 26954) @@ -2,6 +2,9 @@ "3.6.5-Linux", "3.6.5-MacOS", "3.6.5-Windows", +"3.6.6-Linux", +"3.6.6-MacOS", +"3.6.6-Windows", "4.0-alpha-2", "4.0-alpha-2-Linux", "4.0-alpha-2-MacOS",

1 0

[torbrowser/master] Invalidate this versions file entirely.
by mikeperry＠torproject.org 26 Sep '14

26 Sep '14

commit c72b1c7110062e284b0681873367be7cb519cd19 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Sep 25 18:20:14 2014 -0700 Invalidate this versions file entirely. --- build-scripts/recommended-versions | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 074645f..4d6ebe3 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,8 +1,3 @@ [ -"3.6.5-Linux", -"3.6.5-MacOS", -"3.6.5-Windows", -"4.0-alpha-2-Linux", -"4.0-alpha-2-MacOS", -"4.0-alpha-2-Windows" +"See https://www.torproject.org/projects/torbrowser/RecommendedTBBVersions" ]

1 0

[tor/master] Fix on that last fix.
by nickm＠torproject.org 25 Sep '14

25 Sep '14

commit 4e87b97872f8cfb8042091357cbfdc817b7e9b1c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 25 17:59:10 2014 -0400 Fix on that last fix. --- src/common/crypto_curve25519.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/crypto_curve25519.c b/src/common/crypto_curve25519.c index dcb1e95..8b8e560 100644 --- a/src/common/crypto_curve25519.c +++ b/src/common/crypto_curve25519.c @@ -181,7 +181,7 @@ crypto_read_tagged_contents_from_file(const char *fname, char *content = NULL; struct stat st; ssize_t r = -1; - size_t st_size; + size_t st_size = 0; *tag_out = NULL; st.st_size = 0;

1 0

[tor/master] Fix warnings on 32-bit builds.
by nickm＠torproject.org 25 Sep '14

25 Sep '14

commit 9190468246c75051a4dd11ec95342df50ea1dc75 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 25 17:50:13 2014 -0400 Fix warnings on 32-bit builds. When size_t is the most memory you can have, make sure that things referring to real parts of memory are size_t, not uint64_t or off_t. But not on any released Tor. --- src/common/crypto_curve25519.c | 8 +++++--- src/ext/ed25519/ref10/ed25519_ref10.h | 4 ++-- src/ext/ed25519/ref10/open.c | 2 +- src/ext/ed25519/ref10/sign.c | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/common/crypto_curve25519.c b/src/common/crypto_curve25519.c index 44b280a..dcb1e95 100644 --- a/src/common/crypto_curve25519.c +++ b/src/common/crypto_curve25519.c @@ -181,6 +181,7 @@ crypto_read_tagged_contents_from_file(const char *fname, char *content = NULL; struct stat st; ssize_t r = -1; + size_t st_size; *tag_out = NULL; st.st_size = 0; @@ -189,6 +190,7 @@ crypto_read_tagged_contents_from_file(const char *fname, goto end; if (st.st_size < 32 || st.st_size > 32 + data_out_len) goto end; + st_size = (size_t)st.st_size; memcpy(prefix, content, 32); prefix[32] = 0; @@ -205,12 +207,12 @@ crypto_read_tagged_contents_from_file(const char *fname, *tag_out = tor_strndup(prefix+5+strlen(typestring), strlen(prefix)-8-strlen(typestring)); - memcpy(data_out, content+32, st.st_size-32); - r = st.st_size - 32; + memcpy(data_out, content+32, st_size-32); + r = st_size - 32; end: if (content) - memwipe(content, 0, st.st_size); + memwipe(content, 0, st_size); tor_free(content); return r; } diff --git a/src/ext/ed25519/ref10/ed25519_ref10.h b/src/ext/ed25519/ref10/ed25519_ref10.h index 8c77b0e..af7e21a 100644 --- a/src/ext/ed25519/ref10/ed25519_ref10.h +++ b/src/ext/ed25519/ref10/ed25519_ref10.h @@ -9,11 +9,11 @@ int ed25519_ref10_pubkey(unsigned char *pk,const unsigned char *sk); int ed25519_ref10_keygen(unsigned char *pk,unsigned char *sk); int ed25519_ref10_open( const unsigned char *signature, - const unsigned char *m,uint64_t mlen, + const unsigned char *m, size_t mlen, const unsigned char *pk); int ed25519_ref10_sign( unsigned char *sig, - const unsigned char *m,uint64_t mlen, + const unsigned char *m, size_t mlen, const unsigned char *sk, const unsigned char *pk); /* Added in Tor */ diff --git a/src/ext/ed25519/ref10/open.c b/src/ext/ed25519/ref10/open.c index 0e7abba..9dbeb4c 100644 --- a/src/ext/ed25519/ref10/open.c +++ b/src/ext/ed25519/ref10/open.c @@ -9,7 +9,7 @@ /* 'signature' must be 64-bytes long. */ int crypto_sign_open( const unsigned char *signature, - const unsigned char *m,uint64_t mlen, + const unsigned char *m, size_t mlen, const unsigned char *pk ) { diff --git a/src/ext/ed25519/ref10/sign.c b/src/ext/ed25519/ref10/sign.c index e37b0d1..1190a0f 100644 --- a/src/ext/ed25519/ref10/sign.c +++ b/src/ext/ed25519/ref10/sign.c @@ -7,7 +7,7 @@ int crypto_sign( unsigned char *sig, - const unsigned char *m,uint64_t mlen, + const unsigned char *m, size_t mlen, const unsigned char *sk,const unsigned char *pk ) {

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 25 Sep '14

25 Sep '14

commit 6ce1d36e689b27455a76480531b823b1ec4a708a Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 25 21:45:40 2014 +0000 Update translations for tails-misc_completed --- zh_CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN.po b/zh_CN.po index 1c60d53..a656bbf 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-08-31 21:41+0200\n" -"PO-Revision-Date: 2014-09-25 21:10+0000\n" +"PO-Revision-Date: 2014-09-25 21:20+0000\n" "Last-Translator: Xiaolan <xiaolan65535(a)gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 25 Sep '14

25 Sep '14

commit a9ca830c48876c2545a3b262f01dcfdf056307d1 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 25 21:45:37 2014 +0000 Update translations for tails-misc --- zh_CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN.po b/zh_CN.po index 1c60d53..a656bbf 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-08-31 21:41+0200\n" -"PO-Revision-Date: 2014-09-25 21:10+0000\n" +"PO-Revision-Date: 2014-09-25 21:20+0000\n" "Last-Translator: Xiaolan <xiaolan65535(a)gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 25 Sep '14

25 Sep '14

commit 73ddffda69117f4e6eea388367154d6dd54b6381 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 25 21:15:45 2014 +0000 Update translations for tails-misc_completed --- zh_CN.po | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/zh_CN.po b/zh_CN.po index c239875..1c60d53 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -7,14 +7,15 @@ # bnw, 2014 # Meng3, 2014 # Sanya chang <408070986(a)qq.com>, 2013 +# Xiaolan <xiaolan65535(a)gmail.com>, 2014 # YF <yfdyh000(a)gmail.com>, 2013-2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-08 19:08+0200\n" -"PO-Revision-Date: 2014-07-03 07:00+0000\n" -"Last-Translator: bnw\n" +"POT-Creation-Date: 2014-08-31 21:41+0200\n" +"PO-Revision-Date: 2014-09-25 21:10+0000\n" +"Last-Translator: Xiaolan <xiaolan65535(a)gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -233,7 +234,7 @@ msgstr "Tails" #: config/chroot_local-includes/usr/local/bin/tails-about:24 msgid "The Amnesic Incognito Live System" -msgstr "The Amnesic Incognito Live System（缩写未）" +msgstr "The Amnesic Incognito Live System（缩写为TAILS）" #: config/chroot_local-includes/usr/local/bin/tails-about:25 #, python-format @@ -414,32 +415,32 @@ msgstr "可能需要一会儿，请稍等。" msgid "Failed to setup chroot." msgstr "设置 chroot 失败。" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:175 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:182 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1 msgid "Unsafe Browser" msgstr "非安全浏览器" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:215 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:204 msgid "Shutting down the Unsafe Browser..." msgstr "正在关闭非安全浏览器..." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:216 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:205 msgid "" "This may take a while, and you may not restart the Unsafe Browser until it " "is properly shut down." msgstr "可能需要一会儿。正常关闭之前无法重启非安全浏览器。" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:228 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:217 msgid "Failed to restart Tor." msgstr "无法重启 Tor。" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:236 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:225 msgid "" "Another Unsafe Browser is currently running, or being cleaned up. Please " "retry in a while." msgstr "另一种不安全的浏览器正在运行，或者正在被清理。请在稍后重试。" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:249 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:238 msgid "" "No DNS server was obtained through DHCP or manually configured in " "NetworkManager."

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 25 Sep '14

25 Sep '14

commit 00f660981a6fe1846fbc05945e6dcf46b2f6fa59 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 25 21:15:43 2014 +0000 Update translations for tails-misc --- zh_CN.po | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/zh_CN.po b/zh_CN.po index c239875..1c60d53 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -7,14 +7,15 @@ # bnw, 2014 # Meng3, 2014 # Sanya chang <408070986(a)qq.com>, 2013 +# Xiaolan <xiaolan65535(a)gmail.com>, 2014 # YF <yfdyh000(a)gmail.com>, 2013-2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-08 19:08+0200\n" -"PO-Revision-Date: 2014-07-03 07:00+0000\n" -"Last-Translator: bnw\n" +"POT-Creation-Date: 2014-08-31 21:41+0200\n" +"PO-Revision-Date: 2014-09-25 21:10+0000\n" +"Last-Translator: Xiaolan <xiaolan65535(a)gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -233,7 +234,7 @@ msgstr "Tails" #: config/chroot_local-includes/usr/local/bin/tails-about:24 msgid "The Amnesic Incognito Live System" -msgstr "The Amnesic Incognito Live System（缩写未）" +msgstr "The Amnesic Incognito Live System（缩写为TAILS）" #: config/chroot_local-includes/usr/local/bin/tails-about:25 #, python-format @@ -414,32 +415,32 @@ msgstr "可能需要一会儿，请稍等。" msgid "Failed to setup chroot." msgstr "设置 chroot 失败。" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:175 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:182 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1 msgid "Unsafe Browser" msgstr "非安全浏览器" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:215 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:204 msgid "Shutting down the Unsafe Browser..." msgstr "正在关闭非安全浏览器..." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:216 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:205 msgid "" "This may take a while, and you may not restart the Unsafe Browser until it " "is properly shut down." msgstr "可能需要一会儿。正常关闭之前无法重启非安全浏览器。" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:228 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:217 msgid "Failed to restart Tor." msgstr "无法重启 Tor。" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:236 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:225 msgid "" "Another Unsafe Browser is currently running, or being cleaned up. Please " "retry in a while." msgstr "另一种不安全的浏览器正在运行，或者正在被清理。请在稍后重试。" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:249 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:238 msgid "" "No DNS server was obtained through DHCP or manually configured in " "NetworkManager."

1 0

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 25 Sep '14

25 Sep '14

commit fe9262e0581608987b6155fb8471ac599345df98 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 25 21:15:29 2014 +0000 Update translations for tails-greeter_completed --- zh_CN/zh_CN.po | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po index db82bfc..5241139 100644 --- a/zh_CN/zh_CN.po +++ b/zh_CN/zh_CN.po @@ -10,6 +10,7 @@ # ln191810 <ln191810(a)gmail.com>, 2012 # xtoaster <zhazhenzhong(a)gmail.com>, 2012 # baoliandeng <nkzhangjg(a)gmail.com>, 2014 +# Xiaolan <xiaolan65535(a)gmail.com>, 2014 # YF <yfdyh000(a)gmail.com>, 2014 # xtoaster <zhazhenzhong(a)gmail.com>, 2012 # 辛海林 <hailin_xin(a)163.com>, 2014 @@ -17,9 +18,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-28 22:33+0200\n" -"PO-Revision-Date: 2014-06-10 15:47+0000\n" -"Last-Translator: 辛海林 <hailin_xin(a)163.com>\n" +"POT-Creation-Date: 2014-08-31 10:36+0200\n" +"PO-Revision-Date: 2014-09-25 21:10+0000\n" +"Last-Translator: Xiaolan <xiaolan65535(a)gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -79,7 +80,7 @@ msgstr "管理员密码" msgid "" "<a " "href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>" -msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">文档</a>" #: ../glade/optionswindow.glade.h:5 msgid "" @@ -127,7 +128,7 @@ msgstr "MAC 地址欺骗" msgid "" "<a " "href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>" -msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">文档</a>" #: ../glade/optionswindow.glade.h:16 msgid "" @@ -153,7 +154,7 @@ msgstr "网络确认" msgid "" "<a " "href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>" -msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">文档</a>" #: ../glade/optionswindow.glade.h:21 msgid "" @@ -206,7 +207,7 @@ msgid "" "%(stderr)s" msgstr "负责持久卷设置的 live-persist 执行失败，，返回代码 %(returncode)s:\n%(stdout)s\n%(stderr)s" -#: ../tailsgreeter/langpanel.py:125 ../tailsgreeter/langpanel.py:152 -#: ../tailsgreeter/langpanel.py:185 +#: ../tailsgreeter/langpanel.py:123 ../tailsgreeter/langpanel.py:150 +#: ../tailsgreeter/langpanel.py:183 msgid "Other..." msgstr "其他..."

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 25 Sep '14

25 Sep '14

commit 0cc41c5eae3423aa4c69d7536f7713567689b20d Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 25 21:15:27 2014 +0000 Update translations for tails-greeter --- zh_CN/zh_CN.po | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po index db82bfc..5241139 100644 --- a/zh_CN/zh_CN.po +++ b/zh_CN/zh_CN.po @@ -10,6 +10,7 @@ # ln191810 <ln191810(a)gmail.com>, 2012 # xtoaster <zhazhenzhong(a)gmail.com>, 2012 # baoliandeng <nkzhangjg(a)gmail.com>, 2014 +# Xiaolan <xiaolan65535(a)gmail.com>, 2014 # YF <yfdyh000(a)gmail.com>, 2014 # xtoaster <zhazhenzhong(a)gmail.com>, 2012 # 辛海林 <hailin_xin(a)163.com>, 2014 @@ -17,9 +18,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-28 22:33+0200\n" -"PO-Revision-Date: 2014-06-10 15:47+0000\n" -"Last-Translator: 辛海林 <hailin_xin(a)163.com>\n" +"POT-Creation-Date: 2014-08-31 10:36+0200\n" +"PO-Revision-Date: 2014-09-25 21:10+0000\n" +"Last-Translator: Xiaolan <xiaolan65535(a)gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -79,7 +80,7 @@ msgstr "管理员密码" msgid "" "<a " "href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>" -msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">文档</a>" #: ../glade/optionswindow.glade.h:5 msgid "" @@ -127,7 +128,7 @@ msgstr "MAC 地址欺骗" msgid "" "<a " "href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>" -msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">文档</a>" #: ../glade/optionswindow.glade.h:16 msgid "" @@ -153,7 +154,7 @@ msgstr "网络确认" msgid "" "<a " "href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>" -msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">文档</a>" #: ../glade/optionswindow.glade.h:21 msgid "" @@ -206,7 +207,7 @@ msgid "" "%(stderr)s" msgstr "负责持久卷设置的 live-persist 执行失败，，返回代码 %(returncode)s:\n%(stdout)s\n%(stderr)s" -#: ../tailsgreeter/langpanel.py:125 ../tailsgreeter/langpanel.py:152 -#: ../tailsgreeter/langpanel.py:185 +#: ../tailsgreeter/langpanel.py:123 ../tailsgreeter/langpanel.py:150 +#: ../tailsgreeter/langpanel.py:183 msgid "Other..." msgstr "其他..."

1 0