[tor-commits] [tor] 01/05: Merge branch 'maint-0.4.6' into release-0.4.6

[gitolite role]

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

dgoulet pushed a commit to branch release-0.4.6
in repository tor.

commit fb84f070ebd14109fd09a647227e48051b69308a
Merge: 3932788368 c65d8b2aad
Author: David Goulet <dgoulet at torproject.org>
AuthorDate: Thu Aug 11 09:44:47 2022 -0400

    Merge branch 'maint-0.4.6' into release-0.4.6

 changes/fallbackdirs-2022-08-11  |     2 +
 changes/geoip-2022-08-11         |     3 +
 src/app/config/fallback_dirs.inc |   987 +-
 src/config/geoip                 | 55637 +++++++++++++++++++++++++------------
 src/config/geoip6                | 18884 ++++++-------
 5 files changed, 47346 insertions(+), 28167 deletions(-)

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