commit 5b55778c86b88329725521d2c93829a9c9ad3501 Merge: 0872d8e 137982f Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 24 09:19:06 2014 -0500

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

changes/geoip-november2014 | 3 + changes/geoip6-november2014 | 3 + src/config/geoip |20036 +++++++++++++++++++++++++++++-------------- src/config/geoip6 | 5649 +++++++++++- 4 files changed, 19153 insertions(+), 6538 deletions(-)