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

[stem/master] Check the 'cached-microdescs' file for skipping, instead of 'cached-descriptors'
by atagar＠torproject.org 24 Jun '18

24 Jun '18

commit 04728e1408f5db4dccac5342c62d324db943cc82 Author: Dave Rolek <dmr-x(a)riseup.net> Date: Thu Jun 21 19:07:16 2018 +0000 Check the 'cached-microdescs' file for skipping, instead of 'cached-descriptors' This should fix #26225, although attempts to reproduce were unfruitful, so the fix hasn't been directly tested. cefe584cd57c45a77379428a4c15fb225c0afdcc (which introduced the check for 'cached-descriptors') had made this more stable, but since it was checking a different file, it seems that some temporal edge cases could still run this test into a failure, as evidenced by a few recent Jenkins failures. --- test/integ/control/controller.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index cde8e140..4d28afac 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -1154,7 +1154,7 @@ class TestController(unittest.TestCase): runner = test.runner.get_runner() - if not os.path.exists(runner.get_test_dir('cached-descriptors')): + if not os.path.exists(runner.get_test_dir('cached-microdescs')): self.skipTest('(no cached microdescriptors)') return

1 0

[stem/master] test_get_microdescriptors can be unreliable
by atagar＠torproject.org 24 Jun '18

24 Jun '18

commit 7c3c6e580c9755a9bc1f18c21b0b1210eb9d26db Merge: 2de51c27 3854f6af Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jun 24 16:08:20 2018 -0700 test_get_microdescriptors can be unreliable Pull request from Dave... https://trac.torproject.org/projects/tor/ticket/26225 https://github.com/torproject/stem/pull/3 stem/control.py | 2 +- test/integ/control/controller.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)

1 0

[stem/master] Furthermore, decorate test_get_microdescriptors() with @test.require.online
by atagar＠torproject.org 24 Jun '18

24 Jun '18

commit 3854f6af4543c6d2b5793025c1c780c4ee85afe3 Author: Dave Rolek <dmr-x(a)riseup.net> Date: Thu Jun 21 19:19:47 2018 +0000 Furthermore, decorate test_get_microdescriptors() with @test.require.online The previous commit should address #26225, but a tor instance that has never been online won't generate a cache of microdescriptors, so it seems superfluous (although not completely pointless) to run this test outside the ONLINE target. --- test/integ/control/controller.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 4d28afac..5c989889 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -1147,6 +1147,7 @@ class TestController(unittest.TestCase): self.assertEqual(md_by_fingerprint, md_by_nickname) @test.require.controller + @test.require.online def test_get_microdescriptors(self): """ Fetches a few descriptors via the get_microdescriptors() method.

1 0

[tor/master] better log line for debugging #26485
by arma＠torproject.org 24 Jun '18

24 Jun '18

commit 04b350b476579674679ccf2823d57be8606be559 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Jun 24 18:14:24 2018 -0400 better log line for debugging #26485 --- src/or/networkstatus.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index e6eaffffa..b12846197 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -606,8 +606,11 @@ networkstatus_check_consensus_signature(networkstatus_t *consensus, char *tmp = smartlist_join_strings(list_good, " ", 0, NULL); smartlist_add_asprintf(sl, "A consensus needs %d good signatures from recognized " - "authorities for us to accept it. This one has %d (%s).", - n_required, n_good, tmp); + "authorities for us to accept it. " + "This %s one has %d (%s).", + n_required, + networkstatus_get_flavor_name(consensus->flavor), + n_good, tmp); tor_free(tmp); if (n_no_signature) { tmp = smartlist_join_strings(list_no_signature, " ", 0, NULL);

1 0

[tor/master] we've never been good at using "directory" well as a noun
by arma＠torproject.org 24 Jun '18

24 Jun '18

commit 73ae92dc52f94e36bc58cb0c00f615a575d27da8 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Jun 24 18:08:24 2018 -0400 we've never been good at using "directory" well as a noun --- src/or/dirserv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 077135841..8c2631171 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -49,7 +49,7 @@ /** * \file dirserv.c * \brief Directory server core implementation. Manages directory - * contents and generates directories. + * contents and generates directory documents. * * This module implements most of directory cache functionality, and some of * the directory authority functionality. The directory.c module delegates

1 0

[stem/master] Display --quiet option in run_tests.py --help
by atagar＠torproject.org 24 Jun '18

24 Jun '18

commit 8a66916436cb524666e8b35060892e01f5bd053a Author: Dave Rolek <dmr-x(a)riseup.net> Date: Mon Apr 16 00:36:10 2018 +0000 Display --quiet option in run_tests.py --help --- test/settings.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/test/settings.cfg b/test/settings.cfg index c3952567..279861f0 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -41,6 +41,7 @@ msg.help | -l, --log RUNLEVEL includes logging output with test results, runlevels: | TRACE, DEBUG, INFO, NOTICE, WARN, ERROR | --tor PATH custom tor binary to run testing against +| -q, --quiet limits test output to failures only | -v, --verbose provides additional test output | -h, --help presents this help |

1 0

