diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-09-27 17:26:32 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-09-27 17:26:32 -0400 |
| commit | 614eeb378be4ef23d3e8c1e1bef146ef5c1819b0 (patch) | |
| tree | afdf2e2ee3c7f9381a40ebe6ace78508628edcb2 | |
| parent | 7c83b0a2a2b36a2ae2296f826ec53e5f7cd29a97 (diff) | |
| parent | c951830002706719fd98f87dabd82437f3f392ac (diff) | |
| download | tor-614eeb378be4ef23d3e8c1e1bef146ef5c1819b0.tar.gz tor-614eeb378be4ef23d3e8c1e1bef146ef5c1819b0.zip | |
Merge remote branch 'sebastian/bug1964' into maint-0.2.2
| -rw-r--r-- | changes/bug1964 | 3 | ||||
| -rw-r--r-- | src/or/geoip.c | 2 |
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); } |