[tor-commits] [tor] 02/05: Merge branch 'maint-0.4.5' into maint-0.4.6

[gitolite role]

This is an automated email from the git hooks/post-receive script.

dgoulet pushed a commit to branch main
in repository tor.

commit 9e8f76d4304ae4b66eb5592efd7edc7494747013
Merge: e465f511a5 362839a77d
Author: David Goulet <dgoulet at torproject.org>
AuthorDate: Wed Aug 10 13:59:20 2022 -0400

    Merge branch 'maint-0.4.5' into maint-0.4.6

 src/app/config/fallback_dirs.inc | 996 ++++++++++++++++++++-------------------
 1 file changed, 500 insertions(+), 496 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.