Merge commit 'weasel/debian' into maint-0.2.1
commit9b02ff9564ad6530c8664f3a38faba204702cb9b
authorNick Mathewson <nickm@torproject.org>
Sun, 21 Jun 2009 01:56:02 +0000 (20 21:56 -0400)
committerNick Mathewson <nickm@torproject.org>
Sun, 21 Jun 2009 01:56:02 +0000 (20 21:56 -0400)
tree1b01185ae0fc40a8f8c7c921eba1ce937ce1f6ca
parentda416d98844391af1263a7af44a7276de1564049
parentf3f36fafc37464b599e22ef9d58c4508e7dad48b
Merge commit 'weasel/debian' into maint-0.2.1