]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug1653'
authorNick Mathewson <nickm@torproject.org>
Wed, 8 Sep 2010 14:49:24 +0000 (10:49 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 8 Sep 2010 14:49:24 +0000 (10:49 -0400)

Trivial merge