]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'maint-0.2.2' into release-0.2.2
authorRoger Dingledine <arma@torproject.org>
Wed, 6 Jul 2011 04:48:45 +0000 (00:48 -0400)
committerRoger Dingledine <arma@torproject.org>
Wed, 6 Jul 2011 04:48:45 +0000 (00:48 -0400)
commit1eec073f1bd1203935afdaa10a3818b73a668fdc
treede5b8cf9116bf3ffc63352cdc680ac23d0864e97
parentf348c1c6baa56008bc826c3a16856c42777b5a65
parent4f749791730a9ac8e4e815546e0411e34dc222a9
Merge branch 'maint-0.2.2' into release-0.2.2