May 2017 - tor-commits - lists.torproject.org

[translation/exoneratorproperties] Update translations for exoneratorproperties
by translation＠torproject.org 08 May '17

08 May '17

commit bd45a32d1b72194631c19b87408d477f5a14950b Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 8 16:48:18 2017 +0000 Update translations for exoneratorproperties --- zh_TW/exonerator.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_TW/exonerator.properties b/zh_TW/exonerator.properties index 3df41e8..1d23662 100644 --- a/zh_TW/exonerator.properties +++ b/zh_TW/exonerator.properties @@ -49,6 +49,6 @@ footer.aboutexonerator.heading=關於 ExoneraTor footer.aboutexonerator.body=ExoneraTor 服務內部有一個 IP 位址資料庫，紀錄著洋蔥路由網路中各個節點的相關歷史資訊，因此可以輕易的得知某個 IP 位址在某個時候是否曾經被某個洋蔥路由節點使用。  在某些情況中，同一個洋蔥路由節點用來連接外部廣域網路(洋蔥路由網路的出口)的 IP 位址與在洋蔥路由網路空間中所註冊的 IP 位址不一樣，此時在 ExoneraTor 裡關於該節點的資訊，就會出現多個不同的 IP 位址，也因此可以知道該節點在某個時間點，是否有提供連接外部廣域網路的出口服務。 footer.trademark.text=「Tor」和「Onion Logo」是 Tor Project, Inc 的 %s。 footer.trademark.link=註冊商標 -footer.language.name=English -footer.language.text=This page is also available in the following languages\: +footer.language.name=英文 +footer.language.text=此頁面也有底下這幾種不同語言的版本：

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 08 May '17

08 May '17

commit bc5ac3c72af6ff7eb8831a7a0cd7f41f8484d180 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 8 16:45:16 2017 +0000 Update translations for torcheck_completed --- zh_TW/torcheck.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zh_TW/torcheck.po b/zh_TW/torcheck.po index d623f0f..a6a20b9 100644 --- a/zh_TW/torcheck.po +++ b/zh_TW/torcheck.po @@ -3,17 +3,17 @@ # # Translators: # Agustín Wu <losangwuyts(a)gmail.com>, 2016 -# cges30901 <cges30901(a)gmail.com>, 2014 +# Hsiu-Ming Chang <cges30901(a)gmail.com>, 2014 # Chinrur Yang <chinrur(a)gmail.com>, 2013 # Chinrur Yang <chinrur(a)gmail.com>, 2013 # danfong <danfong.hsieh(a)gmail.com>, 2014 # x4r <xatierlike(a)gmail.com>, 2014-2015 -# cges30901 <cges30901(a)gmail.com>, 2014 +# Hsiu-Ming Chang <cges30901(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2016-11-27 14:40+0000\n" +"PO-Revision-Date: 2017-05-08 16:19+0000\n" "Last-Translator: Agustín Wu <losangwuyts(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 08 May '17

08 May '17

commit feb03e499389b54933cc78f1ea0d97295b2217de Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 8 16:45:10 2017 +0000 Update translations for torcheck --- zh_TW/torcheck.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zh_TW/torcheck.po b/zh_TW/torcheck.po index d623f0f..a6a20b9 100644 --- a/zh_TW/torcheck.po +++ b/zh_TW/torcheck.po @@ -3,17 +3,17 @@ # # Translators: # Agustín Wu <losangwuyts(a)gmail.com>, 2016 -# cges30901 <cges30901(a)gmail.com>, 2014 +# Hsiu-Ming Chang <cges30901(a)gmail.com>, 2014 # Chinrur Yang <chinrur(a)gmail.com>, 2013 # Chinrur Yang <chinrur(a)gmail.com>, 2013 # danfong <danfong.hsieh(a)gmail.com>, 2014 # x4r <xatierlike(a)gmail.com>, 2014-2015 -# cges30901 <cges30901(a)gmail.com>, 2014 +# Hsiu-Ming Chang <cges30901(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2016-11-27 14:40+0000\n" +"PO-Revision-Date: 2017-05-08 16:19+0000\n" "Last-Translator: Agustín Wu <losangwuyts(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n"

1 0

[tor-browser-build/master] Bug 22115: use i386 containers for the linux32 build
by boklm＠torproject.org 08 May '17

08 May '17

