Merge remote branch 'rransom/typo-fix-2011-03-03-01' into maint-0.2.2
commit1d6af67ab8d96c30e022f1f7602276f10c8444dc
authorNick Mathewson <nickm@torproject.org>
Thu, 3 Mar 2011 18:50:17 +0000 (3 13:50 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 3 Mar 2011 18:50:17 +0000 (3 13:50 -0500)
treee77380483ade077fa4a66078859f8e7ee1ad59b3
parent6b7408178bf9cb3864cec14408d78e8374f26b68
parent88e0de9ebbb75a64d7870ccd8cf431bb0f23c937
Merge remote branch 'rransom/typo-fix-2011-03-03-01' into maint-0.2.2