]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge commit 'phobos/vidalia-bundle-updates-maint-0.2.1' into maint-0.2.1
authorNick Mathewson <nickm@torproject.org>
Tue, 25 Aug 2009 20:36:39 +0000 (16:36 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 25 Aug 2009 20:36:39 +0000 (16:36 -0400)

Trivial merge