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

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

29 Jun '13

commit 0c3d676f9ea879ec78b442cc9b0c4d0231f0d2b0 Merge: cde1a2c 81a5ee7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 29 03:51:53 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug9147 | 4 ++++ src/or/main.c | 7 +++++++ 2 files changed, 11 insertions(+)

1 0

[tor/maint-0.2.4] Give a warning when bufferevents are enabled.
by nickm＠torproject.org 29 Jun '13

29 Jun '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/maint-0.2.4] Merge branch 'bug9147' into maint-0.2.4
by nickm＠torproject.org 29 Jun '13

29 Jun '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-browser-bundle/master] Place the bundle results in their own subdir and hash the results.
by mikeperry＠torproject.org 29 Jun '13

29 Jun '13

commit b99768d31aea66a5d5e9d780052421b1a5b08347 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Jun 28 20:54:25 2013 -0700 Place the bundle results in their own subdir and hash the results. --- gitian/Makefile | 1 + gitian/hash-bundles.sh | 14 ++++++++++++++ gitian/mkbundle-linux.sh | 3 ++- gitian/mkbundle-mac.sh | 3 ++- gitian/mkbundle-windows.sh | 3 ++- 5 files changed, 21 insertions(+), 3 deletions(-) diff --git a/gitian/Makefile b/gitian/Makefile index fd73651..223366f 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -4,6 +4,7 @@ build: ./mkbundle-linux.sh ./mkbundle-windows.sh ./mkbundle-mac.sh + ./hash-bundles.sh prep: ./check-prerequisites.sh diff --git a/gitian/hash-bundles.sh b/gitian/hash-bundles.sh new file mode 100755 index 0000000..2316182 --- /dev/null +++ b/gitian/hash-bundles.sh @@ -0,0 +1,14 @@ +#!/bin/bash +# + +. ./versions + +export LC_ALL=C + +cd $TORBROWSER_VERSION +rm -f sha256sums.txt +sha256sum `ls -1 | sort` > sha256sums.txt + +echo +echo "If this is an official build, you should now sign your result with: " +echo " cd $TORBROWSER_VERSION && gpg -abs sha256sums.txt" diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 4825a94..461d95d 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -156,7 +156,8 @@ then exit 1 fi - cp -a build/out/tor-browser-linux*xz* $WRAPPER_DIR || exit 1 + mkdir -p $WRAPPER_DIR/$TORBROWSER_VERSION/ + cp -a build/out/tor-browser-linux*xz* $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 touch $GITIAN_DIR/inputs/bundle-linux.gbuilt else echo diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 62d044e..307f7ff 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -139,7 +139,8 @@ then fi #cp -a build/out/*.dmg $WRAPPER_DIR - cp -a build/out/*.zip $WRAPPER_DIR || exit 1 + mkdir -p $WRAPPER_DIR/$TORBROWSER_VERSION/ + cp -a build/out/*.zip $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 touch $GITIAN_DIR/inputs/bundle-mac.gbuilt else echo diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 33d23fe..91708e1 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -137,7 +137,8 @@ then exit 1 fi - cp -a build/out/*.exe $WRAPPER_DIR || exit 1 + mkdir -p $WRAPPER_DIR/$TORBROWSER_VERSION/ + cp -a build/out/*.exe $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 touch $GITIAN_DIR/inputs/bundle-windows.gbuilt else echo

1 0

[tor-browser-bundle/master] Make the tarball deterministic.
by mikeperry＠torproject.org 29 Jun '13

29 Jun '13

commit c23a016e81a180da5224b547d057f7325fd801b8 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Jun 28 20:41:14 2013 -0700 Make the tarball deterministic. --- gitian/descriptors/linux/gitian-bundle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index b733766..f570a5d 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -114,7 +114,7 @@ script: | cd ../../../ #7z a -sfx tor-browser.exe tor-browser_en-US #mv tor-browser.exe $OUTDIR/tor-browser-linux${GBUILD_BITS}_en-US.7z-selfextract - tar -Jcvf $OUTDIR/tor-browser-linux${GBUILD_BITS}-${TORBROWSER_VERSION}_en-US.tar.xz tor-browser_en-US + tar --no-recursion -Jcvf $OUTDIR/tor-browser-linux${GBUILD_BITS}-${TORBROWSER_VERSION}_en-US.tar.xz `find tor-browser_en-US | sort` rm -rf tor-browser_en-US # unzip linux-langpacks.zip @@ -135,7 +135,7 @@ script: | #7z a -sfx tor-browser.exe tor-browser_$LANG #mv tor-browser.exe $OUTDIR/tor-browser-linux${GBUILD_BITS}_$LANG.7z-selfextract - tar -Jcvf $OUTDIR/tor-browser-linux${GBUILD_BITS}-${TORBROWSER_VERSION}_$LANG.tar.xz tor-browser_$LANG + tar --no-recursion -Jcvf $OUTDIR/tor-browser-linux${GBUILD_BITS}-${TORBROWSER_VERSION}_$LANG.tar.xz `find tor-browser_$LANG | sort` rm -rf tor-browser_$LANG cd linux-langpacks

