Merge branch 'bug1141_v3' into maint-0.2.1
commitfc66a2ad1bf1e653cae47eb54fc6324d29d5916e
authorNick Mathewson <nickm@torproject.org>
Tue, 17 Aug 2010 15:55:58 +0000 (17 11:55 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 17 Aug 2010 15:55:58 +0000 (17 11:55 -0400)
tree40113450bc058d171494c21734c2268a460c2ddf
parente7d2a9b6c4407217780be3a0d0cbb29fd3812cf5
parent6f58481335ac4ce9a1bbeb35218aee3c2274744d
Merge branch 'bug1141_v3' into maint-0.2.1