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

commit bd440537169728a626c3d38c2ad14d800898f617 Merge: 0e2f188 ea59783 Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 7 09:29:37 2016 -0500

Merge branch 'maint-0.2.4' into release-0.2.4

changes/geoip-august2016 | 4 + changes/geoip-july2016 | 4 + changes/geoip-november2016 | 4 + changes/geoip-october2016 | 4 + changes/geoip-september2016 | 4 + src/config/geoip | 52582 ++++++++++++++++++++++++++++++------------ src/config/geoip6 | 5261 +++-- 7 files changed, 41088 insertions(+), 16775 deletions(-)