Merge commit 'origin/maint-0.2.1'
commita7b12978cee02f1fbd38887350fa8de5c59040bd
authorNick Mathewson <nickm@torproject.org>
Thu, 29 Jul 2010 14:45:59 +0000 (29 10:45 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 29 Jul 2010 14:45:59 +0000 (29 10:45 -0400)
tree39a9b9e6848c962416f467aa40cfedb5a8e214eb
parent856a36c43439da3478892758c0df777ac647d245
parentb958eae573fd1e2817df628e29d937e2683630ea
Merge commit 'origin/maint-0.2.1'