December 2021 - tor-commits - lists.torproject.org

[tor/main] doc: Update ReleasingTor.md with missing steps
by dgoulet＠torproject.org 16 Dec '21

16 Dec '21

commit a81ddc83be14e73c2d9d52762f875e6886c4c36a Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Dec 16 12:14:52 2021 -0500 doc: Update ReleasingTor.md with missing steps Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- doc/HACKING/ReleasingTor.md | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/doc/HACKING/ReleasingTor.md b/doc/HACKING/ReleasingTor.md index acaa748771..dce44eaf61 100644 --- a/doc/HACKING/ReleasingTor.md +++ b/doc/HACKING/ReleasingTor.md @@ -100,20 +100,28 @@ Once all signatures from all selected developers have been committed: Once the tarballs have been uploaded and are ready to be announced, we need to do the following: - 1. Merge upstream the artifacts from the `patches` job in the + 1. Tag versions (main and maint) using `git tag -s tor-0.x.y.z-<status>` + and then push the tags: `git push origin --tags` + + 2. Merge upstream the artifacts from the `patches` job in the `Post-process` stage of the CI release pipeline. - 2. Write and post the release announcement for the `forum.torproject.net` + 3. Write and post the release announcement for the `forum.torproject.net` in the `News -> Tor Release Announcement` category. - Mention in which Tor Browser version (with dates) the release will be - in. This usually only applies to the latest stable. + If possible, mention in which Tor Browser version (with dates) the + release will be in. This usually only applies to the latest stable. ### New Stable 1. Create the `maint-x.y.z` and `release-x.y.z` branches and update the `./scripts/git/git-list-tor-branches.sh` with the new version. + 2. Add the new version in `./scripts/ci/ci-driver.sh`. + + 3. Forward port the ChangeLog and ReleaseNotes into main branch. Remove any + change logs of stable releases in ReleaseNotes. + ## Appendix: An alternative means to notify packagers

1 0

[tor/main] doc: Improve a bit the ReleasingTor.md
by dgoulet＠torproject.org 16 Dec '21

16 Dec '21

commit e152a0a7cc44fd4de36eaf50f756c67a7d75dcbe Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Dec 16 11:03:53 2021 -0500 doc: Improve a bit the ReleasingTor.md Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- doc/HACKING/ReleasingTor.md | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/doc/HACKING/ReleasingTor.md b/doc/HACKING/ReleasingTor.md index 12f5d1b16b..acaa748771 100644 --- a/doc/HACKING/ReleasingTor.md +++ b/doc/HACKING/ReleasingTor.md @@ -6,7 +6,7 @@ pipeline. Before we begin, first rule is to make sure: - - Our CI pass for each version to release + - Our CIs (*nix and Windows) pass for each version to release - Coverity has no new alerts ## 0. Security Release @@ -20,7 +20,7 @@ prior to the release: ## 1. Preliminaries -The following must be done 2 days at the very least prior to the release: +The following must be done **2 days** at the very least prior to the release: 1. Add the version(s) in the dirauth-conf git repository as the RecommendedVersion and RequiredVersion so they can be approved by the @@ -62,10 +62,15 @@ reproducible way using: https://gitlab.torproject.org/tpo/core/tor-ci-reproducible -Simply run the `./build.sh` which will commit interactively the signature for -you. You then only need to git push. +Steps are: -Once all signatures have been committed: + 1. Run `./build.sh` which will download everything you need, including the + latest tarballs from the release CI, and auto-commit the signatures if + the checksum match. You will need to confim the commits. + + 2. If all is good, `git push origin main` your signatures. + +Once all signatures from all selected developers have been committed: 1. Manually trigger the `signature` job in the `Post-process` stage of the CI release pipeline.

1 0

[tor/main] changelog: Forward port ChangeLogs and ReleaseNotes
by dgoulet＠torproject.org 16 Dec '21

16 Dec '21

