]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 625606e a62038f)
Merge branch 'maint-0.2.2' into release-0.2.2 tor-0.2.2.20-alpha
authorRoger Dingledine <arma@torproject.org>
Fri, 17 Dec 2010 00:24:19 +0000 (19:24 -0500)
committerRoger Dingledine <arma@torproject.org>
Fri, 17 Dec 2010 00:24:19 +0000 (19:24 -0500)

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