1 0

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

29 Jun '13

commit 03a7ff1fa9021b7a0367a37ccb570a1bcf3e0f2a Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 29 03:45:25 2013 +0000 Update translations for vidalia_completed --- zh_CN/qt_zh_CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/qt_zh_CN.po b/zh_CN/qt_zh_CN.po index 673d345..c8d08ae 100644 --- a/zh_CN/qt_zh_CN.po +++ b/zh_CN/qt_zh_CN.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: 2008-08-20 03:25+0000\n" -"PO-Revision-Date: 2013-06-28 23:50+0000\n" +"PO-Revision-Date: 2013-06-29 03:16+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] Update translations for vidalia
by translation＠torproject.org 29 Jun '13

29 Jun '13

commit 7d864c9ad223b377471d8a635aa8061bffcbf693 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 29 03:45:19 2013 +0000 Update translations for vidalia --- zh_CN/qt_zh_CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/qt_zh_CN.po b/zh_CN/qt_zh_CN.po index 673d345..c8d08ae 100644 --- a/zh_CN/qt_zh_CN.po +++ b/zh_CN/qt_zh_CN.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: 2008-08-20 03:25+0000\n" -"PO-Revision-Date: 2013-06-28 23:50+0000\n" +"PO-Revision-Date: 2013-06-29 03:16+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_completed] Update translations for vidalia_completed
by translation＠torproject.org 29 Jun '13

29 Jun '13

commit 354aa5f1ec7a932dba87ea51d8b1630927be1769 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 29 00:15:23 2013 +0000 Update translations for vidalia_completed --- zh_CN/qt_zh_CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/qt_zh_CN.po b/zh_CN/qt_zh_CN.po index feecaa9..673d345 100644 --- a/zh_CN/qt_zh_CN.po +++ b/zh_CN/qt_zh_CN.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: 2008-08-20 03:25+0000\n" -"PO-Revision-Date: 2013-06-28 23:40+0000\n" +"PO-Revision-Date: 2013-06-28 23:50+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] Update translations for vidalia
by translation＠torproject.org 29 Jun '13

29 Jun '13

commit da0f0688d36a7b5b0a865fc2fe09bea08cd0eae7 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 29 00:15:18 2013 +0000 Update translations for vidalia --- zh_CN/qt_zh_CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/qt_zh_CN.po b/zh_CN/qt_zh_CN.po index feecaa9..673d345 100644 --- a/zh_CN/qt_zh_CN.po +++ b/zh_CN/qt_zh_CN.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: 2008-08-20 03:25+0000\n" -"PO-Revision-Date: 2013-06-28 23:40+0000\n" +"PO-Revision-Date: 2013-06-28 23:50+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_completed] Update translations for vidalia_completed
by translation＠torproject.org 29 Jun '13

29 Jun '13

commit 505661b732499e02e1b141c124abd1bb04c895ce Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 28 23:45:22 2013 +0000 Update translations for vidalia_completed --- zh_CN/qt_zh_CN.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/qt_zh_CN.po b/zh_CN/qt_zh_CN.po index 50ef6f2..feecaa9 100644 --- a/zh_CN/qt_zh_CN.po +++ b/zh_CN/qt_zh_CN.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: 2008-08-20 03:25+0000\n" -"PO-Revision-Date: 2013-06-28 04:10+0000\n" +"PO-Revision-Date: 2013-06-28 23:40+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" @@ -173,7 +173,7 @@ msgstr "类型" #: qdirmodel.cpp:435 msgctxt "QDirModel" msgid "Date Modified" -msgstr "已修改的日期" +msgstr "修改后日期" #: qfiledialog_win.cpp:126 msgctxt "QFileDialog"

1 0