commit d067aa03629fb87c47acf19f81ed51940ebc3ebb Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon May 1 19:58:30 2017 +0200 Bug 22115: use i386 containers for the linux32 build --- projects/binutils/build | 3 ++- projects/common/runc-config.json | 6 +++++- projects/debootstrap-image/config | 22 ++++++++++++++++++++++ projects/firefox/config | 21 ++++----------------- projects/gcc/build | 1 + projects/gcc/config | 17 ++++++++++++----- projects/go-webrtc/config | 8 +------- projects/go/build | 1 + projects/go/config | 1 + projects/snowflake/config | 8 +------- projects/tor/config | 14 +++++--------- projects/webrtc/config | 30 ++++++++---------------------- rbm.conf | 35 ++++++++++++++++------------------- 13 files changed, 79 insertions(+), 88 deletions(-) diff --git a/projects/binutils/build b/projects/binutils/build index 8d4f09f..bd949a5 100644 --- a/projects/binutils/build +++ b/projects/binutils/build @@ -8,7 +8,8 @@ distdir=/var/tmp/dist/binutils export DEB_BUILD_HARDENING_FORTIFY=1 export DEB_BUILD_HARDENING_FORMAT=1 export DEB_BUILD_HARDENING_PIE=1 - +[% END -%] +[% IF c("var/linux-x86_64") %] # The libstdc++ shipped by default is non-PIC which breaks the binutils build # if we build with DEB_BUILD_HARDENING_PIE=1. We need to install a PIC one AND # make sure it gets used before the non-PIC one would. diff --git a/projects/common/runc-config.json b/projects/common/runc-config.json index 4c231cd..3da6c24 100644 --- a/projects/common/runc-config.json +++ b/projects/common/runc-config.json @@ -2,7 +2,11 @@ "ociVersion": "1.0.0-rc1", "platform": { "os": "linux", - "arch": "amd64" +[% IF c("var/container/arch") == 'i386' -%] + "arch": "386" +[% ELSE -%] + "arch": "[% c("var/container/arch") %]" +[% END -%] }, "process": { "terminal": true, diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config index bd204f5..15eec3b 100644 --- a/projects/debootstrap-image/config +++ b/projects/debootstrap-image/config @@ -27,23 +27,45 @@ targets: container: suite: wheezy arch: amd64 + wheezy-i386: + var: + container: + suite: wheezy + arch: i386 jessie-amd64: var: container: suite: jessie arch: amd64 + jessie-i386: + var: + container: + suite: jessie + arch: i386 precise-amd64: var: container: suite: precise arch: amd64 debootstrap_opt: --keyring=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg + precise-i386: + var: + container: + suite: precise + arch: i386 + debootstrap_opt: --keyring=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg utopic-amd64: var: container: suite: utopic arch: amd64 debootstrap_mirror: http://old-releases.ubuntu.com/ubuntu/ + utopic-i386: + var: + container: + suite: utopic + arch: i386 + debootstrap_mirror: http://old-releases.ubuntu.com/ubuntu/ input_files: - URL: 'http://cdimage.ubuntu.com/ubuntu-base/releases/[% c("var/ubuntu_version") %]/release/ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz' diff --git a/projects/firefox/config b/projects/firefox/config index d6a68fe..f5c765f 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -28,9 +28,8 @@ targets: var: torbrowser_update_channel: default - linux-x86_64: + linux: var: - martools_filename: mar-tools-linux64.zip arch_deps: - libgtk2.0-dev - libdbus-glib-1-dev @@ -44,25 +43,13 @@ targets: - libx11-xcb-dev # We built GCC but not the libmpc2, thus we need to install it - libmpc2 + linux-x86_64: + var: + martools_filename: mar-tools-linux64.zip linux-i686: var: martools_filename: mar-tools-linux32.zip - sort_deps: 0 - arch_deps: - - libc6-dev-i386 - - libgtk2.0-dev:i386 - - libdbus-glib-1-dev:i386 - - libxt-dev:i386 - # To pass configure since ESR 31. - - libpulse-dev:i386 - # To pass configure since ESR 45. - - libgconf2-dev:i386 - # To pass configure since ESR 52 - - libx11-xcb-dev:i386 - # We built GCC but not the libmpc2, thus we need to install it - - libmpc2 - - hardening-wrapper osx-x86_64: var: diff --git a/projects/gcc/build b/projects/gcc/build index 1c24af7..e509aac 100644 --- a/projects/gcc/build +++ b/projects/gcc/build @@ -1,5 +1,6 @@ #!/bin/sh [% c("var/set_default_env") -%] +[% c("var/setarch") -%] distdir=/var/tmp/dist/[% project %] mkdir /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c("version") %].tar.bz2 diff --git a/projects/gcc/config b/projects/gcc/config index 1acf30a..676d1fb 100644 --- a/projects/gcc/config +++ b/projects/gcc/config @@ -4,12 +4,11 @@ version: 5.1.0 var: container: use_container: 1 - configure_opt: --enable-multilib --enable-languages=c,c++ --with-arch_32=i686 deps: - build-essential - libmpc-dev - - libc6-dev-i386 setup: | + [% c("var/setarch") -%] mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %] export PATH="/var/tmp/dist/gcc/bin:$PATH" @@ -36,12 +35,20 @@ var: popd targets: - osx-x86_64: - var: - configure_opt: --enable-multilib --enable-languages=c,c++ windows-i686: var: configure_opt: --disable-multilib --enable-languages=c,c++ + linux-i686: + var: + configure_opt: --enable-multilib --enable-languages=c,c++ --with-system-zlib + arch_deps: + - libc6-dev + - zlib1g-dev + linux-x86_64: + var: + configure_opt: --enable-multilib --enable-languages=c,c++ --with-arch_32=i686 + arch_deps: + - libc6-dev-i386 input_files: - project: container-image - URL: 'https://ftp.gnu.org/gnu/gcc/gcc-[% c("version") %]/gcc-[% c("version") %].tar.bz2' diff --git a/projects/go-webrtc/config b/projects/go-webrtc/config index d7c31d6..673215b 100644 --- a/projects/go-webrtc/config +++ b/projects/go-webrtc/config @@ -31,17 +31,11 @@ var: targets: master: git_hash: master - linux-x86_64: + linux: var: arch_deps: - pkg-config - libx11-dev - linux-i686: - var: - arch_deps: - - pkg-config:i386 - - libx11-dev:i386 - - lib32stdc++6 input_files: - project: container-image diff --git a/projects/go/build b/projects/go/build index 2f87bf5..b7fac08 100644 --- a/projects/go/build +++ b/projects/go/build @@ -1,5 +1,6 @@ #!/bin/bash [% c("var/set_default_env") -%] +[% c("var/setarch") -%] distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/dist diff --git a/projects/go/config b/projects/go/config index ef9c411..b36f211 100644 --- a/projects/go/config +++ b/projects/go/config @@ -8,6 +8,7 @@ var: use_container: 1 setup: | + [% c("var/setarch") -%] mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c("go_tarfile") %] export GOOS=[% c("var/GOOS") %] diff --git a/projects/snowflake/config b/projects/snowflake/config index 212e86c..89e3eb6 100644 --- a/projects/snowflake/config +++ b/projects/snowflake/config @@ -9,13 +9,7 @@ var: use_container: 1 targets: - linux-i686: - var: - arch_deps: - - pkg-config - - libx11-dev:i386 - - lib32stdc++6 - linux-x86_64: + linux: var: arch_deps: - pkg-config diff --git a/projects/tor/config b/projects/tor/config index a9da811..c2d359c 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -21,22 +21,18 @@ targets: git_hash: master tag_gpg_id: 0 - linux-i686: + linux: var: - libdir: lib32 - sort_deps: 0 arch_deps: - - libc6-dev-i386 - libtool - - zlib1g-dev:i386 + - zlib1g-dev - hardening-wrapper + linux-i686: + var: + libdir: lib linux-x86_64: var: libdir: lib64 - arch_deps: - - libtool - - zlib1g-dev - - hardening-wrapper osx-x86_64: var: arch_deps: diff --git a/projects/webrtc/config b/projects/webrtc/config index d46d821..6882e87 100644 --- a/projects/webrtc/config +++ b/projects/webrtc/config @@ -26,28 +26,6 @@ targets: var: webrtc: os: linux - linux-i686: - var: - sort_deps: 0 - arch_deps: - - lib32asound2-dev - - lib64expat1 - - libexpat1-dev:i386 - - libglib2.0-dev:i386 - - libgtk2.0-dev:i386 - - libudev-dev:i386 - - libx11-dev:i386 - - libxext-dev:i386 - - libxrandr-dev:i386 - - lib32stdc++6 - - pkg-config - - hardening-wrapper - webrtc: - arch: ia32 - lib_arch: 386 - lib_path: lib/libwebrtc-linux-386-magic.a - linux-x86_64: - var: arch_deps: - libasound2-dev - libexpat1-dev @@ -58,6 +36,14 @@ targets: - libxext-dev - libxrandr-dev - pkg-config + linux-i686: + var: + webrtc: + arch: ia32 + lib_arch: 386 + lib_path: lib/libwebrtc-linux-386-magic.a + linux-x86_64: + var: webrtc: arch: x64 lib_arch: amd64 diff --git a/rbm.conf b/rbm.conf index 722c85a..2060132 100644 --- a/rbm.conf +++ b/rbm.conf @@ -111,26 +111,30 @@ targets: var: linux-x86_64: 1 osname: linux-x86_64 - deps: - - build-essential - - python - - bison - - hardening-wrapper - - automake - - libtool - - zip - - unzip # We only build snowflake on linux-x86_64 for now snowflake: 1 + container: + arch: amd64 linux-i686: arch: i686 var: linux-i686: 1 osname: linux-i686 - configure_opt: '--host=i686-linux-gnu CFLAGS=-m32 CXXFLAGS=-m32 LDFLAGS=-m32' - pre_pkginst: dpkg --add-architecture i386 + container: + arch: i386 + setarch: | + if test -z "$RBM_SETARCH" + then + export RBM_SETARCH=1 + exec setarch i686 ./build + fi + linux: + var: + linux: 1 + compiler: gcc + container: + suite: wheezy deps: - - libc6-dev-i386 - build-essential - python - bison @@ -139,13 +143,6 @@ targets: - libtool - zip - unzip - linux: - var: - linux: 1 - compiler: gcc - container: - suite: wheezy - arch: amd64 torbrowser-windows-i686: - windows-i686

