[tor-commits] [tor] 06/08: Merge branch 'tor-gitlab/mr/562'

[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 2a4663fee839b454b971e6cc9a3c24528a74b5ff
Merge: faced20ddf 851f551dd7
Author: David Goulet <dgoulet@xxxxxxxxxxxxxx>
AuthorDate: Mon May 16 08:43:42 2022 -0400

    Merge branch 'tor-gitlab/mr/562'

 src/feature/control/getinfo_geoip.c | 5 +----
 src/lib/geoip/geoip.c               | 4 ++--
 src/lib/geoip/geoip.h               | 6 +++---
 3 files changed, 6 insertions(+), 9 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