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

[tor-browser-build/master] Bug 31538: Make Windows builds reproducible again
by boklm＠torproject.org 18 Sep '19

18 Sep '19

commit a7a90d35e55bb8f9886fd9d827b01eba2060c74b Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 13 06:51:04 2019 +0000 Bug 31538: Make Windows builds reproducible again Updating CMake to the latest stable version as done in the previous commit solves the reproducibility issue only partly. We need to patch the code that merges libc++abi.a into libc++.a to get the order in the merged archive deterministic. The code doing the merging is: `files = glob.glob(os.path.join(temp_directory_root, '*.o*'))` Regarding `glob` there is following in the Python docs: "The glob module finds all the pathnames matching a specified pattern according to the rules used by the Unix shell, although results are returned in *arbitrary* order." (emphasis mine) (https://docs.python.org/2/library/glob.html) --- projects/mingw-w64-clang/build | 1 + projects/mingw-w64-clang/config | 1 + projects/mingw-w64-clang/sort.patch | 22 ++++++++++++++++++++++ 3 files changed, 24 insertions(+) diff --git a/projects/mingw-w64-clang/build b/projects/mingw-w64-clang/build index 86c3c6e..fa059da 100644 --- a/projects/mingw-w64-clang/build +++ b/projects/mingw-w64-clang/build @@ -173,6 +173,7 @@ make -j[% c("buildconf/num_procs") %] VERBOSE=1 # libcxx cd $builddir/libcxx +patch -p1 < $rootdir/sort.patch mkdir build && cd build cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$distdir/[% c("arch") %]-w64-mingw32 \ diff --git a/projects/mingw-w64-clang/config b/projects/mingw-w64-clang/config index 3d209ea..32d18a8 100644 --- a/projects/mingw-w64-clang/config +++ b/projects/mingw-w64-clang/config @@ -36,3 +36,4 @@ input_files: - project: llvm-mingw name: llvm-mingw - filename: mingw-winrt.patch + - filename: sort.patch diff --git a/projects/mingw-w64-clang/sort.patch b/projects/mingw-w64-clang/sort.patch new file mode 100644 index 0000000..e9143b0 --- /dev/null +++ b/projects/mingw-w64-clang/sort.patch @@ -0,0 +1,22 @@ +From 9eeb3b9ea13b25591c9081a5f05a1904d367d523 Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Wed, 11 Sep 2019 13:25:54 +0000 +Subject: [PATCH] sorted + + +diff --git a/utils/merge_archives.py b/utils/merge_archives.py +index 58d92f0e2..597ca2471 100755 +--- a/utils/merge_archives.py ++++ b/utils/merge_archives.py +@@ -124,7 +124,7 @@ def main(): + execute_command_verbose([ar_exe, 'x', arc], cwd=temp_directory_root, + verbose=args.verbose) + +- files = glob.glob(os.path.join(temp_directory_root, '*.o*')) ++ files = sorted(glob.glob(os.path.join(temp_directory_root, '*.o*'))) + if not files: + print_and_exit('Failed to glob for %s' % temp_directory_root) + cmd = [ar_exe, 'qcs', args.output] + files +-- +2.23.0 +

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 18 Sep '19

18 Sep '19

commit b145d1a2bb8e0b5e67c4b0087ca3d4f7745fb0a7 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 18 05:52:55 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+ja.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contents+ja.po b/contents+ja.po index c9acfa296..359193a65 100644 --- a/contents+ja.po +++ b/contents+ja.po @@ -347,7 +347,7 @@ msgstr "- [Tor Project の会計報告](https://www.torproject.org/about/reports msgid "" "- [The Tor Project Board Members and " "Staff](https://www.torproject.org/about/people/)" -msgstr "" +msgstr "- [Tor Project の役員とスタッフ](https://www.torproject.org/about/people/)" #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -566,7 +566,7 @@ msgstr "新しいリリース: Tails 3.12" msgid "" "This release fixes many security vulnerabilities. You should upgrade as soon" " as possible." -msgstr "" +msgstr "このリリースには多くのセキュリティ脆弱性の修正が含まれます。可能な限り早くアップグレードされることをお勧めします。" #: https//www.torproject.org/press/-new-release-tails/ #: (content/press/new-release-tails/contents+en.lrpost.summary)

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 18 Sep '19

18 Sep '19

commit 9c9bd7939cf06b493b5e68d049ed5e7c52493f16 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 18 05:23:03 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+ja.po | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/contents+ja.po b/contents+ja.po index 21686e389..c9acfa296 100644 --- a/contents+ja.po +++ b/contents+ja.po @@ -265,12 +265,12 @@ msgstr "- フリー・オープンな匿名性・プライバシー技術を開 #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) msgid "- Supporting their unrestricted availability and use, and" -msgstr "" +msgstr "- その制限されない有効性と利用を支援する" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) msgid "- Furthering their scientific and popular understanding." -msgstr "" +msgstr "- 人々の正確な理解を深める" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) @@ -279,6 +279,8 @@ msgid "" "of the most popular and widely used free, open source privacy technologies: " "Tor Browser and the Tor network." msgstr "" +"Tor Project とそのコミュニティは、最も名の知れていて広く利用されているフリー・オープンソースのプライバシー技術である Tor Browser" +" や Tor ネットワークを開発、展開しています。" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) @@ -338,7 +340,7 @@ msgstr "" msgid "" "- [The Tor Project Financial " "Reports](https://www.torproject.org/about/reports/)" -msgstr "" +msgstr "- [Tor Project の会計報告](https://www.torproject.org/about/reports/)" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body)

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 18 Sep '19

18 Sep '19

commit 3e029890e0067b7e519cc561cbe2eddce242c2ef Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 18 04:53:06 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+ja.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contents+ja.po b/contents+ja.po index bc4adf203..21686e389 100644 --- a/contents+ja.po +++ b/contents+ja.po @@ -253,12 +253,14 @@ msgid "" "The Tor Project is a U.S.-based 501(c)3 nonprofit founded in 2006 with the " "mission of advancing human rights and freedoms by:" msgstr "" +"Tor Project は 2006 年、人権と自由を向上する使命とともに設立された、アメリカを拠点とする 501(c)3 " +"非営利団体です。次のような取り組みによって、この使命を果たすべく活動しています。" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) msgid "" "- Creating and deploying free and open anonymity and privacy technologies," -msgstr "" +msgstr "- フリー・オープンな匿名性・プライバシー技術を開発、展開する" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body)

1 0

[tor/maint-0.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0
by nickm＠torproject.org 17 Sep '19

17 Sep '19

commit 9e674d0eb4d83caab5298e83c837ebd58b0f5d3d Merge: a1f97bb25 02840169d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 17 21:28:37 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug31657 | 5 +++++ src/feature/client/entrynodes.c | 3 ++- src/test/test_entrynodes.c | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.4.0] entrynodes: Make routine descriptor expiry notice logs less alarming
by nickm＠torproject.org 17 Sep '19

17 Sep '19

commit 670d4026219534558c809c48ba36b905d18ce35f Author: teor <teor(a)torproject.org> Date: Fri Sep 6 16:23:58 2019 +1000 entrynodes: Make routine descriptor expiry notice logs less alarming When tor is missing descriptors for some primary entry guards, make the log message less alarming. It's normal for descriptors to expire, as long as tor fetches new ones soon after. Fixes bug 31657; bugfix on 0.3.3.1-alpha. --- changes/bug31657 | 5 +++++ src/feature/client/entrynodes.c | 3 ++- src/test/test_entrynodes.c | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/changes/bug31657 b/changes/bug31657 new file mode 100644 index 000000000..08e9d95fd --- /dev/null +++ b/changes/bug31657 @@ -0,0 +1,5 @@ + o Minor bugfixes (guards): + - When tor is missing descriptors for some primary entry guards, make the + log message less alarming. It's normal for descriptors to expire, as long + as tor fetches new ones soon after. Fixes bug 31657; + bugfix on 0.3.3.1-alpha. diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c index 819f90a6d..1bfb62538 100644 --- a/src/feature/client/entrynodes.c +++ b/src/feature/client/entrynodes.c @@ -3765,7 +3765,8 @@ guard_selection_get_err_str_if_dir_info_missing(guard_selection_t *gs, /* otherwise return a helpful error string */ tor_asprintf(&ret_str, "We're missing descriptors for %d/%d of our " - "primary entry guards (total %sdescriptors: %d/%d).", + "primary entry guards (total %sdescriptors: %d/%d). " + "That's ok. We will try to fetch missing descriptors soon.", n_missing_descriptors, num_primary_to_check, using_mds?"micro":"", num_present, num_usable); diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c index 8f0b96004..a486b13ae 100644 --- a/src/test/test_entrynodes.c +++ b/src/test/test_entrynodes.c @@ -1723,7 +1723,8 @@ test_entry_guard_manage_primary(void *arg) dir_info_str =guard_selection_get_err_str_if_dir_info_missing(gs, 1, 2, 3); tt_str_op(dir_info_str, OP_EQ, "We're missing descriptors for 1/2 of our primary entry guards " - "(total microdescriptors: 2/3)."); + "(total microdescriptors: 2/3). That's ok. We will try to fetch " + "missing descriptors soon."); tor_free(dir_info_str); }

