Commit 614eeb37 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge remote branch 'sebastian/bug1964' into maint-0.2.2

parents 7c83b0a2 c9518300

changes/bug1964

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  o Major bugfixes:

    - Fix a segfault that can happen when using bridges. Fixes bug 1964;

      bugfix on 0.2.2.15-alpha.

src/or/geoip.c

+2 −0
Original line number Diff line number Diff line
@@ -254,6 +254,8 @@ geoip_get_country_by_ip(uint32_t ipaddr) 
int

geoip_get_n_countries(void)

{

  if (!geoip_countries)

    init_geoip_countries();

  return (int) smartlist_len(geoip_countries);

}