commit 3b10e0a393284e8a08900348d76ebde231a887cc Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Dec 16 12:16:18 2021 -0500 changelog: Forward port ChangeLogs and ReleaseNotes Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- ChangeLog | 46 +++++++++++++++++++++++++++++++++++++++ ReleaseNotes | 70 ++++-------------------------------------------------------- 2 files changed, 50 insertions(+), 66 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4a6be2c18a..fd1cd934f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -106,6 +106,52 @@ Changes in version 0.4.7.3-alpha - 2021-12-15 - Missing "OverloadStatistics" in tor.1 manpage. Fixes bug 40504; bugfix on 0.4.6.1-alpha. +Changes in version 0.4.6.9 - 2021-12-15 + This version fixes several bugs from earlier versions of Tor. One important + piece is the removal of DNS timeout metric from the overload general signal. + See below for more details. + + o Major bugfixes (relay, overload): + - Don't make Tor DNS timeout trigger an overload general state. + These timeouts are different from DNS server timeout. They have to + be seen as timeout related to UX and not because of a network + problem. Fixes bug 40527; bugfix on 0.4.6.1-alpha. + + o Minor feature (reproducible build): + - The repository can now build reproducible tarballs which adds the + build command "make dist-reprod" for that purpose. Closes + ticket 26299. + + o Minor features (compilation): + - Give an error message if trying to build with a version of + LibreSSL known not to work with Tor. (There's an incompatibility + with LibreSSL versions 3.2.1 through 3.4.0 inclusive because of + their incompatibility with OpenSSL 1.1.1's TLSv1.3 APIs.) Closes + ticket 40511. + + o Minor features (fallbackdir): + - Regenerate fallback directories generated on December 15, 2021. + + o Minor features (geoip data): + - Update the geoip files to match the IPFire Location Database, as + retrieved on 2021/12/15. + + o Minor bugfixes (compilation): + - Fix our configuration logic to detect whether we had OpenSSL 3: + previously, our logic was reversed. This has no other effect than + to change whether we suppress deprecated API warnings. Fixes bug + 40429; bugfix on 0.3.5.13. + + o Minor bugfixes (relay): + - Reject IPv6-only DirPorts. Our reachability self-test forces + DirPorts to be IPv4, but our configuration parser allowed them to + be IPv6-only, which led to an assertion failure. Fixes bug 40494; + bugfix on 0.4.5.1-alpha. + + o Documentation (man, relay): + - Missing "OverloadStatistics" in tor.1 manpage. Fixes bug 40504; + bugfix on 0.4.6.1-alpha. + Changes in version 0.4.7.2-alpha - 2021-10-26 This second alpha release of the 0.4.7.x series adds two major diff --git a/ReleaseNotes b/ReleaseNotes index c5a297d3db..8757475080 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -2,28 +2,12 @@ This document summarizes new features and bugfixes in each stable release of Tor. If you want to see more detailed descriptions of the changes in each development snapshot, see the ChangeLog file. -Changes in version 0.4.7.3-alpha - 2021-12-15 - This third alpha release of the 0.4.7.x series fixes several bugs including - two major ones affecting Bridges and Relays (see below). If you are running - an earlier 0.4.7.x version, you should upgrade to this version. - - o Major bugfixes (bridges): - - Make Tor work reliably again when you have multiple bridges - configured and one or more of them are unreachable. The problem - came because we require that we have bridge descriptors for both - of our first two bridges (else we refuse to try to connect), but - in some cases we would wait three hours before trying to fetch - these missing descriptors, and/or never recover when we do try to - fetch them. Fixes bugs 40396 and 40495; bugfix on 0.3.0.5-rc - and 0.3.2.1-alpha. +Changes in version 0.4.6.9 - 2021-12-15 + This version fixes several bugs from earlier versions of Tor. One important + piece is the removal of DNS timeout metric from the overload general signal. + See below for more details. o Major bugfixes (relay, overload): - - Change the MetricsPort DNS "timeout" label to be "tor_timeout" in - order to indicate that this was a DNS timeout from tor perspective - and not the DNS server itself. - - Deprecate overload_dns_timeout_period_secs and - overload_dns_timeout_scale_percent consensus parameters as well. - They were used to assess the overload state which is no more now. - Don't make Tor DNS timeout trigger an overload general state. These timeouts are different from DNS server timeout. They have to be seen as timeout related to UX and not because of a network @@ -48,64 +32,18 @@ Changes in version 0.4.7.3-alpha - 2021-12-15 - Update the geoip files to match the IPFire Location Database, as retrieved on 2021/12/15. - o Minor features (portability): - - Try to prevent a compiler warning about printf arguments that - could sometimes occur on MSYS2 depending on the configuration. - Closes ticket 40355. - - o Minor bugfix (pluggable transport): - - Do not kill a managed proxy if one of its transport configurations - emits a method error. Instead log a warning and continue processing - method arguments. Fixes bug 7362; bugfix on 0.2.3.6-alpha. - - o Minor bugfixes (bridges): - - When we don't yet have a descriptor for one of our bridges, - disable the entry guard retry schedule on that bridge. The entry - guard retry schedule and the bridge descriptor retry schedule can - conflict, e.g. where we mark a bridge as "maybe up" yet we don't - try to fetch its descriptor yet, leading Tor to wait (refusing to - do anything) until it becomes time to fetch the descriptor. Fixes - bug 40497; bugfix on 0.3.0.3-alpha. - o Minor bugfixes (compilation): - Fix our configuration logic to detect whether we had OpenSSL 3: previously, our logic was reversed. This has no other effect than to change whether we suppress deprecated API warnings. Fixes bug 40429; bugfix on 0.3.5.13. - o Minor bugfixes (controller, path bias): - - When a circuit's path is specified, in full or in part, from the - controller API, do not count that circuit towards our path-bias - calculations. (Doing so was incorrect, since we cannot tell - whether the controller is selecting relays randomly.) Resolves a - "Bug" warning. Fixes bug 40515; bugfix on 0.2.4.10-alpha. - - o Minor bugfixes (logging): - - When we no longer have enough directory information to use the - network, we would log a notice-level message -- but we would not - reliably log a message when we recovered and resumed using the - network. Now make sure there is always a corresponding message - about recovering. Fixes bug 40496; bugfix on 0.3.5.1-alpha. - - o Minor bugfixes (performance, DoS): - - Fix one case of a not-especially viable denial-of-service attack - found by OSS-Fuzz in our consensus-diff parsing code. This attack - causes a lot small of memory allocations and then immediately - frees them: this is only slow when running with all the sanitizers - enabled. Fixes one case of bug 40472; bugfix on 0.3.1.1-alpha. - o Minor bugfixes (relay): - Reject IPv6-only DirPorts. Our reachability self-test forces DirPorts to be IPv4, but our configuration parser allowed them to be IPv6-only, which led to an assertion failure. Fixes bug 40494; bugfix on 0.4.5.1-alpha. - o Minor bugfixes (sandbox): - - Fix the sandbox on i386 by modifying it to allow the - "clock_gettime64" and "statx" system calls and to filter the - "chown32" and "stat64" system calls in place of "chown" and - "stat", respectively. Fixes bug 40505; bugfix on 0.2.5.4-alpha. - o Documentation (man, relay): - Missing "OverloadStatistics" in tor.1 manpage. Fixes bug 40504; bugfix on 0.4.6.1-alpha.

