commit f20ec6a322173618b783b333262dd2cdd04cca82 Merge: 28e42f6 12a7298 Author: Nick Mathewson nickm@torproject.org Date: Thu Oct 6 10:00:49 2016 -0400

Merge branch 'maint-0.2.6' into release-0.2.6

changes/geoip-august2016 | 4 + changes/geoip-july2016 | 4 + changes/geoip-october2016 | 4 + changes/geoip-september2016 | 4 + src/config/geoip | 50585 ++++++++++++++++++++++++++++++------------ src/config/geoip6 | 4439 +++- 6 files changed, 39529 insertions(+), 15511 deletions(-)