[tor-commits] [tor] 02/06: 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 042fece49e9a33dd00a9d7df1ff68eecd27409f2
Merge: 9a117c4c97 c4ff6a4f55
Author: David Goulet <dgoulet at torproject.org>
AuthorDate: Fri Aug 12 09:56:54 2022 -0400

    Merge branch 'maint-0.4.7' into release-0.4.7

 changes/geoip-2022-08-12 |     5 +
 src/config/geoip         | 46473 ++++++++++++++-------------------------------
 src/config/geoip6        | 15581 ++++++++-------
 3 files changed, 22622 insertions(+), 39437 deletions(-)

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