commit 7b09282dc723381e68fef79c3474a56315a0edfa Merge: 33cba1195 f4ad30448 Author: David Goulet dgoulet@torproject.org Date: Thu Apr 26 11:38:15 2018 -0400

Merge remote-tracking branch 'dgoulet/ticket25515_034_01-squashed'

src/test/geoip_dummy | 0 src/test/test_geoip.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+)