]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote branch 'sebastian/bug2696' into maint-0.2.2
authorNick Mathewson <nickm@torproject.org>
Fri, 18 Mar 2011 16:39:40 +0000 (12:39 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 18 Mar 2011 16:39:40 +0000 (12:39 -0400)
commitf3d666366555226ec2ad0f647489a1d42145a2eb
tree155b093fa31b2dc980989967dd34f1a7887cb0e1
parent9dfa244484ff9c52d545daa620e034b4d03f969c
parent4aac35cafa9843d10b05921da51dcc42bc3e9176
Merge remote branch 'sebastian/bug2696' into maint-0.2.2