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

[nickm@xxxxxxxxxxxxxx]

commit 8e6174e38906105e32690c54936eef19e0946103
Merge: 7bb4422 97c6e71
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Apr 7 10:46:22 2016 -0400

    Merge branch 'maint-0.2.4' into release-0.2.4

 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(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits