sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'maint-0.2.4' into release-0.2.4

This commit is contained in:
Nick Mathewson 2017-06-05 14:38:48 -04:00
parent df23e280c4 4ee48cb434
commit 98f610068f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/or/geoip.c
View File

@ -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 ||