[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/ticket24902_029_05'

[nickm at torproject.org]

commit b5a8fd1566e137f27c49d132755d2ad9e5c74f4e
Merge: f0d7905bc f08fa9746
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Feb 5 14:00:50 2018 -0500

    Merge remote-tracking branch 'dgoulet/ticket24902_029_05'

 src/or/geoip.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)