[stem/master] Adjust --quiet description
by atagar＠torproject.org 24 Jun '18

24 Jun '18

commit 80abc4605f10e9e9910f942504bc71d80ca9acb3 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jun 24 14:50:10 2018 -0700 Adjust --quiet description It was fine. Just my pedantic twiddling. --- test/settings.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/settings.cfg b/test/settings.cfg index 279861f0..af751609 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -41,7 +41,7 @@ msg.help | -l, --log RUNLEVEL includes logging output with test results, runlevels: | TRACE, DEBUG, INFO, NOTICE, WARN, ERROR | --tor PATH custom tor binary to run testing against -| -q, --quiet limits test output to failures only +| -q, --quiet only present failures | -v, --verbose provides additional test output | -h, --help presents this help |

1 0

[stem/master] Show '--quiet' test argument
by atagar＠torproject.org 24 Jun '18

24 Jun '18

commit 2de51c279489d9b3a5ed7864b9e33feeca44d6ac Merge: 3818cf41 80abc460 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jun 24 14:51:15 2018 -0700 Show '--quiet' test argument Patch from Dave... https://trac.torproject.org/projects/tor/ticket/26421 https://github.com/torproject/stem/pull/2 test/settings.cfg | 1 + 1 file changed, 1 insertion(+)

1 0

[tor-browser-build/master] Prepare build3
by gk＠torproject.org 24 Jun '18

24 Jun '18

commit e8c4d33d024cf1f3a3b0f560541f5424e563ca69 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jun 24 21:18:26 2018 +0000 Prepare build3 We pick up fix for Windows bustage and a macOS reproducibility issue. Moreover an update Torbutton version with a new icon gets included, too. --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 5 ++++- projects/torbutton/config | 2 +- rbm.conf | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 1ceda50..5f52bbe 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -4,8 +4,9 @@ Tor Browser 8.0a9 -- June 27 2018 * Update Tor to 0.3.4.2-alpha * Update Libevent to 2.1.8 * Update Binutils to 2.26.1 - * Update Torbutton to 2.0 + * Update Torbutton to 2.0.1 * Bug 26100: Adapt Torbutton to Firefox 60 ESR + * Bug 26430: New Torbutton icon * Bug 24309: Move circuit display to the identity popup * Bug 26128: Adapt security slider to the WebExtensions version of NoScript * Bug 23247: Show security state of .onions @@ -70,6 +71,7 @@ Tor Browser 8.0a9 -- June 27 2018 * Bug 23561: Fix nsis builds for Windows 64 * Bug 23231: Remove our STL Wrappers workaround for Windows 64bit * Bug 26370: Don't copy msvcr100.dll and libssp-0.dll twice + * Bug 26476: Work around Tor Browser crashes due to fix for bug 1467041 * Bug 18287: Use SHA-2 signature for Tor Browser setup executables * OS X * Bug 24632: Update macOS toolchain for ESR 60 @@ -78,6 +80,7 @@ Tor Browser 8.0a9 -- June 27 2018 * Bug 26003: Clean up our mozconfig-osx-x86_64 file * Bug 26195: Use new cctools in our macosx-toolchain project * Bug 25975: Get a rust cross-compiler for macOS + * Bug 26475: Disable Stylo to make macOS build reproducible * Linux * Bug 26073: Patch tor-browser-build for transition to ESR 60 * Bug 25540: Stop building and distributing sandboxed tor browser diff --git a/projects/torbutton/config b/projects/torbutton/config index 0791953..ba53944 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.0 +version: 2.0.1 git_url: https://git.torproject.org/torbutton.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index 67ac46d..31aae9e 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.0a9' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 8.0a8 project_name: tor-browser

1 0

[tor-browser-build/master] Bug 26476: Work around Windows Tor Browser bustage
by gk＠torproject.org 24 Jun '18

24 Jun '18

