diff options
author | Nick Mathewson <nickm@torproject.org> | 2017-06-05 14:39:00 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2017-06-05 14:39:00 -0400 |
commit | 020c003a636a876a1b86295592e8782ab93df5a3 (patch) | |
tree | d4a88eb33eccb3eb939bef4dbcf70d38fb9b3bf2 | |
parent | b104ea724dedebe49db299474abfd950ca0da0cb (diff) | |
parent | 2e5220cb8b34b614fa10102899841247e906fb7b (diff) | |
download | tor-020c003a636a876a1b86295592e8782ab93df5a3.tar.gz tor-020c003a636a876a1b86295592e8782ab93df5a3.zip |
Merge branch 'maint-0.2.5' into release-0.2.5
-rw-r--r-- | src/or/geoip.c | 2 |
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 || |