]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4107ddd 8611195)
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
authorNick Mathewson <nickm@torproject.org>
Sun, 25 Aug 2013 04:33:10 +0000 (00:33 -0400)
committerNick Mathewson <nickm@torproject.org>
Sun, 25 Aug 2013 04:33:10 +0000 (00:33 -0400)
(Using "ours" strategy to avoid taking 9546 fix in 0.2.3; we just
merged our own into 0.2.4)


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