]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'maint-0.2.2' into release-0.2.2
authorRoger Dingledine <arma@torproject.org>
Thu, 7 Jul 2011 17:26:50 +0000 (13:26 -0400)
committerRoger Dingledine <arma@torproject.org>
Thu, 7 Jul 2011 17:26:50 +0000 (13:26 -0400)
commit0640d09bf4be273fa4cfc18c30de30677a6d24fa
tree369ac7a350039a5c5c6d3dee1ec1a39dd3e86531
parent1eec073f1bd1203935afdaa10a3818b73a668fdc
parent3ab09763ced6d892cd72956e53f2dfb804ec0a7c
Merge branch 'maint-0.2.2' into release-0.2.2