commit 43cefe3afeb58e7416f7b1e508c8a251b12efb72 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jun 24 19:42:50 2018 +0000 Bug 26476: Work around Windows Tor Browser bustage --- projects/firefox/1464084.patch | 73 ++++++++++++++++++++++++++++++++++++++++++ projects/firefox/1467041.patch | 23 +++++++++++++ projects/firefox/build | 2 ++ projects/firefox/config | 4 +++ 4 files changed, 102 insertions(+) diff --git a/projects/firefox/1464084.patch b/projects/firefox/1464084.patch new file mode 100644 index 0000000..524cb7f --- /dev/null +++ b/projects/firefox/1464084.patch @@ -0,0 +1,73 @@ +From 1a1cc016c8f6ff83ea057ee6fe6838b89c382210 Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Sun, 24 Jun 2018 19:36:35 +0000 +Subject: [PATCH 1/2] Revert "Bug 1464084 - Don't export + std::thread::_M_start_thread symbols with --enable-stdcxx-compat. r=froydnj, + a=RyanVM" + +This reverts commit 655e5f1d95e0d5ecd037f36dbe533372130e5621. + +diff --git a/build/unix/stdc++compat/hide_std.ld b/build/unix/stdc++compat/hide_std.ld +deleted file mode 100644 +index 4b3400b0f327..000000000000 +--- a/build/unix/stdc++compat/hide_std.ld ++++ /dev/null +@@ -1,5 +0,0 @@ +-hidden { +- local: +- # std::thread::_M_start_thread(...) +- _ZNSt6thread15_M_start_thread*; +-}; +diff --git a/build/unix/stdc++compat/moz.build b/build/unix/stdc++compat/moz.build +index 4444d0c4f297..20517a1caef5 100644 +--- a/build/unix/stdc++compat/moz.build ++++ b/build/unix/stdc++compat/moz.build +@@ -23,5 +23,3 @@ COMPILE_FLAGS['CLANG_PLUGIN'] = [] + + DEFINES['MOZ_LIBSTDCXX_VERSION'] = CONFIG['MOZ_LIBSTDCXX_TARGET_VERSION'] + HOST_DEFINES['MOZ_LIBSTDCXX_VERSION'] = CONFIG['MOZ_LIBSTDCXX_HOST_VERSION'] +- +-OS_LIBS += ['-Wl,--version-script,%s/hide_std.ld' % SRCDIR] +diff --git a/python/mozbuild/mozbuild/action/generate_symbols_file.py b/python/mozbuild/mozbuild/action/generate_symbols_file.py +index bf1ae917a2d0..f118060f47cf 100644 +--- a/python/mozbuild/mozbuild/action/generate_symbols_file.py ++++ b/python/mozbuild/mozbuild/action/generate_symbols_file.py +@@ -42,8 +42,6 @@ def generate_symbols_file(output, *args): + + symbols = [s.strip() for s in pp.out.getvalue().splitlines() if s.strip()] + +- libname, ext = os.path.splitext(os.path.basename(output.name)) +- + if buildconfig.substs['OS_TARGET'] == 'WINNT': + # A def file is generated for MSVC link.exe that looks like the + # following: +@@ -68,13 +66,14 @@ def generate_symbols_file(output, *args): + # those platforms, and to DATA on Windows, so that the "DATA" part + # is, in fact, part of the symbol name as far as the symbols variable + # is concerned. ++ libname, ext = os.path.splitext(os.path.basename(output.name)) + assert ext == '.def' + output.write('LIBRARY %s\nEXPORTS\n %s\n' + % (libname, '\n '.join(symbols))) + elif buildconfig.substs['GCC_USE_GNU_LD']: + # A linker version script is generated for GNU LD that looks like the + # following: +- # liblibrary.so { ++ # { + # global: + # symbol1; + # symbol2; +@@ -82,8 +81,8 @@ def generate_symbols_file(output, *args): + # local: + # *; + # }; +- output.write('%s {\nglobal:\n %s;\nlocal:\n *;\n};' +- % (libname, ';\n '.join(symbols))) ++ output.write('{\nglobal:\n %s;\nlocal:\n *;\n};' ++ % ';\n '.join(symbols)) + elif buildconfig.substs['OS_TARGET'] == 'Darwin': + # A list of symbols is generated for Apple ld that simply lists all + # symbols, with an underscore prefix. +-- +2.17.1 + diff --git a/projects/firefox/1467041.patch b/projects/firefox/1467041.patch new file mode 100644 index 0000000..a31e2e0 --- /dev/null +++ b/projects/firefox/1467041.patch @@ -0,0 +1,23 @@ +From 8d940fed5975400910c29037a6c575260d3caa22 Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Sun, 24 Jun 2018 19:37:55 +0000 +Subject: [PATCH 2/2] Revert "Bug 1467041 - Default to --enable-release when + milestone is beta/release. r=froydnj, a=RyanVM" + +This reverts commit b1f09cd8f4a1abf13f85a2353ac1b9711200b0e5. + +diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure +index 67007c8dcf7c..a1e443019748 100755 +--- a/build/moz.configure/toolchain.configure ++++ b/build/moz.configure/toolchain.configure +@@ -1387,7 +1387,6 @@ imply_option('--enable-release', mozilla_official) + imply_option('--enable-release', depends_if('MOZ_AUTOMATION')(lambda x: True)) + + js_option('--enable-release', +- default=milestone.is_release_or_beta, + help='Build with more conservative, release engineering-oriented ' + 'options. This may slow down builds.') + +-- +2.17.1 + diff --git a/projects/firefox/build b/projects/firefox/build index f023c6d..e6fa41c 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -134,6 +134,8 @@ fi [% IF c("var/windows") %] patch -p1 < $rootdir/nsis-uninstall.patch + patch -p1 < $rootdir/1464084.patch + patch -p1 < $rootdir/1467041.patch [% END -%] [% IF c("var/osx") %] diff --git a/projects/firefox/config b/projects/firefox/config index 51dc04a..303ca0d 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -106,6 +106,10 @@ input_files: enable: '[% c("var/windows") %]' - filename: nsis-uninstall.patch enable: '[% c("var/windows") %]' + - filename: 1464084.patch + enable: '[% c("var/windows") %]' + - filename: 1467041.patch + enable: '[% c("var/windows") %]' - project: rust name: rust - project: llvm

1 0