commit 089ee13534b8e1acf053154562debbcdcfc92d07 Merge: 2ec5e24 e8e89fd Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 7 10:10:44 2015 -0500

Merge branch 'maint-0.2.5' into maint-0.2.6

changes/geoip-december2015 | 4 + src/config/geoip | 4547 ++++++++++++++++++++++++++++++++------------ src/config/geoip6 | 2580 +++++++++++++++++++++---- 3 files changed, 5512 insertions(+), 1619 deletions(-)