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

[nickm at torproject.org]

commit 6e181bafff0b62688bae02998784a8e4b7f2167d
Merge: ee47010 65cf513
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 19 19:35:52 2016 -0400

    Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug19903         |     4 +
 changes/geoip-august2016 |     4 +
 src/common/tortls.c      |     2 +-
 src/config/geoip         | 14009 +++++++++++++++++++++++++--------------------
 src/config/geoip6        |  1108 +++-
 5 files changed, 8587 insertions(+), 6540 deletions(-)