summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/bug19643
-rw-r--r--src/or/geoip.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/changes/bug1964 b/changes/bug1964
new file mode 100644
index 0000000000..d100094eba
--- /dev/null
+++ b/changes/bug1964
@@ -0,0 +1,3 @@
+ o Major bugfixes:
+ - Fix a segfault that can happen when using bridges. Fixes bug 1964;
+ bugfix on 0.2.2.15-alpha.
diff --git a/src/or/geoip.c b/src/or/geoip.c
index 7f1052e98d..ee8d72ee1d 100644
--- a/src/or/geoip.c
+++ b/src/or/geoip.c
@@ -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);
}