Merge remote-tracking branch 'public/bug3369' into maint-0.2.2
commita25c0a5bf81768c4d4f6fe377cea48f47333a8c8
authorNick Mathewson <nickm@torproject.org>
Tue, 14 Jun 2011 17:46:10 +0000 (14 13:46 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 14 Jun 2011 17:46:10 +0000 (14 13:46 -0400)
tree73e9c40d91329c1a0004ff89ca445c7014d3c3e1
parente70e8367c9bb3ff04645454e9dfe694ac6762dc3
parente470f6a8866105c9f6b113aa8eafec5ee202c992
Merge remote-tracking branch 'public/bug3369' into maint-0.2.2