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

[translation/vidalia_help_completed] Update translations for vidalia_help_completed
by translation＠torproject.org 29 Jun '13

29 Jun '13

commit 30cfbbb016b8d793787b664bdaf3c974b811c4c9 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 29 20:15:46 2013 +0000 Update translations for vidalia_help_completed --- zh_CN/troubleshooting.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/troubleshooting.po b/zh_CN/troubleshooting.po index 32ae269..cab7075 100644 --- a/zh_CN/troubleshooting.po +++ b/zh_CN/troubleshooting.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-08-03 15:49-0300\n" -"PO-Revision-Date: 2013-06-29 19:32+0000\n" +"PO-Revision-Date: 2013-06-29 20:03+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n"

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 29 Jun '13

29 Jun '13

commit 3f3d596b87793e65d2ec00e9198f4c2c5f9650db Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 29 20:15:34 2013 +0000 Update translations for vidalia_help --- zh_CN/troubleshooting.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/troubleshooting.po b/zh_CN/troubleshooting.po index 32ae269..cab7075 100644 --- a/zh_CN/troubleshooting.po +++ b/zh_CN/troubleshooting.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-08-03 15:49-0300\n" -"PO-Revision-Date: 2013-06-29 19:32+0000\n" +"PO-Revision-Date: 2013-06-29 20:03+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n"

1 0

[tor/master] Use CHUTNEY_PATH to find Chutney.
by nickm＠torproject.org 29 Jun '13

29 Jun '13

commit b567efcfff72f8ba5bb9ef2612318bc18f2b4880 Author: Linus Nordberg <linus(a)torproject.org> Date: Wed Jun 5 15:48:57 2013 +0200 Use CHUTNEY_PATH to find Chutney. --- Makefile.am | 3 ++- src/test/test-network.sh | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index e9976fa..a736638 100644 --- a/Makefile.am +++ b/Makefile.am @@ -60,7 +60,8 @@ doxygen: test: all ./src/test/test -# Requires a copy of Chutney in ./chutney +# Note that test-network requires a copy of Chutney in $CHUTNEY_PATH. +# Chutney can be cloned from https://git.torproject.org/chutney.git . test-network: all ./src/test/test-network.sh diff --git a/src/test/test-network.sh b/src/test/test-network.sh index eaecded..bbf76ed 100755 --- a/src/test/test-network.sh +++ b/src/test/test-network.sh @@ -1,15 +1,17 @@ #! /bin/sh -CHUTNEY_BASEDIR=./chutney # FIXME +# NOTE: Requires Chutney in $CHUTNEY_PATH. + TOR_DIR=$(/bin/pwd)/src/or NETWORK_FLAVOUR=basic CHUTNEY_NETWORK=networks/$NETWORK_FLAVOUR myname=$(/usr/bin/basename $0) -cd $CHUTNEY_BASEDIR || { - echo "$myname: missing chutney dir: $CHUTNEY_BASEDIR" +[ -d "$CHUTNEY_PATH" ] && [ -x "$CHUTNEY_PATH/chutney" ] || { + echo "$myname: missing 'chutney' in CHUTNEY_PATH ($CHUTNEY_PATH)" exit 1 } +cd "$CHUTNEY_PATH" PATH=$TOR_DIR:$PATH # For picking up the right tor binary. ./tools/bootstrap-network.sh $NETWORK_FLAVOUR || exit 2

1 0

[tor/master] Add make target test-network running traffic tests in a Chutney network.
by nickm＠torproject.org 29 Jun '13

29 Jun '13

