commit 043329eeb653b2f9e795cf8b7cfd8fb0b756dca5 Merge: bf16786 b7d8a1e Author: Nick Mathewson nickm@torproject.org Date: Fri Feb 28 08:32:13 2014 -0500

Merge remote-tracking branch 'karsten/task-5824'

changes/bug5824 | 4 ++++ changes/bug5824-2 | 4 ++++ src/or/config.c | 8 ++++++-- src/or/geoip.c | 5 +++-- 4 files changed, 17 insertions(+), 4 deletions(-)