From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 14 Dec 2010 19:13:24 +0000 (-0500)
Subject: Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
X-Git-Tag: tor-0.2.2.20-alpha~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ddfb398494ddf9d514a3ff16ade69c619c659ce7;p=thirdparty%2Ftor.git

Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2

Conflicts:
	src/config/geoip
---

ddfb398494ddf9d514a3ff16ade69c619c659ce7