commit 552136668c29a469d72dc7020aedddc9e9c95df4 Merge: fb5a858 3569cff Author: Nick Mathewson nickm@torproject.org Date: Fri Oct 9 10:14:46 2015 -0400

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

changes/geoip-october2015 | 3 + src/config/geoip | 7429 +++++++++++++++++++++++++++++---------------- src/config/geoip6 | 863 ++++-- 3 files changed, 5447 insertions(+), 2848 deletions(-)