]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'block_renegotiate_023' into maint-0.2.3
authorNick Mathewson <nickm@torproject.org>
Fri, 19 Oct 2012 18:30:31 +0000 (14:30 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 19 Oct 2012 18:30:31 +0000 (14:30 -0400)
commit1cc06bd35e4203569ecc72ff314a1dd543f60651
treeb76e1b771640fdd30788dff3be9492c84494e440
parentb6931b010512d3d8cbda24c87a8cf379305e1457
parentf357ef9dccccfb5ce2408dbd5f8456de02bac895
Merge branch 'block_renegotiate_023' into maint-0.2.3