August 2020 - tor-commits - lists.torproject.org

[tor/release-0.4.2] Fix allocation counting in clean_v2_descs_as_dir test.
by nickm＠torproject.org 13 Aug '20

13 Aug '20

commit f9bb49d870045fa6e1a2570a65f0583066d8359d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 12 14:25:46 2020 -0400 Fix allocation counting in clean_v2_descs_as_dir test. Without this fix, running this test on its own would fail. Fixes bug 40099. Bugfix on ade5005853c17b3 in 0.2.8.1-alpha. --- changes/bug40099 | 4 ++++ src/test/test_rendcache.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug40099 b/changes/bug40099 new file mode 100644 index 0000000000..278ede2023 --- /dev/null +++ b/changes/bug40099 @@ -0,0 +1,4 @@ + o Minor bugfixes (tests): + - Fix the behavior of the rend_cache/clean_v2_descs_as_dir when run on + its own. Previously, it would exit with an error. + Fixes bug 40099; bugfix on 0.2.8.1-alpha. diff --git a/src/test/test_rendcache.c b/src/test/test_rendcache.c index 4f544cf21c..93f9f82953 100644 --- a/src/test/test_rendcache.c +++ b/src/test/test_rendcache.c @@ -1101,6 +1101,7 @@ test_rend_cache_clean_v2_descs_as_dir(void *data) desc->timestamp = now; desc->pk = pk_generate(0); e->parsed = desc; + rend_cache_increment_allocation(rend_cache_entry_allocation(e)); digestmap_set(rend_cache_v2_dir, key, e); /* Set the cutoff to minus 10 seconds. */ @@ -1250,4 +1251,3 @@ struct testcase_t rend_cache_tests[] = { test_rend_cache_validate_intro_point_failure, 0, NULL, NULL }, END_OF_TESTCASES }; -

1 0

[tor/release-0.4.4] Fix allocation counting in clean_v2_descs_as_dir test.
by nickm＠torproject.org 13 Aug '20

13 Aug '20

commit f9bb49d870045fa6e1a2570a65f0583066d8359d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 12 14:25:46 2020 -0400 Fix allocation counting in clean_v2_descs_as_dir test. Without this fix, running this test on its own would fail. Fixes bug 40099. Bugfix on ade5005853c17b3 in 0.2.8.1-alpha. --- changes/bug40099 | 4 ++++ src/test/test_rendcache.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug40099 b/changes/bug40099 new file mode 100644 index 0000000000..278ede2023 --- /dev/null +++ b/changes/bug40099 @@ -0,0 +1,4 @@ + o Minor bugfixes (tests): + - Fix the behavior of the rend_cache/clean_v2_descs_as_dir when run on + its own. Previously, it would exit with an error. + Fixes bug 40099; bugfix on 0.2.8.1-alpha. diff --git a/src/test/test_rendcache.c b/src/test/test_rendcache.c index 4f544cf21c..93f9f82953 100644 --- a/src/test/test_rendcache.c +++ b/src/test/test_rendcache.c @@ -1101,6 +1101,7 @@ test_rend_cache_clean_v2_descs_as_dir(void *data) desc->timestamp = now; desc->pk = pk_generate(0); e->parsed = desc; + rend_cache_increment_allocation(rend_cache_entry_allocation(e)); digestmap_set(rend_cache_v2_dir, key, e); /* Set the cutoff to minus 10 seconds. */ @@ -1250,4 +1251,3 @@ struct testcase_t rend_cache_tests[] = { test_rend_cache_validate_intro_point_failure, 0, NULL, NULL }, END_OF_TESTCASES }; -

1 0

