Merge commit 'origin/maint-0.2.1'

author Nick Mathewson <nickm@torproject.org>

Wed, 27 May 2009 18:20:18 +0000 (14:20 -0400)

committer Nick Mathewson <nickm@torproject.org>

Wed, 27 May 2009 18:20:18 +0000 (14:20 -0400)
author Nick Mathewson <nickm@torproject.org>
Wed, 27 May 2009 18:20:18 +0000 (14:20 -0400)
committer Nick Mathewson <nickm@torproject.org>
Wed, 27 May 2009 18:20:18 +0000 (14:20 -0400)
diff --cc .gitignore
Simple merge
diff --cc ChangeLog
Simple merge
diff --cc src/or/config.c
Simple merge
diff --cc src/or/geoip.c
Simple merge
author	Nick Mathewson <nickm@torproject.org>
	Wed, 27 May 2009 18:20:18 +0000 (14:20 -0400)
committer	Nick Mathewson <nickm@torproject.org>
	Wed, 27 May 2009 18:20:18 +0000 (14:20 -0400)
		1	2
.gitignore	patch \|	diff1 \|	diff2 \|	blob \| history
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
src/or/config.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/or/geoip.c	patch \|	diff1 \|	diff2 \|	blob \| history