aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-06-05 14:38:54 -0400
committerNick Mathewson <nickm@torproject.org>2017-06-05 14:38:54 -0400
commit2e5220cb8b34b614fa10102899841247e906fb7b (patch)
tree4f2b1cdb90725c2d76bd0905dc789686fa9abbde
parent1a540b579248c04eba79c3e18d022054b238f6f5 (diff)
parent4ee48cb434c46d9e4c477dabd8a97f03e3db221d (diff)
downloadtor-2e5220cb8b34b614fa10102899841247e906fb7b.tar.gz
tor-2e5220cb8b34b614fa10102899841247e906fb7b.zip
Merge branch 'maint-0.2.4' into maint-0.2.5
-rw-r--r--src/or/geoip.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/geoip.c b/src/or/geoip.c
index dbbeca030b..68db5b9580 100644
--- a/src/or/geoip.c
+++ b/src/or/geoip.c
@@ -126,6 +126,7 @@ geoip_parse_entry(const char *line, sa_family_t family)
tor_addr_t low_addr, high_addr;
char c[3];
char *country = NULL;
+ char buf[512];
if (!geoip_countries)
init_geoip_countries();
@@ -145,7 +146,6 @@ geoip_parse_entry(const char *line, sa_family_t family)
if (*line == '#')
return 0;
- char buf[512];
if (family == AF_INET) {
unsigned int low, high;
if (tor_sscanf(line,"%u,%u,%2s", &low, &high, c) == 3 ||