Merge commit 'origin/maint-0.2.1'
commitba67dca31e894ff6e9ef10d5f5dc8a825cae2b91
authorNick Mathewson <nickm@torproject.org>
Thu, 28 May 2009 20:07:49 +0000 (28 16:07 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 28 May 2009 20:07:49 +0000 (28 16:07 -0400)
tree360b041cae0f9e981af0ba9770029c03098aad14
parentb90276b15aeef737b3eca2801f6f94a22253a337
parentf3a24b7029ef5675975ff35d4a5017b3532ddfab
Merge commit 'origin/maint-0.2.1'