]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'public/bug8377' into maint-0.2.3
authorNick Mathewson <nickm@torproject.org>
Mon, 18 Mar 2013 19:27:50 +0000 (15:27 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 18 Mar 2013 19:27:50 +0000 (15:27 -0400)

Trivial merge