]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f503f30 59f50c8)
Merge branch 'maint-0.2.4' into release-0.2.4
authorRoger Dingledine <arma@torproject.org>
Fri, 15 Nov 2013 22:10:31 +0000 (17:10 -0500)
committerRoger Dingledine <arma@torproject.org>
Fri, 15 Nov 2013 22:10:31 +0000 (17:10 -0500)

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