]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9f7be02 59a162f)
Merge branch 'maint-0.2.4' into release-0.2.4
authorRoger Dingledine <arma@torproject.org>
Sun, 22 Dec 2013 23:31:50 +0000 (18:31 -0500)
committerRoger Dingledine <arma@torproject.org>
Sun, 22 Dec 2013 23:31:50 +0000 (18:31 -0500)

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