]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'origin/maint-0.2.3'
authorNick Mathewson <nickm@torproject.org>
Wed, 10 Oct 2012 03:49:26 +0000 (23:49 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 10 Oct 2012 03:49:26 +0000 (23:49 -0400)

Trivial merge