]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.3'
authorNick Mathewson <nickm@torproject.org>
Fri, 19 Oct 2012 18:32:22 +0000 (14:32 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 19 Oct 2012 18:32:22 +0000 (14:32 -0400)
commit2c2c64287aebe9eaa844457b852ca7cd50c61ec5
tree7eba47da137b28e8682b7441547843359fa5aaa3
parent0dac0d8ad68f17fa1803ebd82e402e5181e0532a
parent1cc06bd35e4203569ecc72ff314a1dd543f60651
Merge remote-tracking branch 'origin/maint-0.2.3'

This is an "ours" commit ; I'm merging a separate version of the
block-renegotiate patch into 0.2.4.