commit 258988ca51bab7414aefb621532cf078eda18dab Merge: 845d3fe 1c4a2dd Author: Nick Mathewson nickm@torproject.org Date: Fri Jul 29 10:23:29 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

changes/bug19782 | 3 + changes/geoip-july2016 | 4 + scripts/maint/fallback.blacklist | 3 + scripts/maint/fallback.whitelist | 3 - src/common/sandbox.c | 1 - src/config/geoip | 4615 ++++++++++++++++++++++++++------------ src/config/geoip6 | 982 +++++--- src/or/fallback_dirs.inc | 8 +- 8 files changed, 3890 insertions(+), 1729 deletions(-)