commit c82d7950ad9a1614a8f3929f53eaed572c9d9e2e Author: Linus Nordberg <linus(a)torproject.org> Date: Wed Jun 5 15:48:57 2013 +0200 Add make target test-network running traffic tests in a Chutney network. This implements ticket #8530. --- Makefile.am | 4 ++++ changes/bug8530 | 3 +++ src/test/test-network.sh | 23 +++++++++++++++++++++++ 3 files changed, 30 insertions(+) diff --git a/Makefile.am b/Makefile.am index 4639c22..e9976fa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -60,6 +60,10 @@ doxygen: test: all ./src/test/test +# Requires a copy of Chutney in ./chutney +test-network: all + ./src/test/test-network.sh + # Avoid strlcpy.c, strlcat.c, aes.c, OpenBSD_malloc_Linux.c, sha256.c, # eventdns.[hc], tinytest*.[ch] check-spaces: diff --git a/changes/bug8530 b/changes/bug8530 new file mode 100644 index 0000000..f66b602 --- /dev/null +++ b/changes/bug8530 @@ -0,0 +1,3 @@ + o Enhancements + - Add make target 'test-network' running tests on a Chutney + network. diff --git a/src/test/test-network.sh b/src/test/test-network.sh new file mode 100755 index 0000000..eaecded --- /dev/null +++ b/src/test/test-network.sh @@ -0,0 +1,23 @@ +#! /bin/sh + +CHUTNEY_BASEDIR=./chutney # FIXME +TOR_DIR=$(/bin/pwd)/src/or +NETWORK_FLAVOUR=basic +CHUTNEY_NETWORK=networks/$NETWORK_FLAVOUR +myname=$(/usr/bin/basename $0) + +cd $CHUTNEY_BASEDIR || { + echo "$myname: missing chutney dir: $CHUTNEY_BASEDIR" + exit 1 +} +PATH=$TOR_DIR:$PATH # For picking up the right tor binary. +./tools/bootstrap-network.sh $NETWORK_FLAVOUR || exit 2 + +# Sleep some, waiting for the network to bootstrap. +# TODO: Add chutney command 'bootstrap-status' and use that instead. +BOOTSTRAP_TIME=18 +echo -n "$myname: sleeping for $BOOTSTRAP_TIME seconds" +n=$BOOTSTRAP_TIME; while [ $n -gt 0 ]; do + /bin/sleep 1; n=$(/usr/bin/expr $n - 1); echo -n . +done; echo "" +./chutney verify $CHUTNEY_NETWORK

1 0

[tor/master] Invoke binaries in $PATH rather than by absolute path.
by nickm＠torproject.org 29 Jun '13

29 Jun '13

commit 538ca4153a1334179856866abf32975caf8daae4 Author: Linus Nordberg <linus(a)torproject.org> Date: Wed Jun 5 15:48:57 2013 +0200 Invoke binaries in $PATH rather than by absolute path. That security measure costs more than it gives. So, keep your PATH sane and we can run this script on more than one system. --- src/test/test-network.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/test-network.sh b/src/test/test-network.sh index bbf76ed..9146ae3 100755 --- a/src/test/test-network.sh +++ b/src/test/test-network.sh @@ -2,10 +2,10 @@ # NOTE: Requires Chutney in $CHUTNEY_PATH. -TOR_DIR=$(/bin/pwd)/src/or +TOR_DIR=$(pwd)/src/or NETWORK_FLAVOUR=basic CHUTNEY_NETWORK=networks/$NETWORK_FLAVOUR -myname=$(/usr/bin/basename $0) +myname=$(basename $0) [ -d "$CHUTNEY_PATH" ] && [ -x "$CHUTNEY_PATH/chutney" ] || { echo "$myname: missing 'chutney' in CHUTNEY_PATH ($CHUTNEY_PATH)" @@ -20,6 +20,6 @@ PATH=$TOR_DIR:$PATH # For picking up the right tor binary. BOOTSTRAP_TIME=18 echo -n "$myname: sleeping for $BOOTSTRAP_TIME seconds" n=$BOOTSTRAP_TIME; while [ $n -gt 0 ]; do - /bin/sleep 1; n=$(/usr/bin/expr $n - 1); echo -n . + sleep 1; n=$(expr $n - 1); echo -n . done; echo "" ./chutney verify $CHUTNEY_NETWORK

1 0

[tor/master] Merge remote-tracking branch 'linus/bug8530'
by nickm＠torproject.org 29 Jun '13

29 Jun '13

commit f631b73cd5d97ff1eede5d57008ff7392c44a4bc Merge: 0c3d676 538ca41 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 29 16:02:13 2013 -0400 Merge remote-tracking branch 'linus/bug8530' Makefile.am | 5 +++++ changes/bug8530 | 3 +++ src/test/test-network.sh | 25 +++++++++++++++++++++++++ 3 files changed, 33 insertions(+)

1 0

[translation/vidalia_help_completed] Update translations for vidalia_help_completed
by translation＠torproject.org 29 Jun '13

29 Jun '13