[tor/release-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
by nickm＠torproject.org 13 Aug '20

13 Aug '20

commit 7915b651d9e926d829d2241a161c7afdaf0e7ffb Merge: 34919368ce 45d9830493 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 13 14:20:39 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 changes/bug40099 | 4 ++++ src/test/test_rendcache.c | 1 + 2 files changed, 5 insertions(+)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 13 Aug '20

13 Aug '20

commit 5a09bde8e3afa8ea2e94c2a93f178e62ad1ae03d Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 13 18:18:09 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ar.po | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/contents+ar.po b/contents+ar.po index 331f1521d6..4b132d1398 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -8914,6 +8914,8 @@ msgid "" "These services use the special-use top level domain (TLD) .onion (instead of" " .com, .net, .org, etc..) and are only accessible through the Tor network." msgstr "" +"تستخدم هذه الخدمات نطاق المستوى الأعلى (TLD) .onion للاستخدام الخاص (بدلاً " +"من .com ، .net ، .org ، إلخ ..) ولا يمكن الوصول إليها إلا من خلال شبكة Tor." #: https//support.torproject.org/onionservices/onionservices-2/ #: (content/onionservices/onionservices-2/contents+en.lrquestion.description) @@ -8922,11 +8924,13 @@ msgid "" "at the URL bar an icon of a little green onion displaying the state of your " "connection: secure and using an onion service." msgstr "" +"عند الوصول إلى موقع ويب يستخدم خدمة البصلة ، سيعرض متصفح Tor على شريط عنوان " +"URL رمز بصلة خضراء صغيرة تعرض حالة اتصالك: آمن ويستخدم خدمة البصل." #: https//support.torproject.org/onionservices/onionservices-2/ #: (content/onionservices/onionservices-2/contents+en.lrquestion.description) msgid "![Onion icon](/static/images/onion-website.png)" -msgstr "" +msgstr "![Onion icon](/static/images/onion-website.png)" #: https//support.torproject.org/onionservices/onionservices-2/ #: (content/onionservices/onionservices-2/contents+en.lrquestion.description) @@ -8934,11 +8938,13 @@ msgid "" "And if you're accessing a website with HTTPS and onion service, it will show" " an icon of a green onion and a padlock." msgstr "" +"وإذا كنت تصل إلى موقع ويب باستخدام HTTPS وخدمة onion ، فسيظهر رمز بصلة خضراء" +" وقفل." #: https//support.torproject.org/onionservices/onionservices-2/ #: (content/onionservices/onionservices-2/contents+en.lrquestion.description) msgid "![Green onion with a padlock](/static/images/padlock-onion.png)" -msgstr "" +msgstr "! [بصلة خضراء بقفل] (/ static / images / padlock-onion.png)" #: https//support.torproject.org/onionservices/onionservices-3/ #: (content/onionservices/onionservices-3/contents+en.lrquestion.title) @@ -8953,6 +8959,9 @@ msgid "" "correctly: even a small mistake will stop Tor Browser from being able to " "reach the site." msgstr "" +"إذا لم تتمكن من الوصول إلى خدمة onion التي تريدها ، فتأكد من إدخال عنوان " +"onion المكون من 16 حرفًا أو أحدث تنسيق مؤلف من 56 حرفًا بشكل صحيح: حتى لو " +"حدث خطأ بسيط ، فسوف يمنع متصفح Tor من الوصول إلى الموقع." #: https//support.torproject.org/onionservices/onionservices-3/ #: (content/onionservices/onionservices-3/contents+en.lrquestion.description) @@ -8960,6 +8969,8 @@ msgid "" "If you are still unable to connect to the onion service, please try again " "later." msgstr "" +"إذا كنت لا تزال غير قادر على الاتصال بخدمة onion ، يرجى المحاولة مرة أخرى " +"لاحقًا." #: https//support.torproject.org/onionservices/onionservices-3/ #: (content/onionservices/onionservices-3/contents+en.lrquestion.description) @@ -8976,6 +8987,8 @@ msgid "" "You can also ensure that you're able to access other onion services by " "connecting to [DuckDuckGo's onion service](http://3g2upl4pq6kufc4m.onion)." msgstr "" +"يمكنك أيضًا التأكد من قدرتك على الوصول إلى خدمات onion الأخرى عن طريق " +"الاتصال بـ [خدمة onion DuckDuckGo] (http://3g2upl4pq6kufc4m.onion)" #: https//support.torproject.org/onionservices/onionservices-4/ #: (content/onionservices/onionservices-4/contents+en.lrquestion.title)

1 0

[tor-browser-build/master] Bug 34359: Adapt abicheck.cc to deal with newer GCC version
by sysrqb＠torproject.org 13 Aug '20

13 Aug '20

commit 756b3f0a6f3dd6b0a6ce262528f027f79b1e3c07 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Aug 12 08:32:50 2020 +0000 Bug 34359: Adapt abicheck.cc to deal with newer GCC version ESR 78 compiled with GCC 9.3.0 requires GLIBCXX_3.4.28. --- projects/firefox/abicheck.cc | 29 +++++++++++++++-------------- projects/firefox/build | 2 +- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/projects/firefox/abicheck.cc b/projects/firefox/abicheck.cc index ba5f858..53d1dcc 100644 --- a/projects/firefox/abicheck.cc +++ b/projects/firefox/abicheck.cc @@ -1,23 +1,24 @@ /* - * Bug 25485: Browser/TorBrowser/Tor/libstdc++.so.6: version `CXXABI_1.3.11' not found - * Bug 31646: Update abicheck to require newer libstdc++.so.6 + * Bug 34359: Update abicheck to require newer libstdc++.so.6 * This program is useful in determining if the libstdc++.so.6 installed - * on the system is recent enough. Specifically this program requires - * `GLIBCXX_3.4.25` which should be provided by libstdc++.so.6 from - * gcc >= 8.0.0. If the program executes successfully, that means we + * on the system is recent enough. Specifically, this program requires + * `GLIBCXX_3.4.28` which should be provided by libstdc++.so.6 from + * gcc >= 9.3.0. If the program executes successfully, that means we * should use the system version of libstdc++.so.6 and if not, that means * we should use the bundled version. * - * We use std::random_device::entropy() in order to require GLIBCXX_3.4.25: - * https://github.com/gcc-mirror/gcc/blob/gcc-8_3_0-release/libstdc%2B%2B-v3/c… + * We use std::pmr::monotonic_buffer_resource in order to require + * GLIBCXX_3.4.28: + * https://github.com/gcc-mirror/gcc/blob/9e4ebad20a064d10df451cfb2cea9853d339… + * The example below got inspired by + * https://www.mail-archive.com/gcc-patches@gcc.gnu.org/msg227964.html. */ -#include <iostream> -#include <random> +#include <memory_resource> -int main() -{ - std::random_device rd; - std::cout << "entropy: " << rd.entropy() << std::endl; - return 0; +int main () { + std::pmr::monotonic_buffer_resource res; + void* a = res.allocate(1); + res.release(); + return 0; } diff --git a/projects/firefox/build b/projects/firefox/build index 5ddd4de..ea03088 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -277,7 +277,7 @@ END; %] [% IF c("var/linux") %] - /var/tmp/dist/gcc/bin/g++ $rootdir/abicheck.cc -o Browser/abicheck + /var/tmp/dist/gcc/bin/g++ $rootdir/abicheck.cc -o Browser/abicheck -std=c++17 [% END %] [% c('tar', {

1 0

[tor/master] Update ReleasingTor.md to current practice
by nickm＠torproject.org 13 Aug '20

13 Aug '20

commit e82f36bccc5b3bc47c3a33d357092cf21b967a5e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 13 09:56:27 2020 -0400 Update ReleasingTor.md to current practice --- doc/HACKING/ReleasingTor.md | 79 +++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 49 deletions(-) diff --git a/doc/HACKING/ReleasingTor.md b/doc/HACKING/ReleasingTor.md index d9b8d9d823..6513583ec5 100644 --- a/doc/HACKING/ReleasingTor.md +++ b/doc/HACKING/ReleasingTor.md @@ -9,8 +9,20 @@ new Tor release: version number in their approved versions list. Give them a few days to do this if you can. -2. If this is going to be an important security release, give the packagers - some advance warning: See this list of packagers in IV.3 below. +2. If this is going to be an important security release, give these packagers + some advance warning: + + - {weasel,sysrqb,mikeperry} at torproject dot org + - {blueness} at gentoo dot org + - {paul} at invizbox dot io + - {vincent} at invizbox dot com + - {lfleischer} at archlinux dot org + - {Nathan} at freitas dot net + - {mike} at tig dot as + - {tails-rm} at boum dot org + - {simon} at sdeziel.info + - {yuri} at freebsd.org + - {mh+tor} at scrit.ch 3. Given the release date for Tor, ask the TB team about the likely release date of a TB that contains it. See note below in "commit, upload, @@ -36,19 +48,6 @@ new Tor release: * On OSS-Fuzz -3. Run checks that aren't covered above, including: - - * `clang scan-build`. (See the script in ./scripts/test/scan_build.sh) - - * `make test-network` and make `test-network-all` (with - --enable-fragile-hardening) - - * Running Tor yourself and making sure that it actually works for you. - - * Running Tor under valgrind. (Our 'fragile hardening' doesn't cover - libevent and openssl, so using valgrind will sometimes find extra - memory leaks.) - ## II. Write a changelog 1a. (Alpha release variant) @@ -57,10 +56,12 @@ new Tor release: of them and reordering to focus on what users and funders would find interesting and understandable. - To do this, run `./scripts/maint/sortChanges.py changes/* > changelog.inx` - to combine headings and sort the entries. Copy the changelog.in file - into the ChangeLog. Run 'format_changelog.py' (see below) to clean - up the line breaks. + To do this, run `./scripts/maint/sortChanges.py changes/* > changelog.in` + to combine headings and sort the entries. Copy the changelog.in file into + the ChangeLog. Run `format_changelog.py --inplace` (see below) to clean up + the line breaks. + + Remove the `changes/*` files that you just merged into the ChangeLog. After that, it's time to hand-edit and fix the issues that lintChanges can't find: @@ -140,10 +141,11 @@ new Tor release: places, and commit. Then merge `maint-0.?.x` into `release-0.?.x`. When you merge the maint branch forward to the next maint branch, or into - master, merge it with "-s ours" to avoid a needless version bump. + master, merge it with "-s ours" to avoid conflict with the version + bump. 2. Make distcheck, put the tarball up in somewhere (how about your - homedir on your homedir on people.torproject.org?) , and tell `#tor-dev` + homedir on people.torproject.org?) , and tell `#tor-dev` about it. If you want, wait until at least one person has built it @@ -151,7 +153,6 @@ new Tor release: CI has successfully caught these kinds of errors for the last several years.) - 3. Make sure that the new version is recommended in the latest consensus. (Otherwise, users will get confused when it complains to them about its status.) @@ -179,7 +180,6 @@ $ git push origin tag tor-0.4.x.y-<status> `/srv/dist-master.torproject.org/htdocs/` on dist-master. Run "static-update-component dist.torproject.org" on dist-master. - In the webwml.git repository, `include/versions.wmi` and `Makefile`. In the project/web/tpo.git repository, update `databags/versions.ini` to note the new version. Push these changes to master. @@ -190,20 +190,8 @@ $ git push origin tag tor-0.4.x.y-<status> (NOTE: It will take a while for the website update scripts to update the website.) -3. Email the packagers (cc'ing tor-team) that a new tarball is up. - The current list of packagers is: - - - {weasel,sysrqb,mikeperry} at torproject dot org - - {blueness} at gentoo dot org - - {paul} at invizbox dot io - - {vincent} at invizbox dot com - - {lfleischer} at archlinux dot org - - {Nathan} at freitas dot net - - {mike} at tig dot as - - {tails-rm} at boum dot org - - {simon} at sdeziel.info - - {yuri} at freebsd.org - - {mh+tor} at scrit.ch +3. Email the tor-packagers(a)lists.torproject.org mailing list to tell them + about the new release. Also, email tor-packagers(a)lists.torproject.org. @@ -211,22 +199,15 @@ $ git push origin tag tor-0.4.x.y-<status> Include a link to the changelog. -4. Add the version number to Trac. To do this, go to Trac, log in, - select "Admin" near the top of the screen, then select "Versions" from - the menu on the left. At the right, there will be an "Add version" - box. By convention, we enter the version in the form "Tor: - 0.4.0.1-alpha" (or whatever the version is), and we select the date as - the date in the ChangeLog. - -5. Wait for the download page to be updated. (If you don't do this before you +4. Wait for the download page to be updated. (If you don't do this before you announce, people will be confused.) -6. Mail the release blurb and ChangeLog to tor-talk (development release) or +5. Mail the release blurb and ChangeLog to tor-talk (development release) or tor-announce (stable). Post the changelog on the blog as well. You can generate a blog-formatted version of the changelog with - `./scripts/maint/format_changelog.py --B` + `./scripts/maint/format_changelog.py -B` When you post, include an estimate of when the next TorBrowser releases will come out that include this Tor release. This will @@ -239,8 +220,8 @@ $ git push origin tag tor-0.4.x.y-<status> ## V. Aftermath and cleanup 1. If it's a stable release, bump the version number in the - `maint-x.y.z` branch to "newversion-dev", and do a `merge -s ours` - merge to avoid taking that change into master. + `maint-x.y.z` branch to "newversion-dev", and do a `merge -s ours` + merge to avoid taking that change into master. 2. If there is a new `maint-x.y.z` branch, create a Travis CI cron job that builds the release every week. (It's ok to skip the weekly build if the

1 0

[tor/master] Bump to 0.4.4.4-rc-dev
by nickm＠torproject.org 13 Aug '20

13 Aug '20

commit 26b257757bf0e97da17c5e00ada166fdf2b68875 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 13 09:43:54 2020 -0400 Bump to 0.4.4.4-rc-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 5b3a40fa70..697a302bf3 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.4.4-rc]) +AC_INIT([tor],[0.4.4.4-rc-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -16,7 +16,7 @@ configure_flags="$*" # 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, ["2020-08-11"], # for 0.4.4.4-rc +AC_DEFINE(APPROX_RELEASE_DATE, ["2020-08-13"], # for 0.4.4.4-rc-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 f626c7c51c..2d7c54b7eb 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.4.4-rc" +!define VERSION "0.4.4.4-rc-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 bb8eb4c769..9957ad1abc 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.4.4-rc" +#define VERSION "0.4.4.4-rc-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4
by nickm＠torproject.org 13 Aug '20

13 Aug '20

commit a7cbbdbbdaba3195d658d21dd7ba41cb025250f3 Merge: 8bd79bd75e 26b257757b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 13 09:44:30 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 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/maint-0.4.4] Bump to 0.4.4.4-rc-dev
by nickm＠torproject.org 13 Aug '20

13 Aug '20

commit 26b257757bf0e97da17c5e00ada166fdf2b68875 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 13 09:43:54 2020 -0400 Bump to 0.4.4.4-rc-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 5b3a40fa70..697a302bf3 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.4.4-rc]) +AC_INIT([tor],[0.4.4.4-rc-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -16,7 +16,7 @@ configure_flags="$*" # 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, ["2020-08-11"], # for 0.4.4.4-rc +AC_DEFINE(APPROX_RELEASE_DATE, ["2020-08-13"], # for 0.4.4.4-rc-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 f626c7c51c..2d7c54b7eb 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.4.4-rc" +!define VERSION "0.4.4.4-rc-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 bb8eb4c769..9957ad1abc 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.4.4-rc" +#define VERSION "0.4.4.4-rc-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/master] Merge branch 'maint-0.4.4'
by nickm＠torproject.org 13 Aug '20

13 Aug '20

commit 0957a5adb2d87a3a57a84b40ca9ddacb3e5eb6bd Merge: 7b4716a762 26b257757b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 13 09:44:11 2020 -0400 Merge branch 'maint-0.4.4' "ours" to avoid version bump.

1 0