commit 938deecc876e110d708edda544d20d9fd752838e Merge: bb68c73 fa7ce6d Author: Nick Mathewson nickm@torproject.org Date: Wed Aug 13 12:52:57 2014 -0400

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

README | 9 +- changes/bug12830 | 4 + changes/geoip-august2014 | 3 + changes/geoip6-august2014 | 3 + doc/tor.1.txt | 2 +- src/config/geoip | 5217 +++++++++++++++++++++++++++++++++------------ src/config/geoip6 | 2012 ++++++----------- 7 files changed, 4526 insertions(+), 2724 deletions(-)