1 0

[tor/main] Merge branch 'maint-0.4.6'
by dgoulet＠torproject.org 16 Dec '21

16 Dec '21

commit ecffdb0b1745d00988e525a5d3c6bde28e7fe22f Merge: 51c7a08485 00d7337002 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Dec 16 12:22:44 2021 -0500 Merge branch 'maint-0.4.6'

1 0

[tor/release-0.4.6] changelog: Fix release notes leftover from CI
by dgoulet＠torproject.org 16 Dec '21

16 Dec '21

commit c4efc42b5cf4c1b8003ea28ef5932424262816bb Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Dec 16 11:06:02 2021 -0500 changelog: Fix release notes leftover from CI Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- ReleaseNotes | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ReleaseNotes b/ReleaseNotes index fa2d57e194..15d2bef03c 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -2,9 +2,11 @@ This document summarizes new features and bugfixes in each stable release of Tor. If you want to see more detailed descriptions of the changes in each development snapshot, see the ChangeLog file. -INSERT SUMMARY BLURP - Changes in version 0.4.6.9 - 2021-12-15 + This version fixes several bugs from earlier versions of Tor. One important + piece is the removal of DNS timeout metric from the overload general signal. + See below for more details. + o Major bugfixes (relay, overload): - Don't make Tor DNS timeout trigger an overload general state. These timeouts are different from DNS server timeout. They have to

1 0

[tor/main] doc: One more poings in ReleasingTor.md
by dgoulet＠torproject.org 16 Dec '21

16 Dec '21

commit 51c7a08485e3fff3b0f324915300d12b17fe6640 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Dec 16 12:22:15 2021 -0500 doc: One more poings in ReleasingTor.md Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- doc/HACKING/ReleasingTor.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/HACKING/ReleasingTor.md b/doc/HACKING/ReleasingTor.md index dce44eaf61..86feef754e 100644 --- a/doc/HACKING/ReleasingTor.md +++ b/doc/HACKING/ReleasingTor.md @@ -112,6 +112,10 @@ do the following: If possible, mention in which Tor Browser version (with dates) the release will be in. This usually only applies to the latest stable. + 4. Inform `tor-talk(a)lists.torproject.org` with the releasing pointing to + the Forum. Append the ChangeLog there. We do this until we can automate + such post from the forum directly. + ### New Stable 1. Create the `maint-x.y.z` and `release-x.y.z` branches and update the

1 0

[tor/maint-0.4.6] version: Bump version to 0.4.6.9-dev
by dgoulet＠torproject.org 16 Dec '21

16 Dec '21

