[tor-commits] [tor/release-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.6' into release-0.2.6

[nickm at torproject.org]

commit 6ba5480bc1d9542aa7d5962f3ea9f0f2567116d7
Merge: 9aa7ebc fb5a858
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Oct 9 10:13:28 2015 -0400

    Merge remote-tracking branch 'origin/maint-0.2.6' into release-0.2.6

 changes/geoip-july2015      |    3 +
 changes/geoip-september2015 |    3 +
 src/config/geoip            | 6668 ++++++++++++++++++++++++++++++++-----------
 src/config/geoip6           | 2539 +++++++++-------
 4 files changed, 6520 insertions(+), 2693 deletions(-)