commit 8d5f1e6961feb1ef2a80d6d5a36e755a4b79007b Merge: dca902c 8611c6b Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 24 09:18:21 2014 -0500

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

changes/geoip-november2014 | 3 + src/config/geoip |20036 ++++++++++++++++++++++++++++++-------------- 2 files changed, 13644 insertions(+), 6395 deletions(-)