commit 5fb49e51ebe27f4b8afe3f0782406dcecf3a6dda Merge: b047457 17cfdb3 Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 21 10:52:07 2016 -0400

Merge branch 'maint-0.2.7' into release-0.2.7

changes/bug14821 | 4 + changes/bug17583 | 4 + changes/bug18050 | 7 + changes/bug18089 | 6 + changes/bug18162 | 7 + changes/geoip-february2016 | 4 + changes/geoip-march2016 | 4 + doc/tor.1.txt | 28 +- src/common/compat.h | 9 + src/common/container.c | 37 +- src/common/crypto.c | 10 + src/config/geoip | 10424 +++++++++++++++++++++++++++++-------------- src/config/geoip6 | 2690 +++++------ src/or/main.c | 10 +- src/or/router.c | 13 +- src/test/test_address.c | 8 +- 16 files changed, 8636 insertions(+), 4629 deletions(-)