commit dc06c071a4629f15f5956668f10f3a10ef536dfb Merge: 1f5b228 2bcb596 Author: Nick Mathewson nickm@torproject.org Date: Tue Feb 24 13:27:15 2015 -0500

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

changes/bug13296 | 5 + changes/bug14129 | 7 + changes/geoip-january2015 | 3 + changes/geoip-november2014 | 3 + changes/geoip6-january2015 | 2 + changes/geoip6-november2014 | 3 + changes/ticket14487 | 3 + src/config/geoip |19540 ++++++++++++++++++++++++++----------------- src/config/geoip6 | 6592 ++++++++++++++- src/or/config.c | 8 +- src/or/dns.c | 6 +- 11 files changed, 18406 insertions(+), 7766 deletions(-)