]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'maint-0.2.2' into release-0.2.2
authorRoger Dingledine <arma@torproject.org>
Sun, 8 Jan 2012 17:17:03 +0000 (12:17 -0500)
committerRoger Dingledine <arma@torproject.org>
Sun, 8 Jan 2012 17:17:03 +0000 (12:17 -0500)
commit0a77d5324fe0686cdc70676361c1f90ff533f8fd
treebae734eef10fcbd32d550aa903223048b5e5c9e0
parent031ac2a49e38ced438a17e95855ed66c25836f73
parentcc1580dbe02f0f285fca65b7b388d99dbaf78f5c
Merge branch 'maint-0.2.2' into release-0.2.2