[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.5'

[nickm at torproject.org]

commit d8517fe8435dbe9e4593d04fa8ec4db464513892
Merge: 4a6b43b 7cbdec5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jan 23 08:53:21 2015 -0500

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

 changes/geoip-january2015  |    3 +
 changes/geoip6-january2015 |    2 +
 src/config/geoip           |12872 +++++++++++++++++---------------------------
 src/config/geoip6          | 1263 ++++-
 4 files changed, 6073 insertions(+), 8067 deletions(-)