]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 16e8951 1040cca)
Merge branch 'maint-0.2.2' into release-0.2.2 tor-0.2.2.29-beta
authorRoger Dingledine <arma@torproject.org>
Tue, 21 Jun 2011 03:50:29 +0000 (23:50 -0400)
committerRoger Dingledine <arma@torproject.org>
Tue, 21 Jun 2011 03:50:29 +0000 (23:50 -0400)

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