]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug6861_typofix'
authorNick Mathewson <nickm@torproject.org>
Mon, 17 Sep 2012 14:28:35 +0000 (10:28 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 17 Sep 2012 14:28:35 +0000 (10:28 -0400)

Trivial merge