From: Nick Mathewson Date: Tue, 25 Aug 2009 20:36:39 +0000 (-0400) Subject: Merge commit 'phobos/vidalia-bundle-updates-maint-0.2.1' into maint-0.2.1 X-Git-Tag: tor-0.2.2.2-alpha~59^2~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=937dc4d81c8019d1c27052e41a7d5187ade0c9cb;p=thirdparty%2Ftor.git Merge commit 'phobos/vidalia-bundle-updates-maint-0.2.1' into maint-0.2.1 --- 937dc4d81c8019d1c27052e41a7d5187ade0c9cb