commit b2774588215a5a4f4dfc3c1d8ef91975423a9e7a Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 29 19:45:46 2013 +0000 Update translations for vidalia_help_completed --- zh_CN/troubleshooting.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zh_CN/troubleshooting.po b/zh_CN/troubleshooting.po index 688803d..32ae269 100644 --- a/zh_CN/troubleshooting.po +++ b/zh_CN/troubleshooting.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-08-03 15:49-0300\n" -"PO-Revision-Date: 2013-06-29 19:10+0000\n" +"PO-Revision-Date: 2013-06-29 19:32+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -107,7 +107,7 @@ msgstr "<a name=\"password\"/>" # type: Content of: <html><body><h3> #: en/troubleshooting.html:64 msgid "Why is Vidalia asking me for a \"control password\"?" -msgstr "为什么 Vidalia 要求我提供\"控制密码\"？" +msgstr "为什么 Vidalia 要求我提供“控制密码”？" # type: Content of: <html><body><p> #: en/troubleshooting.html:66 @@ -118,7 +118,7 @@ msgid "" "Vidalia sets a random password for Tor's control port to prevent other " "applications from also connecting to the control port and potentially " "compromising your anonymity." -msgstr "Vidalia 通过 Tor 的\"控制端口\"与 Tor 软件进行互动。控制端口让 Vidalia 可接收来自 Tor 的状态更新，请求新的身份，对 Tor 的设置进行配置等等。每次 Vidalia 启动 Tor 时，Vidalia 为 Tor 控制端口设置一个随机密码，用于防止其他应用程序连接该控制端口，以免对匿名性造成威胁。" +msgstr "Vidalia 通过 Tor 的“控制端口”与 Tor 软件进行互动。控制端口让 Vidalia 可接收来自 Tor 的状态更新，请求新的身份，对 Tor 的设置进行配置等等。每次 Vidalia 启动 Tor 时，Vidalia 为 Tor 控制端口设置一个随机密码，用于防止其他应用程序连接该控制端口，以免对匿名性造成威胁。" # type: Content of: <html><body><p> #: en/troubleshooting.html:75

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 29 Jun '13

29 Jun '13

commit 80ed1efdb2a7bd4f7e275e938b05dad6236614c2 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 29 19:45:34 2013 +0000 Update translations for vidalia_help --- zh_CN/troubleshooting.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zh_CN/troubleshooting.po b/zh_CN/troubleshooting.po index 688803d..32ae269 100644 --- a/zh_CN/troubleshooting.po +++ b/zh_CN/troubleshooting.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-08-03 15:49-0300\n" -"PO-Revision-Date: 2013-06-29 19:10+0000\n" +"PO-Revision-Date: 2013-06-29 19:32+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -107,7 +107,7 @@ msgstr "<a name=\"password\"/>" # type: Content of: <html><body><h3> #: en/troubleshooting.html:64 msgid "Why is Vidalia asking me for a \"control password\"?" -msgstr "为什么 Vidalia 要求我提供\"控制密码\"？" +msgstr "为什么 Vidalia 要求我提供“控制密码”？" # type: Content of: <html><body><p> #: en/troubleshooting.html:66 @@ -118,7 +118,7 @@ msgid "" "Vidalia sets a random password for Tor's control port to prevent other " "applications from also connecting to the control port and potentially " "compromising your anonymity." -msgstr "Vidalia 通过 Tor 的\"控制端口\"与 Tor 软件进行互动。控制端口让 Vidalia 可接收来自 Tor 的状态更新，请求新的身份，对 Tor 的设置进行配置等等。每次 Vidalia 启动 Tor 时，Vidalia 为 Tor 控制端口设置一个随机密码，用于防止其他应用程序连接该控制端口，以免对匿名性造成威胁。" +msgstr "Vidalia 通过 Tor 的“控制端口”与 Tor 软件进行互动。控制端口让 Vidalia 可接收来自 Tor 的状态更新，请求新的身份，对 Tor 的设置进行配置等等。每次 Vidalia 启动 Tor 时，Vidalia 为 Tor 控制端口设置一个随机密码，用于防止其他应用程序连接该控制端口，以免对匿名性造成威胁。" # type: Content of: <html><body><p> #: en/troubleshooting.html:75

1 0

[translation/vidalia_help_completed] Update translations for vidalia_help_completed
by translation＠torproject.org 29 Jun '13

29 Jun '13

