]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'sebastian/compile_warning'
authorNick Mathewson <nickm@torproject.org>
Fri, 15 Jul 2011 21:54:49 +0000 (17:54 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 15 Jul 2011 21:54:49 +0000 (17:54 -0400)

Trivial merge