]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0dac0d8 1cc06bd)
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)
This is an "ours" commit ; I'm merging a separate version of the
block-renegotiate patch into 0.2.4.


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