[tor-commits] [tor/master] Merge remote-tracking branch 'public/geoip_testing'

[nickm at torproject.org]

commit d9ba7db38b328eddeb8a7bb5918ac565994b1f7b
Merge: f8e53a545 becae4c94
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 22 08:43:28 2018 -0400

    Merge remote-tracking branch 'public/geoip_testing'

 configure.ac          |   6 +
 src/or/geoip.c        |   3 +
 src/test/include.am   |   1 +
 src/test/test.c       | 375 +----------------------------------------
 src/test/test.h       |   1 +
 src/test/test_geoip.c | 455 ++++++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 467 insertions(+), 374 deletions(-)