commit 3433b7ce3992b9566dba9b64f64f0676e712696a Merge: d5cfbf9 64410cc Author: Nick Mathewson nickm@torproject.org Date: Mon Aug 12 09:45:07 2013 -0400

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

changes/geoip-august2013 | 3 + src/config/geoip | 9207 +++++++++++++++++++++++----------------------- 2 files changed, 4521 insertions(+), 4689 deletions(-)