nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 14:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'origin/maint-0.2.2'

Browse Source 
Conflicts:
	src/or/geoip.c
This commit is contained in:
Nick Mathewson 2011-01-25 15:58:01 -05:00
commit 991b50c5a3
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug2432 Normal file
View File

@ -0,0 +1,5 @@
o Minor features:
- Provide a log message stating which geoip file we're parsing
instead of just stating that we're parsing the geoip file.
Implements ticket 2432.

2
src/or/geoip.c
View File

@ -219,7 +219,7 @@ geoip_load_file(const char *filename, or_options_t *options)
}
geoip_entries = smartlist_create();
geoip_digest_env = crypto_new_digest_env();
log_notice(LD_GENERAL, "Parsing GEOIP file.");
log_notice(LD_GENERAL, "Parsing GEOIP file %s.", filename);
while (!feof(f)) {
char buf[512];
if (fgets(buf, (int)sizeof(buf), f) == NULL)