commit 4f7b4b21b9052e619f1e3525b9fcf061290b28a8 Merge: 1f6b918 2ce99b9 Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 7 10:46:39 2016 -0400

Merge branch 'maint-0.2.6' into release-0.2.6

changes/bug18089 | 6 + changes/bug18162 | 7 + changes/geoip-april2016 | 4 + changes/geoip-february2016 | 4 + changes/geoip-march2016 | 4 + src/common/container.c | 37 +- src/common/crypto.c | 10 + src/config/geoip | 12867 ++++++++++++++++++++++++++++++------------- src/config/geoip6 | 2643 +++++++-- 9 files changed, 11316 insertions(+), 4266 deletions(-)