diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-01-25 15:58:01 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-01-25 15:58:01 -0500 |
| commit | 991b50c5a321070f9c61653c9509ffbf251b6410 (patch) | |
| tree | eeb381b6d7bdd278b38fa0077f4f18610dce8daa /src/or/geoip.c | |
| parent | 36880b3f171bff6e81d9cd4e776b8bf0a47af3f1 (diff) | |
| parent | 7a446e6754b21eae1b0cfe3b0cf737ac2be964a9 (diff) | |
| download | tor-991b50c5a321070f9c61653c9509ffbf251b6410.tar.gz tor-991b50c5a321070f9c61653c9509ffbf251b6410.zip | |
Merge remote branch 'origin/maint-0.2.2'
Conflicts:
src/or/geoip.c
Diffstat (limited to 'src/or/geoip.c')
| -rw-r--r-- | src/or/geoip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/geoip.c b/src/or/geoip.c index 7f0c5c3ee0..c99758e7f8 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -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) |