Update geoip to the July 10 2014 database.
Update geoip6 to the July 10 2014 database.
Use safe_str in channel_dumpstats: improve 12184 diagnostic
Fix warning on building with bufferevents

Fixes #11578
update changes entry with info for 11578 patch
Merge remote-tracking branch 'origin/maint-0.2.5'
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Merge remote-tracking branch 'karsten/geoip6-jul2014' into maint-0.2.4
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
Merge remote-tracking branch 'origin/maint-0.2.5'