1 0

[tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/1300' into maint-0.3.5
by nickm＠torproject.org 17 Sep '19

17 Sep '19

commit 02840169d860384257042bdf6d7601c2bf48b47b Merge: 50b45c43e 670d40262 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 17 21:28:29 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1300' into maint-0.3.5 changes/bug31657 | 5 +++++ src/feature/client/entrynodes.c | 3 ++- src/test/test_entrynodes.c | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.5] entrynodes: Make routine descriptor expiry notice logs less alarming
by nickm＠torproject.org 17 Sep '19

17 Sep '19

commit 670d4026219534558c809c48ba36b905d18ce35f Author: teor <teor(a)torproject.org> Date: Fri Sep 6 16:23:58 2019 +1000 entrynodes: Make routine descriptor expiry notice logs less alarming When tor is missing descriptors for some primary entry guards, make the log message less alarming. It's normal for descriptors to expire, as long as tor fetches new ones soon after. Fixes bug 31657; bugfix on 0.3.3.1-alpha. --- changes/bug31657 | 5 +++++ src/feature/client/entrynodes.c | 3 ++- src/test/test_entrynodes.c | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/changes/bug31657 b/changes/bug31657 new file mode 100644 index 000000000..08e9d95fd --- /dev/null +++ b/changes/bug31657 @@ -0,0 +1,5 @@ + o Minor bugfixes (guards): + - When tor is missing descriptors for some primary entry guards, make the + log message less alarming. It's normal for descriptors to expire, as long + as tor fetches new ones soon after. Fixes bug 31657; + bugfix on 0.3.3.1-alpha. diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c index 819f90a6d..1bfb62538 100644 --- a/src/feature/client/entrynodes.c +++ b/src/feature/client/entrynodes.c @@ -3765,7 +3765,8 @@ guard_selection_get_err_str_if_dir_info_missing(guard_selection_t *gs, /* otherwise return a helpful error string */ tor_asprintf(&ret_str, "We're missing descriptors for %d/%d of our " - "primary entry guards (total %sdescriptors: %d/%d).", + "primary entry guards (total %sdescriptors: %d/%d). " + "That's ok. We will try to fetch missing descriptors soon.", n_missing_descriptors, num_primary_to_check, using_mds?"micro":"", num_present, num_usable); diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c index 8f0b96004..a486b13ae 100644 --- a/src/test/test_entrynodes.c +++ b/src/test/test_entrynodes.c @@ -1723,7 +1723,8 @@ test_entry_guard_manage_primary(void *arg) dir_info_str =guard_selection_get_err_str_if_dir_info_missing(gs, 1, 2, 3); tt_str_op(dir_info_str, OP_EQ, "We're missing descriptors for 1/2 of our primary entry guards " - "(total microdescriptors: 2/3)."); + "(total microdescriptors: 2/3). That's ok. We will try to fetch " + "missing descriptors soon."); tor_free(dir_info_str); }

1 0

[tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1
by nickm＠torproject.org 17 Sep '19

17 Sep '19

commit 5f00c03ed0327917409b074b99b7509c26128617 Merge: c3e94a8cc 9e674d0eb Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 17 21:28:38 2019 -0400 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/bug31657 | 5 +++++ src/feature/client/entrynodes.c | 3 ++- src/test/test_entrynodes.c | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.0
by nickm＠torproject.org 17 Sep '19

17 Sep '19

commit 9e674d0eb4d83caab5298e83c837ebd58b0f5d3d Merge: a1f97bb25 02840169d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 17 21:28:37 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug31657 | 5 +++++ src/feature/client/entrynodes.c | 3 ++- src/test/test_entrynodes.c | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-)

1 0