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

commit d9b11d05e85503bbea8724a1770e23849c56a17e Merge: d0c209c 400df18 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Jan 7 09:14:15 2016 -0800 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/geoip-january2016 | 4 + src/config/geoip | 1734 +++++++++++++++++++++++++++++++++++---------- src/config/geoip6 | 881 +++++++++++++++++------ 3 files changed, 2016 insertions(+), 603 deletions(-)