]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a3d8ffe 1b55182)
Merge branch 'maint-0.2.4' into maint-0.2.5
authorRoger Dingledine <arma@torproject.org>
Thu, 24 Jul 2014 23:48:37 +0000 (19:48 -0400)
committerRoger Dingledine <arma@torproject.org>
Thu, 24 Jul 2014 23:48:37 +0000 (19:48 -0400)

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