]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'origin/maint-0.2.3'
authorNick Mathewson <nickm@torproject.org>
Tue, 12 Feb 2013 15:51:54 +0000 (10:51 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 12 Feb 2013 15:51:54 +0000 (10:51 -0500)

Trivial merge