[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm at torproject.org]

commit c0c92c3e2a7d6ad50a4cf1e93311fa1ea0723d0c
Merge: 01d5921 34a51d1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 7 10:46:32 2016 -0400

    Merge branch 'maint-0.2.5' into release-0.2.5

 changes/bug18162           |     7 +
 changes/geoip-april2016    |     4 +
 changes/geoip-february2016 |     4 +
 changes/geoip-march2016    |     4 +
 src/common/container.c     |    29 +-
 src/config/geoip           | 12867 ++++++++++++++++++++++++++++++-------------
 src/config/geoip6          |  2643 +++++++--
 7 files changed, 11299 insertions(+), 4259 deletions(-)