tor

commit 2e5220cb8b34b614fa10102899841247e906fb7b
parent 1a540b579248c04eba79c3e18d022054b238f6f5
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon,  5 Jun 2017 14:38:54 -0400

Merge branch 'maint-0.2.4' into maint-0.2.5

Diffstat:
M
src/or/geoip.c
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git 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 ||