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

commit d27160b407c9b524d232aeb16c610fe6622281dd Merge: 5394738 304d8f3 Author: Nick Mathewson nickm@torproject.org Date: Thu Oct 6 10:00:18 2016 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

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(-)