Update to latest curve25519-donna32
Small tweaks to make curve25519-donna32 compile with our warnings
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'
Put the bug number and correct credits in the changes file for the new curve25519-donna32
Merge branch 'curve25519-donna32' 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'
Add and use a new NumEntryGuards consensus parameter.

When specified, it overrides our default of 3 entry guards.

(By default, it overrides the number of directory guards too.)

Implements ticket 12688.
add a NumDirectoryGuards consensus param too
update manpage for numentryguards / numdirectoryguards
Merge branch 'maint-0.2.4' into maint-0.2.5