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

[nickm at torproject.org]

commit b4ead16d57fab6a8294a0bf374bfcdb0d6e02625
Merge: 6218f48 5b55778
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 24 09:19:22 2014 -0500

    Merge remote-tracking branch 'origin/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(-)