commit 4b54ad017d3fadf3598dd4d5047188107718d92f Merge: 1d02f64 5b55778 Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 22 10:27:08 2014 -0500

Merge remote-tracking branch 'origin/maint-0.2.5' into release-0.2.5

changes/bug13296 | 5 + changes/geoip-november2014 | 3 + changes/geoip6-november2014 | 3 + src/config/geoip |20036 +++++++++++++++++++++++++++++-------------- src/config/geoip6 | 5649 +++++++++++- src/or/config.c | 6 +- 6 files changed, 19161 insertions(+), 6541 deletions(-)