Merge commit 'phobos/vidalia-bundle-updates-maint-0.2.1' into maint-0.2.1
commit937dc4d81c8019d1c27052e41a7d5187ade0c9cb
authorNick Mathewson <nickm@torproject.org>
Tue, 25 Aug 2009 20:36:39 +0000 (25 16:36 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 25 Aug 2009 20:36:39 +0000 (25 16:36 -0400)
tree8c5eaaf8521e305d21259857918e0425998af58a
parent9d11827780d15d8b398d8ce6b04110a4dea5e980
parent25f9e20a1c10aae6bf5b43a25c668b7295a64525
Merge commit 'phobos/vidalia-bundle-updates-maint-0.2.1' into maint-0.2.1