commit 0844453766d8ae90db4b02a65e9a3ee2cea61e02 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 29 19:15:50 2013 +0000 Update translations for vidalia_help_completed --- zh_CN/troubleshooting.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zh_CN/troubleshooting.po b/zh_CN/troubleshooting.po index 30c3edd..688803d 100644 --- a/zh_CN/troubleshooting.po +++ b/zh_CN/troubleshooting.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-08-03 15:49-0300\n" -"PO-Revision-Date: 2013-06-29 18:40+0000\n" +"PO-Revision-Date: 2013-06-29 19:10+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -53,7 +53,7 @@ msgid "" "Another possible reason that Tor cannot start is because there is already " "another Tor process running. Check your list of running process and stop the" " previous Tor process, if you find one. Then, try running Tor again." -msgstr "Tor 不能启动可能是因为另一个 Tor 进程正在运行。请检查运行进程列表，并停止之前的 Tor 进程，然后再次尝试运行 Tor。" +msgstr "Tor 不能启动可能是因为另一个 Tor 进程正在运行。请检查正在运行的进程列表，并停止之前的 Tor 进程，然后再次尝试运行 Tor。" # type: Content of: <html><body><p> #: en/troubleshooting.html:38 @@ -61,7 +61,7 @@ msgid "" "If that did not help, check your <a href=\"log.html\">message log</a> to see" " if Tor printed any information about errors it encountered while trying to " "start." -msgstr "如果这样无法解决问题，请检查<a href=\"log.html\">消息日志</a> ，查看是否存在启动时出错的相关信息。" +msgstr "如果仍无法解决问题，请检查<a href=\"log.html\">消息日志</a> ，查看是否存在启动时出错的相关信息。" # type: Content of: <html><body> #: en/troubleshooting.html:43 @@ -71,7 +71,7 @@ msgstr "<a name=\"connect\"/>" # type: Content of: <html><body><h3> #: en/troubleshooting.html:44 msgid "Vidalia Can't Connect to Tor" -msgstr "Vidalia不能连接到 Tor" +msgstr "Vidalia 不能连接到 Tor" # type: Content of: <html><body><p> #: en/troubleshooting.html:46

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 29 Jun '13

29 Jun '13

commit df3996a14e01e2e8f05396374cf12af6b1ac9dc5 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 29 19:15:39 2013 +0000 Update translations for vidalia_help --- zh_CN/troubleshooting.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zh_CN/troubleshooting.po b/zh_CN/troubleshooting.po index 30c3edd..688803d 100644 --- a/zh_CN/troubleshooting.po +++ b/zh_CN/troubleshooting.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-08-03 15:49-0300\n" -"PO-Revision-Date: 2013-06-29 18:40+0000\n" +"PO-Revision-Date: 2013-06-29 19:10+0000\n" "Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -53,7 +53,7 @@ msgid "" "Another possible reason that Tor cannot start is because there is already " "another Tor process running. Check your list of running process and stop the" " previous Tor process, if you find one. Then, try running Tor again." -msgstr "Tor 不能启动可能是因为另一个 Tor 进程正在运行。请检查运行进程列表，并停止之前的 Tor 进程，然后再次尝试运行 Tor。" +msgstr "Tor 不能启动可能是因为另一个 Tor 进程正在运行。请检查正在运行的进程列表，并停止之前的 Tor 进程，然后再次尝试运行 Tor。" # type: Content of: <html><body><p> #: en/troubleshooting.html:38 @@ -61,7 +61,7 @@ msgid "" "If that did not help, check your <a href=\"log.html\">message log</a> to see" " if Tor printed any information about errors it encountered while trying to " "start." -msgstr "如果这样无法解决问题，请检查<a href=\"log.html\">消息日志</a> ，查看是否存在启动时出错的相关信息。" +msgstr "如果仍无法解决问题，请检查<a href=\"log.html\">消息日志</a> ，查看是否存在启动时出错的相关信息。" # type: Content of: <html><body> #: en/troubleshooting.html:43 @@ -71,7 +71,7 @@ msgstr "<a name=\"connect\"/>" # type: Content of: <html><body><h3> #: en/troubleshooting.html:44 msgid "Vidalia Can't Connect to Tor" -msgstr "Vidalia不能连接到 Tor" +msgstr "Vidalia 不能连接到 Tor" # type: Content of: <html><body><p> #: en/troubleshooting.html:46

1 0