[tor-commits] [tor] 04/14: 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 9b4d3ed492bab1b7e5951633cbde440f76d3cd9f
Merge: 0564a19f6a c65d8b2aad
Author: David Goulet <dgoulet@xxxxxxxxxxxxxx>
AuthorDate: Thu Aug 11 09:44:47 2022 -0400

    Merge branch 'maint-0.4.6' into maint-0.4.7

 changes/fallbackdirs-2022-08-11  |     2 +
 changes/geoip-2022-08-11         |     3 +
 src/app/config/fallback_dirs.inc |   987 +-
 src/config/geoip                 | 55637 +++++++++++++++++++++++++------------
 src/config/geoip6                | 18884 ++++++-------
 5 files changed, 47346 insertions(+), 28167 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