commit 00d7337002985edd2e15982e33fdd19001dc181c Author: Tor CI Release <no-email(a)torproject.org> Date: Thu Dec 16 15:01:28 2021 +0000 version: Bump version to 0.4.6.9-dev --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 303b70872f..8d77635d99 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.4.6.9]) +AC_INIT([tor],[0.4.6.9-dev])) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -18,7 +18,7 @@ AC_DEFINE_UNQUOTED([CONFIG_FLAGS], ["$configure_flags"], [Flags passed to config # version number changes. Tor uses it to make sure that it # only shuts down for missing "required protocols" when those protocols # are listed as required by a consensus after this date. -AC_DEFINE(APPROX_RELEASE_DATE, ["2021-12-15"], # for 0.4.6.9 +AC_DEFINE(APPROX_RELEASE_DATE, ["2021-12-16"], # for 0.4.6.9-dev [Approximate date when this software was released. (Updated when the version changes.)]) # "foreign" means we don't follow GNU package layout standards diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 804c780510..9ac9026223 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.4.6.9" +!define VERSION "0.4.6.9-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index e11894f9d9..141a603e2e 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -217,7 +217,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.4.6.9" +#define VERSION "0.4.6.9-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/release-0.4.6] version: Bump version to 0.4.6.9-dev
by dgoulet＠torproject.org 16 Dec '21

16 Dec '21

commit 00d7337002985edd2e15982e33fdd19001dc181c Author: Tor CI Release <no-email(a)torproject.org> Date: Thu Dec 16 15:01:28 2021 +0000 version: Bump version to 0.4.6.9-dev --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 303b70872f..8d77635d99 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.4.6.9]) +AC_INIT([tor],[0.4.6.9-dev])) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -18,7 +18,7 @@ AC_DEFINE_UNQUOTED([CONFIG_FLAGS], ["$configure_flags"], [Flags passed to config # version number changes. Tor uses it to make sure that it # only shuts down for missing "required protocols" when those protocols # are listed as required by a consensus after this date. -AC_DEFINE(APPROX_RELEASE_DATE, ["2021-12-15"], # for 0.4.6.9 +AC_DEFINE(APPROX_RELEASE_DATE, ["2021-12-16"], # for 0.4.6.9-dev [Approximate date when this software was released. (Updated when the version changes.)]) # "foreign" means we don't follow GNU package layout standards diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 804c780510..9ac9026223 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.4.6.9" +!define VERSION "0.4.6.9-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index e11894f9d9..141a603e2e 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -217,7 +217,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.4.6.9" +#define VERSION "0.4.6.9-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.6' into release-0.4.6
by dgoulet＠torproject.org 16 Dec '21

16 Dec '21

commit 88a3edb1c8161683d170029ab9f6e8ce9e2607e2 Merge: c4efc42b5c 00d7337002 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Dec 16 12:22:27 2021 -0500 Merge branch 'maint-0.4.6' into release-0.4.6 configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)

1 0

[tor-browser/tor-browser-91.4.1esr-11.0-1] Bug 1745715 - Process app-bundled fonts before system fonts when initializing the font list, to ensure their families get the expected Base visibility level. r=emilio
by gk＠torproject.org 16 Dec '21

16 Dec '21

commit 093426b4b7e2ac89cfc7cd1cabd404bee953f32b Author: Jonathan Kew <jkew(a)mozilla.com> Date: Mon Dec 13 20:09:36 2021 +0000 Bug 1745715 - Process app-bundled fonts before system fonts when initializing the font list, to ensure their families get the expected Base visibility level. r=emilio Differential Revision: https://phabricator.services.mozilla.com/D133667 --- gfx/thebes/gfxFcPlatformFontList.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gfx/thebes/gfxFcPlatformFontList.cpp b/gfx/thebes/gfxFcPlatformFontList.cpp index 41a305c537c4..3b6029bd4353 100644 --- a/gfx/thebes/gfxFcPlatformFontList.cpp +++ b/gfx/thebes/gfxFcPlatformFontList.cpp @@ -1524,17 +1524,21 @@ nsresult gfxFcPlatformFontList::InitFontListForPlatform() { } #endif - // iterate over available fonts - FcFontSet* systemFonts = FcConfigGetFonts(nullptr, FcSetSystem); - AddFontSetFamilies(systemFonts, policy.get(), /* aAppFonts = */ false); - #ifdef MOZ_BUNDLED_FONTS + // https://bugzilla.mozilla.org/show_bug.cgi?id=1745715: + // It's important to do this *before* processing the standard system fonts, + // so that if a family is present in both font sets, we'll treat it as app- + // bundled and therefore always visible. if (StaticPrefs::gfx_bundled_fonts_activate_AtStartup() != 0) { FcFontSet* appFonts = FcConfigGetFonts(nullptr, FcSetApplication); AddFontSetFamilies(appFonts, policy.get(), /* aAppFonts = */ true); } #endif + // iterate over available fonts + FcFontSet* systemFonts = FcConfigGetFonts(nullptr, FcSetSystem); + AddFontSetFamilies(systemFonts, policy.get(), /* aAppFonts = */ false); + return NS_OK; }

1 0