[tor-commits] [tor] 03/13: Merge branch 'maint-0.4.6' into maint-0.4.7

[gitolite role <git@xxxxxxxxxxxxxxxxxxxxx>]

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

dgoulet pushed a commit to branch main
in repository tor.

commit c4ff6a4f55639ae4c4ad7c481858c1116cca4e2e
Merge: 1506eca5aa 8244eefcd3
Author: David Goulet <dgoulet@xxxxxxxxxxxxxx>
AuthorDate: Fri Aug 12 09:56:54 2022 -0400

    Merge branch 'maint-0.4.6' into maint-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.
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits