[tor-commits] [tor] 01/03: Merge branch 'maint-0.4.7' into release-0.4.7

[gitolite role]

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

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

commit 90ec6a8d67d6d06efaa62f6ff6721b474f9d03cd
Merge: 56542dc07b d889eba875
Author: David Goulet <dgoulet at torproject.org>
AuthorDate: Tue Dec 6 10:10:41 2022 -0500

    Merge branch 'maint-0.4.7' into release-0.4.7

 changes/fallbackdirs-2022-12-06  |    2 +
 changes/geoip-2022-12-06         |    3 +
 src/app/config/fallback_dirs.inc |  972 +++---
 src/config/geoip                 | 5870 +++++++++++++++++++-----------------
 src/config/geoip6                | 6070 ++++++++++++++++++++++++++++----------
 5 files changed, 8250 insertions(+), 4667 deletions(-)

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