]> 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, 11 Jan 2012 01:26:50 +0000 (20:26 -0500)
committerRoger Dingledine <arma@torproject.org>
Wed, 11 Jan 2012 01:26:50 +0000 (20:26 -0500)
commit6cd68895fb373cc10825368ecfa345a100da7ac4
treea2027073ffc84854449a0576b17af2efab1d3d89
parent0a77d5324fe0686cdc70676361c1f90ff533f8fd
parentc78a314e95ef7f0d05e9d58066ee6bf6795ee9d7
Merge branch 'maint-0.2.2' into release-0.2.2