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

[nickm at torproject.org]

commit 27940979b3b15a7cf27f4a2dc356a3011a1abcec
Merge: 6482535 f60da19
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 24 10:03:58 2016 -0400

    Merge branch 'maint-0.2.7' into release-0.2.7

 changes/bug19728         |     3 +
 changes/geoip-august2016 |     4 +
 changes/geoip-july2016   |     4 +
 src/config/geoip         | 17190 +++++++++++++++++++++++++++------------------
 src/config/geoip6        |  1936 +++--
 src/or/config.c          |     4 +-
 6 files changed, 11672 insertions(+), 7469 deletions(-)