]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote branch 'rransom/typo-fix-2011-03-03-01' into maint-0.2.2
authorNick Mathewson <nickm@torproject.org>
Thu, 3 Mar 2011 18:50:17 +0000 (13:50 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 3 Mar 2011 18:50:17 +0000 (13:50 -0500)

Trivial merge