]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b6931b0 f357ef9)
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)

Trivial merge
Mirror of https://git.torproject.org/tor.git