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

[gitolite role]

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

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

commit 156cde02c6daf347d7beeb3782b1d28ede7c1275
Merge: 487c47d556 e465f511a5
Author: David Goulet <dgoulet at torproject.org>
AuthorDate: Wed Aug 10 13:41:25 2022 -0400

    Merge branch 'maint-0.4.6' into release-0.4.6

 src/config/geoip  | 18774 ++++++++++++++++++++++++++++++++--------------------
 src/config/geoip6 |  9466 ++++++++++++++++----------
 2 files changed, 17835 insertions(+), 10405 deletions(-)

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