Merge remote branch 'sebastian/bug2504' into maint-0.2.2
commit613073e449c22ad3583e406e48cf5ada395489f0
authorNick Mathewson <nickm@torproject.org>
Tue, 22 Feb 2011 17:47:21 +0000 (22 12:47 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 22 Feb 2011 17:47:21 +0000 (22 12:47 -0500)
tree5bedb9b84e8f374393abcfb09df3a5a91514effb
parent19e5b4c2f269c8842646213c8d78562553a7bfc8
parent5dbaf9dbd545d7c9ecc18224883a74a9dc60ecf4
Merge remote branch 'sebastian/bug2504' into maint-0.2.2