[tor-commits] [tor] 04/08: Merge branch 'maint-0.4.7'

[gitolite role via tor-commits <tor-commits@xxxxxxxxxxxxxxxxxxxx>]

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

dgoulet pushed a commit to branch main
in repository tor.

commit d9821bdea5c3a809c158c6a8c02036fb18d76a11
Merge: 610b791aa6 64cebf4e1b
Author: David Goulet <dgoulet@xxxxxxxxxxxxxx>
AuthorDate: Thu Jan 12 11:07:40 2023 -0500

    Merge branch 'maint-0.4.7'

 changes/fallbackdirs-2023-01-12  |     2 +
 changes/geoip-2023-01-12         |     3 +
 src/app/config/fallback_dirs.inc |   988 ++--
 src/config/geoip                 |  7578 +++++++++++++------------
 src/config/geoip6                | 11283 ++++++++++++++++++++++---------------
 5 files changed, 11242 insertions(+), 8612 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