Merge remote branch 'origin/maint-0.2.2'

Conflicts:
	src/or/geoip.c

changes/bug2432

@@ -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.
+

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)