commit d7950eda2bfd927a18df4a2620952d10dda1705c Merge: d21b24b 2658e70 Author: Nick Mathewson nickm@torproject.org Date: Tue Feb 25 10:02:14 2014 -0500

Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

changes/geoip-february2014-regcountry | 3 + src/config/geoip | 2399 ++++++++++++++------------------- 2 files changed, 1035 insertions(+), 1367 deletions(-)