aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-06-05 14:38:48 -0400
committerNick Mathewson <nickm@torproject.org>2017-06-05 14:38:48 -0400
commit98f610068f669cabbd2fde764c79e8c9d0481976 (patch)
treef937052b01492e1dd6086c4e476ce226ae97523b
parentdf23e280c4419762b3c800badd5992d84ee8797c (diff)
parent4ee48cb434c46d9e4c477dabd8a97f03e3db221d (diff)
downloadtor-98f610068f669cabbd2fde764c79e8c9d0481976.tar.gz
tor-98f610068f669cabbd2fde764c79e8c9d0481976.zip
Merge branch 'maint-0.2.4' into release-0.2.4
-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 4abd5191f4..2db64c9665 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 ||