1 0

[tor/master] Remove dead code in test_options_validate_impl().
by nickm＠torproject.org 08 May '17

08 May '17

commit 7344a4fdc6e9f9e4fdb6de9fe03dc73fef45c3e7 Author: Alexander Færøy <ahf(a)torproject.org> Date: Fri May 5 17:07:18 2017 +0200 Remove dead code in test_options_validate_impl(). Dead branch found by Coverity in CID #1405875. --- src/test/test_options.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/test/test_options.c b/src/test/test_options.c index d10a933..68e7ffc 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -187,8 +187,6 @@ test_options_validate_impl(const char *configuration, goto done; } tt_int_op((r == 0), OP_EQ, (msg == NULL)); - if (r) - goto done; r = config_assign(&options_format, opt, cl, 0, &msg); if (phase == PH_ASSIGN) {

1 0

[tor/master] Merge remote-tracking branch 'ahf/coverity/1405875'
by nickm＠torproject.org 08 May '17

08 May '17

commit 03fdf232bff1e1a98007eaf7c583ee956b09e1d5 Merge: 300f8e6 7344a4f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 8 08:19:13 2017 -0400 Merge remote-tracking branch 'ahf/coverity/1405875' src/test/test_options.c | 2 -- 1 file changed, 2 deletions(-)

