Commit 2e5220cb authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge branch 'maint-0.2.4' into maint-0.2.5

parents 1a540b57 4ee48cb4

src/or/geoip.c

+1 −1
Original line number Diff line number Diff line
@@ -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 ||