[tor-commits] [tor] 03/05: Merge branch 'maint-0.4.7'

[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 e14c4fe771404fde720d04ea688cfb8a09813084
Merge: b5afc7d62a 58bd4e0899
Author: David Goulet <dgoulet at torproject.org>
AuthorDate: Thu Nov 10 09:44:52 2022 -0500

    Merge branch 'maint-0.4.7'

 changes/fallbackdirs-2022-11-10  |     2 +
 changes/geoip-2022-11-10         |     3 +
 src/app/config/fallback_dirs.inc |   971 ++-
 src/config/geoip                 | 14896 ++++++++++++++++++++++---------------
 src/config/geoip6                |  9140 +++++++++++++++--------
 5 files changed, 15361 insertions(+), 9651 deletions(-)

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