1 0

[tor/release-0.3.0] Merge branch 'maint-0.2.8' into maint-0.2.9
by nickm＠torproject.org 08 May '17

08 May '17

commit 5ff0b519ecee6e3d0b6d4550bd74f197a818b08d Merge: 4a9f689 dc34cd7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 8 08:07:32 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/geoip-may2017 | 4 + src/config/geoip | 5862 +++++++++++++++++++++++++++++++------------------ src/config/geoip6 | 689 +++++- 3 files changed, 4358 insertions(+), 2197 deletions(-)

1 0

[tor/release-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 08 May '17

08 May '17

commit f5876917aaa5a79577ec27fd8302f75085b41e8e Merge: 7ae7e3c 5ff0b51 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 8 08:07:38 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/geoip-may2017 | 4 + src/config/geoip | 5862 +++++++++++++++++++++++++++++++------------------ src/config/geoip6 | 689 +++++- 3 files changed, 4358 insertions(+), 2197 deletions(-)

1 0

[tor/release-0.3.0] Merge branch 'maint-0.2.6' into maint-0.2.7-redux
by nickm＠torproject.org 08 May '17

08 May '17

commit 71dd1d716ac83d98ab4592f46b984338a1a7685b Merge: 44bc882 159ddf6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 8 08:07:11 2017 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7-redux changes/geoip-may2017 | 4 + src/config/geoip | 5862 +++++++++++++++++++++++++++++++------------------ src/config/geoip6 | 689 +++++- 3 files changed, 4358 insertions(+), 2197 deletions(-)

1 0

[tor/release-0.3.0] Merge branch 'maint-0.2.7-redux' into maint-0.2.8
by nickm＠torproject.org 08 May '17

08 May '17

commit dc34cd7a04f54e63ab1c32a5de9fa116a8ad7ff8 Merge: 91c6b18 71dd1d7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 8 08:07:19 2017 -0400 Merge branch 'maint-0.2.7-redux' into maint-0.2.8 changes/geoip-may2017 | 4 + src/config/geoip | 5862 +++++++++++++++++++++++++++++++------------------ src/config/geoip6 | 689 +++++- 3 files changed, 4358 insertions(+), 2197 deletions(-)

1 0